token + cleanup

Sources/Authentication/Credentials/Token.swift

@@ -12,19 +12,17 @@ public struct Token: Crendentials {
 
 public protocol TokenAuthenticatable: Authenticatable {
     /// The token entity that contains a foreign key
-    /// pointer to the user table
-    associatedtype TokenType: TokenProtocol
+    /// pointer to the user table (or on the user table itself)
+    associatedtype TokenType
 
     /// Returns the user matching the supplied token.
-    static func authenticate(_: Token) throws -> Self
-}
+    static func authenticate(_ token: Token) throws -> Self
 
-public protocol TokenProtocol {
+    /// The column under which the tokens are stored
     static var tokenKey: String { get }
-    static func findUser<U: Entity>(for: Token) throws -> U
 }
 
-extension TokenProtocol {
+extension TokenAuthenticatable {
     public static var tokenKey: String {
         return "token"
     }
@@ -34,20 +32,27 @@ extension TokenProtocol {
 
 import Fluent
 
-extension TokenAuthenticatable where Self: Entity {
+extension TokenAuthenticatable where Self: Entity, Self.TokenType: Entity {
     public static func authenticate(_ token: Token) throws -> Self {
-        return try TokenType.findUser(for: token)
+        guard let user = try Self.query()
+            .join(Self.TokenType.self)
+            .filter(Self.TokenType.self, tokenKey, token.string)
+            .first()
+        else {
+                throw AuthenticationError.invalidCredentials
+        }
+
+        return user
     }
 }
 
-extension TokenProtocol where Self: Entity {
-    public static func findUser<U: Entity>(for token: Token) throws -> U {
-        guard let user = try U.query()
-            .join(self)
-            .filter(self, tokenKey, token.string)
+extension TokenAuthenticatable where Self: Entity, Self.TokenType: Entity, Self.TokenType == Self {
+    public static func authenticate(_ token: Token) throws -> Self {
+        guard let user = try Self.query()
+            .filter(tokenKey, token.string)
             .first()
         else {
-            throw AuthenticationError.invalidCredentials
+                throw AuthenticationError.invalidCredentials
         }
 
         return user

Sources/Authentication/Header/Authorization.swift

@@ -1,7 +1,7 @@
-public struct Authorization {
-    public let header: String
+public struct AuthorizationHeader {
+    public let string: String
 
-    public init(header: String) {
-        self.header = header
+    public init(string: String) {
+        self.string = string
     }
 }

Sources/Authentication/Header/Basic.swift

@@ -1,22 +1,21 @@
 import Core
 
-extension Authorization {
+extension AuthorizationHeader {
     public var basic: Password? {
-        guard let range = header.range(of: "Basic ") else {
+        guard let range = string.range(of: "Basic ") else {
             return nil
         }
 
-        let token = header.substring(from: range.upperBound)
-
+        let token = string.substring(from: range.upperBound)
 
         let decodedToken = token.makeBytes().base64Decoded.string
         guard let separatorRange = decodedToken.range(of: ":") else {
             return nil
         }
 
-        let apiKeyID = decodedToken.substring(to: separatorRange.lowerBound)
-        let apiKeySecret = decodedToken.substring(from: separatorRange.upperBound)
+        let username = decodedToken.substring(to: separatorRange.lowerBound)
+        let password = decodedToken.substring(from: separatorRange.upperBound)
 
-        return Password(username: apiKeyID, password: apiKeySecret)
+        return Password(username: username, password: password)
     }
 }

Sources/Authentication/Header/Bearer.swift

@@ -1,10 +1,10 @@
-extension Authorization {
+extension AuthorizationHeader {
     public var bearer: Token? {
-        guard let range = header.range(of: "Bearer ") else {
+        guard let range = string.range(of: "Bearer ") else {
             return nil
         }
 
-        let token = header.substring(from: range.upperBound)
+        let token = string.substring(from: range.upperBound)
         return Token(string: token)
     }
 }

Tests/AuthenticationTests/ExampleTests.swift

@@ -10,12 +10,7 @@ class ExampleTests: XCTestCase {
 
     func testExample() throws {
         do {
-            let id = Identifier(id: Node.string("5"))
             let token = Token(string: "5")
-
-            let user1 = try AuthUser.authenticate(id)
-            XCTAssertEqual(user1.name, "5")
-
             let user2 = try AuthUser.authenticate(token)
             XCTAssertEqual(user2.name, "6")
         } catch {

Tests/AuthenticationTests/Utilities/AuthUser.swift

@@ -31,22 +31,10 @@ final class AuthUser: Entity {
     }
 }
 
-extension AuthUser: IdentifierAuthenticatable {
-    static func authenticate(_ id: Identifier) throws -> Self {
-        return self.init(name: "5")
-    }
-}
-
 extension AuthUser: TokenAuthenticatable {
     typealias TokenType = AuthUser
 
     static func authenticate(_ id: Token) throws -> Self {
         return self.init(name: "6")
     }
 }
-
-extension AuthUser: TokenProtocol {
-    static var tokenKey: String {
-        return ""
-    }
-}