Merge pull request #9 from Brett-Best/feature/user-manager-async

brokenhandsio · Feb 19, 2023 · b4cc076 · b4cc076
2 parents 074f3c2 + b44c79b
commit b4cc076
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/Sources/VaporOAuth/DefaultImplementations/EmptyUserManager.swift b/Sources/VaporOAuth/DefaultImplementations/EmptyUserManager.swift
@@ -2,11 +2,11 @@ public struct EmptyUserManager: UserManager {
 
     public init() {}
 
-    public func getUser(userID: String) -> OAuthUser? {
+    public func getUser(userID: String) async throws -> OAuthUser? {
         return nil
     }
 
-    public func authenticateUser(username: String, password: String) -> String? {
+    public func authenticateUser(username: String, password: String) async throws -> String? {
         return nil
     }
 }
diff --git a/Sources/VaporOAuth/Helper/OAuthHelper+local.swift b/Sources/VaporOAuth/Helper/OAuthHelper+local.swift
@@ -29,7 +29,7 @@ extension OAuthHelper {
                     throw Abort(.unauthorized)
                 }
 
-                guard let user = userManager.getUser(userID: userID) else {
+                guard let user = try await userManager.getUser(userID: userID) else {
                     throw Abort(.unauthorized)
                 }
 

diff --git a/Sources/VaporOAuth/Protocols/UserManager.swift b/Sources/VaporOAuth/Protocols/UserManager.swift
@@ -1,4 +1,4 @@
 public protocol UserManager {
-    func authenticateUser(username: String, password: String) -> String?
-    func getUser(userID: String) -> OAuthUser?
+    func authenticateUser(username: String, password: String) async throws -> String?
+    func getUser(userID: String) async throws -> OAuthUser?
 }
diff --git a/Sources/VaporOAuth/RouteHandlers/TokenHandlers/PasswordTokenHandler.swift b/Sources/VaporOAuth/RouteHandlers/TokenHandlers/PasswordTokenHandler.swift
@@ -51,7 +51,7 @@ struct PasswordTokenHandler {
             }
         }
 
-        guard let userID = userManager.authenticateUser(username: username, password: password) else {
+        guard let userID = try await userManager.authenticateUser(username: username, password: password) else {
             logger.warning("LOGIN WARNING: Invalid login attempt for user \(username)")
             return try tokenResponseGenerator.createResponse(error: OAuthResponseParameters.ErrorType.invalidGrant,
                                                              description: "Request had invalid credentials")

diff --git a/Sources/VaporOAuth/RouteHandlers/TokenIntrospectionHandler.swift b/Sources/VaporOAuth/RouteHandlers/TokenIntrospectionHandler.swift
@@ -32,7 +32,7 @@ struct TokenIntrospectionHandler {
         var user: OAuthUser? = nil
 
         if let userID = token.userID {
-            if let tokenUser = userManager.getUser(userID: userID) {
+            if let tokenUser = try await userManager.getUser(userID: userID) {
                 user = tokenUser
             }
         }

diff --git a/Tests/VaporOAuthTests/DefaultImplementationTests/DefaultImplementationTests.swift b/Tests/VaporOAuthTests/DefaultImplementationTests/DefaultImplementationTests.swift
@@ -9,15 +9,17 @@ class DefaultImplementationTests: XCTestCase {
         XCTAssertNil(emptyResourceServerRetriever.getServer("some username"))
     }
 
-    func testThatEmptyUserManagerReturnsNilWhenAttemptingToAuthenticate() {
+    func testThatEmptyUserManagerReturnsNilWhenAttemptingToAuthenticate() async throws {
         let emptyUserManager = EmptyUserManager()
-        XCTAssertNil(emptyUserManager.authenticateUser(username: "username", password: "password"))
+        let token = try await emptyUserManager.authenticateUser(username: "username", password: "password")
+        XCTAssertNil(token)
     }
 
-    func testThatEmptyUserManagerReturnsNilWhenTryingToGetUser() {
+    func testThatEmptyUserManagerReturnsNilWhenTryingToGetUser() async throws {
         let emptyUserManager = EmptyUserManager()
         let id = "some-id"
-        XCTAssertNil(emptyUserManager.getUser(userID: id))
+        let user = try await emptyUserManager.getUser(userID: id)
+        XCTAssertNil(user)
     }
 
     func testThatEmptyAuthHandlerReturnsEmptyStringWhenHandlingAuthError() async throws {