Update OAuthUser to have an id property of type Identifer to make Fluent integration simple

Author: 0xTim

Sources/OAuth/DefaultImplementations/EmptyCodeManager.swift

@@ -1,11 +1,13 @@
+import Node
+
 public struct EmptyCodeManager: CodeManager {
     public init() {}
 
     public func getCode(_ code: String) -> OAuthCode? {
         return nil
     }
 
-    public func generateCode(userID: String, clientID: String, redirectURI: String, scopes: [String]?) throws -> String {
+    public func generateCode(userID: Identifier, clientID: String, redirectURI: String, scopes: [String]?) throws -> String {
         return ""
     }
 

Sources/OAuth/DefaultImplementations/EmptyUserManager.swift

@@ -1,12 +1,14 @@
+import Node
+
 public struct EmptyUserManager: UserManager {
 
     public init() {}
 
-    public func getUser(id: String) -> OAuthUser? {
+    public func getUser(id: Identifier) -> OAuthUser? {
         return nil
     }
 
-    public func authenticateUser(username: String, password: String) -> String? {
+    public func authenticateUser(username: String, password: String) -> Identifier? {
         return nil
     }
 }

Sources/OAuth/Models/OAuthCode.swift

@@ -1,17 +1,18 @@
 import Foundation
 import Core
+import Node
 
 public final class OAuthCode {
     public let codeID: String
     public let clientID: String
     public let redirectURI: String
-    public let userID: String
+    public let userID: Identifier
     public let expiryDate: Date
     public let scopes: [String]?
 
     public var extend: [String: Any] = [:]
 
-    public init(codeID: String, clientID: String, redirectURI: String, userID: String, expiryDate: Date, scopes: [String]?) {
+    public init(codeID: String, clientID: String, redirectURI: String, userID: Identifier, expiryDate: Date, scopes: [String]?) {
         self.codeID = codeID
         self.clientID = clientID
         self.redirectURI = redirectURI

Sources/OAuth/Models/OAuthUser.swift

@@ -1,18 +1,19 @@
 import Authentication
 import Core
+import Node
 
 public final class OAuthUser: Authenticatable, Extendable {
     public let username: String
     public let emailAddress: String?
     public let password: Bytes
-    public let userID: String?
+    public var id: Identifier?
 
     public var extend: [String: Any] = [:]
 
-    public init(userID: String?, username: String, emailAddress: String?, password: Bytes) {
+    public init(id: Identifier? = nil, username: String, emailAddress: String?, password: Bytes) {
         self.username = username
         self.emailAddress = emailAddress
         self.password = password
-        self.userID = userID
+        self.id = id
     }
 }

Sources/OAuth/Models/Tokens/AccessToken.swift

@@ -1,16 +1,17 @@
 import Foundation
 import Core
+import Node
 
 public final class AccessToken: Extendable {
     public let tokenString: String
     public let clientID: String
-    public let userID: String?
+    public let userID: Identifier?
     public let scopes: [String]?
     public let expiryTime: Date
 
     public var extend: [String: Any] = [:]
 
-    public init(tokenString: String, clientID: String, userID: String?, scopes: [String]? = nil, expiryTime: Date) {
+    public init(tokenString: String, clientID: String, userID: Identifier?, scopes: [String]? = nil, expiryTime: Date) {
         self.tokenString = tokenString
         self.clientID = clientID
         self.userID = userID

Sources/OAuth/Models/Tokens/RefreshToken.swift

@@ -1,14 +1,15 @@
 import Core
+import Node
 
 public final class RefreshToken: Extendable {
     public let tokenString: String
     public let clientID: String
-    public let userID: String?
+    public let userID: Identifier?
     public var scopes: [String]?
 
     public var extend: [String: Any] = [:]
 
-    public init(tokenString: String, clientID: String, userID: String?, scopes: [String]? = nil) {
+    public init(tokenString: String, clientID: String, userID: Identifier?, scopes: [String]? = nil) {
         self.tokenString = tokenString
         self.clientID = clientID
         self.userID = userID

Sources/OAuth/OAuth2Provider.swift

@@ -104,7 +104,7 @@ struct OAuth2Provider {
             throw Abort.unauthorized
         }
 
-        guard let userID = user.userID else {
+        guard let userID = user.id else {
             throw Abort.unauthorized
         }
 
@@ -157,7 +157,7 @@ struct OAuth2Provider {
 
         if approveApplication {
             if responseType == ResponseType.token {
-                let accessToken = try tokenManager.generateAccessToken(clientID: clientID, userID: user.userID, scopes: scopes, expiryTime: 3600)
+                let accessToken = try tokenManager.generateAccessToken(clientID: clientID, userID: user.id, scopes: scopes, expiryTime: 3600)
                 redirectURI += "#token_type=bearer&access_token=\(accessToken.tokenString)&expires_in=3600"
             }
             else if responseType == ResponseType.code {

Sources/OAuth/Protocols/CodeManager.swift

@@ -1,5 +1,7 @@
+import Node
+
 public protocol CodeManager {
-    func generateCode(userID: String, clientID: String, redirectURI: String, scopes: [String]?) throws -> String
+    func generateCode(userID: Identifier, clientID: String, redirectURI: String, scopes: [String]?) throws -> String
     func getCode(_ code: String) -> OAuthCode?
 
     // This is explicit to ensure that the code is marked as used or deleted (it could be implied that this is done when you call

Sources/OAuth/Protocols/TokenManager.swift

@@ -1,6 +1,8 @@
+import Node
+
 public protocol TokenManager {
-    func generateAccessRefreshTokens(clientID: String, userID: String?, scopes: [String]?, accessTokenExpiryTime: Int) throws -> (AccessToken, RefreshToken)
-    func generateAccessToken(clientID: String, userID: String?, scopes: [String]?, expiryTime: Int) throws -> AccessToken
+    func generateAccessRefreshTokens(clientID: String, userID: Identifier?, scopes: [String]?, accessTokenExpiryTime: Int) throws -> (AccessToken, RefreshToken)
+    func generateAccessToken(clientID: String, userID: Identifier?, scopes: [String]?, expiryTime: Int) throws -> AccessToken
     func getRefreshToken(_ refreshToken: String) -> RefreshToken?
     func getAccessToken(_ accessToken: String) -> AccessToken?
     func updateRefreshToken(_ refreshToken: RefreshToken, scopes: [String])

Sources/OAuth/Protocols/UserManager.swift

@@ -1,4 +1,6 @@
+import Node
+
 public protocol UserManager {
-    func authenticateUser(username: String, password: String) -> String?
-    func getUser(id: String) -> OAuthUser?
+    func authenticateUser(username: String, password: String) -> Identifier?
+    func getUser(id: Identifier) -> OAuthUser?
 }