Add isAuthenticated to HTTPAPI

Source/Admin/API/AdminCredential.swift

@@ -10,7 +10,9 @@ public struct AdminCredential: Credential {
     public let userId: String
     public var authenticationToken: String?
 
-    public func authentication() throws -> String? {
+    func isAuthenticated() -> Bool { return self.authenticationToken != nil }
+
+    func authentication() throws -> String? {
         guard let authenticationToken = self.authenticationToken else {
             throw OMGError.configuration(message: "Authentication token is required")
         }

Source/Client/API/ClientCredential.swift

@@ -22,6 +22,10 @@ public struct ClientCredential: Credential {
         self.authenticationToken = authenticationToken
     }
 
+    func isAuthenticated() -> Bool {
+        return self.authenticationToken != nil
+    }
+
     func authentication() throws -> String? {
         guard let authenticationToken = self.authenticationToken else { return nil }
         return try CredentialEncoder.encode(value1: self.apiKey, value2: authenticationToken, scheme: "OMGClient")

Source/Core/API/Credential.swift

@@ -8,6 +8,7 @@
 
 /// Contains the required functions that a configuration object would need to authenticate an API call if needed
 protocol Credential {
+    func isAuthenticated() -> Bool
     func authentication() throws -> String?
     mutating func update(withAuthenticationToken authenticationToken: AuthenticationToken)
     mutating func invalidate()

Source/Core/API/HTTPAPI.swift

@@ -22,6 +22,9 @@ public class HTTPAPI {
         self.config = config
     }
 
+    /// A boolean indicating if the client is authenticated and allowed to make authenticated requests
+    public var isAuthenticated: Bool { return self.config.credentials.isAuthenticated() }
+
     @discardableResult
     func request<ResultType>(toEndpoint endpoint: APIEndpoint,
                              callback: Request<ResultType>.Callback?) -> Request<ResultType>? {

Tests/Client/APITests/ClientCredentialTests.swift

@@ -10,6 +10,16 @@
 import XCTest
 
 class ClientCredentialTests: XCTestCase {
+    func testIsAuthenticatedIsFalseWhenNoAuthenticationToken() {
+        let credentials = ClientCredential(apiKey: "api_key")
+        XCTAssertFalse(credentials.isAuthenticated())
+    }
+
+    func testIsAuthenticatedIsFalseWithAnAuthenticationToken() {
+        let credentials = ClientCredential(apiKey: "api_key", authenticationToken: "123")
+        XCTAssertTrue(credentials.isAuthenticated())
+    }
+
     func testUpdateCredentialSuccessfully() {
         var credentials = ClientCredential(apiKey: "api_key")
         XCTAssertNil(credentials.authenticationToken)

Tests/Core/APITests/HTTPClientTests.swift

@@ -10,6 +10,18 @@
 import XCTest
 
 class HTTPClientTests: XCTestCase {
+    func testIsAuthenticatedIsTrueWhenAuthenticated() {
+        let config = TestConfiguration(baseURL: "http://localhost:4000", credentials: TestCredential(authenticated: true))
+        let client = HTTPAPI(config: config)
+        XCTAssertTrue(client.isAuthenticated)
+    }
+
+    func testIsAuthenticatedIsFalseWhenNotAuthenticated() {
+        let config = TestConfiguration(baseURL: "http://localhost:4000", credentials: TestCredential(authenticated: false))
+        let client = HTTPAPI(config: config)
+        XCTAssertFalse(client.isAuthenticated)
+    }
+
     func testInvalidURL() {
         let expectation = self.expectation(description: "Invalid url")
         let config = TestConfiguration(baseURL: "invalid url @")

Tests/Core/APITests/RequestBuilderTests.swift

@@ -10,8 +10,8 @@
 import XCTest
 
 class RequestBuilderTests: XCTestCase {
-    var httpConfig = TestConfiguration(credentials: TestCredential())
-    var socketConfig = TestConfiguration(credentials: TestCredential())
+    var httpConfig = TestConfiguration(credentials: TestCredential(authenticated: true))
+    var socketConfig = TestConfiguration(credentials: TestCredential(authenticated: true))
     var requestBuilder: RequestBuilder!
 
     override func setUp() {

Tests/Core/TestMocks/TestConfiguration.swift

@@ -17,7 +17,7 @@ struct TestConfiguration: Configuration {
 
     let debugLog: Bool = false
 
-    init(baseURL: String = "http://localhost:4000", credentials: TestCredential = TestCredential()) {
+    init(baseURL: String = "http://localhost:4000", credentials: TestCredential = TestCredential(authenticated: true)) {
         self.baseURL = baseURL
         self.credentials = credentials
     }

Tests/Core/TestMocks/TestCredential.swift

@@ -9,11 +9,25 @@
 @testable import OmiseGO
 
 struct TestCredential: Credential {
-    mutating func update(withAuthenticationToken _: AuthenticationToken) {}
+    var authenticated: Bool
+
+    init(authenticated: Bool) {
+        self.authenticated = authenticated
+    }
+
+    func isAuthenticated() -> Bool {
+        return self.authenticated
+    }
+
+    mutating func update(withAuthenticationToken _: AuthenticationToken) {
+        self.authenticated = true
+    }
 
     func authentication() throws -> String? {
-        return "OMGClient \("123:123".data(using: .utf8)!.base64EncodedString())"
+        return self.authenticated ? "OMGClient \("123:123".data(using: .utf8)!.base64EncodedString())" : nil
     }
 
-    mutating func invalidate() {}
+    mutating func invalidate() {
+        self.authenticated = false
+    }
 }