Adjust httpAuthorizationHeader to accomodate token authentication

Author: mattt

Sources/Basics/AuthorizationProvider.swift

@@ -13,14 +13,20 @@ public protocol AuthorizationProvider {
 }
 
 extension AuthorizationProvider {
+    /// Returns an `Authorization` HTTP header for a given URL
+    /// using the user and password provided by `authentication(for:)`.
+    ///
+    /// Returns `nil` if no authentication information exists for the specified URL.
+    /// Returns a Basic access authentication string if a `user` and `password` is provided
+    /// or a token authentication string is the `user` is empty.
     public func httpAuthorizationHeader(for url: URL) -> String? {
-        guard let (user, password) = self.authentication(for: url) else {
-            return nil
-        }
-        let authString = "\(user):\(password)"
-        guard let authData = authString.data(using: .utf8) else {
-            return nil
+        guard case let (user, password)? = authentication(for: url) else { return nil }
+
+        if user.isEmpty {
+            return "Token \(password)"
+        } else {
+            guard let data = "\(user):\(password)".data(using: .utf8) else { return nil }
+            return "Basic \(data.base64EncodedString())"
         }
-        return "Basic \(authData.base64EncodedString())"
     }
 }

Tests/BasicsTests/AuthorizationProviderTests.swift

@@ -13,23 +13,45 @@ import TSCBasic
 import XCTest
 
 final class AuthorizationProviderTests: XCTestCase {
-    func testBasicAPIs() {
-        struct TestProvider: AuthorizationProvider {
-            let map: [URL: (user: String, password: String)]
+    private struct MockProvider: AuthorizationProvider {
+        let map: [URL: (user: String, password: String)]
 
-            func authentication(for url: URL) -> (user: String, password: String)? {
-                return self.map[url]
-            }
+        func authentication(for url: URL) -> (user: String, password: String)? {
+            return self.map[url]
         }
+    }
 
+    func testBasicAuthentication() {
         let url = URL(string: "http://\(UUID().uuidString)")!
         let user = UUID().uuidString
         let password = UUID().uuidString
-        let provider = TestProvider(map: [url: (user: user, password: password)])
+        let provider = MockProvider(map: [url: (user: user, password: password)])
 
         let auth = provider.authentication(for: url)
         XCTAssertEqual(auth?.user, user)
         XCTAssertEqual(auth?.password, password)
         XCTAssertEqual(provider.httpAuthorizationHeader(for: url), "Basic " + "\(user):\(password)".data(using: .utf8)!.base64EncodedString())
     }
+
+    func testTokenAuthentication() {
+        let url = URL(string: "http://\(UUID().uuidString)")!
+        let user = ""
+        let password = UUID().uuidString
+        let provider = MockProvider(map: [url: (user: user, password: password)])
+
+        let auth = provider.authentication(for: url)
+        XCTAssertEqual(auth?.user, user)
+        XCTAssertEqual(auth?.password, password)
+        XCTAssertEqual(provider.httpAuthorizationHeader(for: url), "Token \(password)")
+    }
+
+    func testMissingAuthentication() {
+        let url = URL(string: "http://\(UUID().uuidString)")!
+        let provider = MockProvider(map: [:])
+
+        let auth = provider.authentication(for: url)
+        XCTAssertEqual(auth?.user, nil)
+        XCTAssertEqual(auth?.password, nil)
+        XCTAssertEqual(provider.httpAuthorizationHeader(for: url), nil)
+    }
 }