add cognito functions as dependencies for testing

Author: rahafjrw

Sources/App/Controllers/Manage/Cognito.swift

@@ -92,6 +92,7 @@ struct Cognito {
         )
         req.application.cognito.authenticatable = CognitoAuthenticatable(configuration: awsCognitoConfiguration)
         try await req.application.cognito.authenticatable.confirmSignUp(username: username, confirmationCode: confirmationCode)
+        try awsClient.syncShutdown()
     }
 
     @Sendable

Sources/App/Controllers/Manage/DeleteAccountController.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Dependencies
 import Fluent
 import Plot
 import Vapor
@@ -9,8 +10,9 @@ import SotoCognitoIdentity
 enum DeleteAccountController {
     @Sendable
     static func deleteAccount(req: Request) async throws -> Response {
+        @Dependency(\.cognito) var cognito
         do {
-            try await Cognito.deleteUser(req: req, accessToken: req.auth.require(AuthenticatedUser.self).sessionID)
+            try await cognito.deleteUser(req: req, accessToken: req.auth.require(AuthenticatedUser.self).sessionID)
             req.auth.logout(AuthenticatedUser.self)
             req.session.unauthenticate(AuthenticatedUser.self)
             req.session.destroy()

Sources/App/Controllers/Manage/ForgotPasswordController.swift

@@ -1,4 +1,5 @@
 import Fluent
+import Dependencies
 import Plot
 import Vapor
 import SotoCognitoAuthentication
@@ -13,12 +14,13 @@ enum ForgotPasswordController {
 
     @Sendable
     static func forgotPasswordEmail(req: Request) async throws ->  HTML {
+        @Dependency(\.cognito) var cognito
         struct Credentials: Content {
             var email: String
         }
         do {
             let user = try req.content.decode(Credentials.self)
-            try await Cognito.forgotPassword(req: req, username: user.email)
+            try await cognito.forgotPassword(req: req, username: user.email)
             return Reset.View(path: SiteURL.resetPassword.relativeURL(), model: Reset.Model(email: user.email)).document()
         } catch {
             return ForgotPassword.View(path: req.url.path, model: ForgotPassword.Model(errorMessage: "An error occurred: \(error.localizedDescription)")).document()

Sources/App/Controllers/Manage/ResetController.swift

@@ -1,4 +1,5 @@
 import Fluent
+import Dependencies
 import Plot
 import Vapor
 import SotoCognitoAuthentication
@@ -13,18 +14,20 @@ enum ResetController {
 
     @Sendable
     static func resetPassword(req: Request) async throws -> HTML {
+        @Dependency(\.cognito) var cognito
         struct UserInfo: Content {
             var email: String
             var password: String
             var confirmationCode: String
         }
         do {
             let user = try req.content.decode(UserInfo.self)
-            try await Cognito.resetPassword(req: req, username: user.email, password: user.password, confirmationCode: user.confirmationCode)
+            try await cognito.resetPassword(req: req, username: user.email, password: user.password, confirmationCode: user.confirmationCode)
             let model = SuccessfulChange.Model(successMessage: "Successfully changed password")
             return SuccessfulChange.View(path: req.url.path, model: model).document()
         } catch let error as AWSErrorType {
-            let model = Reset.Model(errorMessage: error.message ?? "There was an error.")
+            let errorMessage = (error.message != nil) ? "There was an error: \(error.message)" : "There was an error: \(error.localizedDescription)"
+            let model = Reset.Model(errorMessage: errorMessage)
             return Reset.View(path: req.url.path, model: model).document()
         } catch {
             let model = Reset.Model(errorMessage: "An unknown error occurred: \(error.localizedDescription)")

Sources/App/Controllers/Manage/SessionAuthentication.swift

@@ -1,4 +1,5 @@
 import Vapor
+import Dependencies
 import SotoCognitoAuthentication
 import SotoCognitoIdentityProvider
 import SotoCognitoIdentity
@@ -16,11 +17,12 @@ extension AuthenticatedUser: SessionAuthenticatable {
 
 struct UserSessionAuthenticator: AsyncSessionAuthenticator {
     func authenticate(sessionID: String, for request: Vapor.Request) async throws {
+        @Dependency(\.cognito) var cognito
         do {
             // TODO: handle response, refresh token
-            let response = try await request.application.cognito.authenticatable.authenticate(accessToken: sessionID, on: request.eventLoop)
+            try await cognito.authenticateToken(req: request, sessionID: sessionID, accessToken: sessionID, eventLoop: request.eventLoop)
             request.auth.login(User(accessToken: sessionID))
-        } catch let error as SotoCognitoError { // TODO: handle error 
+        } catch let error as SotoCognitoError { // TODO: handle error
             return
         }
     }

Sources/App/Controllers/Manage/VerifyController.swift

@@ -5,6 +5,7 @@ import Vapor
 import SotoCognitoAuthentication
 import SotoCognitoIdentityProvider
 import SotoCognitoIdentity
+import Dependencies
 
 enum VerifyController {
     @Sendable
@@ -14,18 +15,20 @@ enum VerifyController {
 
     @Sendable
     static func verify(req: Request) async throws -> HTML {
+        @Dependency(\.cognito) var cognito
         struct VerifyInformation: Content {
             var email: String
             var confirmationCode: String
         }
         do {
             let info = try req.content.decode(VerifyInformation.self)
-            try await Cognito.confirmSignUp(req: req, username: info.email, confirmationCode: info.confirmationCode)
+            try await cognito.confirmSignUp(req: req, username: info.email, confirmationCode: info.confirmationCode)
             let model = SuccessfulChange.Model(successMessage: "Successfully confirmed signup")
             return SuccessfulChange.View(path: req.url.path, model: model).document()
         } catch let error as AWSErrorType {
             let info = try req.content.decode(VerifyInformation.self)
-            let model = Verify.Model(email: info.email, errorMessage: error.message ?? "There was an error.")
+            let errorMessage = (error.message != nil) ? "There was an error: \(error.message)" : "There was an error: \(error.localizedDescription)"
+            let model = Verify.Model(email: info.email, errorMessage: errorMessage)
             return Verify.View(path: req.url.path, model: model).document()
         } catch {
             let info = try req.content.decode(VerifyInformation.self)

Sources/App/Core/Dependencies/CognitoClient.swift

@@ -15,18 +15,29 @@
 import Dependencies
 import DependenciesMacros
 import Vapor
+import SotoCognitoAuthenticationKit
 
 @DependencyClient
 struct CognitoClient {
-    var authenticate: @Sendable (_ req: Request, _ username: String, _ password: String) async throws -> Void
+    var authenticate: @Sendable (_ req: Request, _ username: String, _ password: String) async throws -> CognitoAuthenticateResponse
+    var authenticateToken: @Sendable (_ req: Request, _ sessionID: String, _ accessToken: String, _ eventLoop: EventLoop) async throws -> Void
     var signup: @Sendable (_ req: Request, _ username: String, _ password: String) async throws -> Void
+    var resetPassword: @Sendable (_ req: Request, _ username: String, _ password: String, _ confirmationCode: String) async throws -> Void
+    var forgotPassword: @Sendable (_ req: Request, _ username: String) async throws -> Void
+    var confirmSignUp: @Sendable (_ req: Request, _ username: String, _ confirmationCode: String) async throws -> Void
+    var deleteUser: @Sendable (_ req: Request, _ accessToken: String) async throws -> Void
 }
 
 extension CognitoClient: DependencyKey {
     static var liveValue: CognitoClient {
         .init(
             authenticate: { req, username, password in try await Cognito.authenticate(req: req, username: username, password: password) },
-            signup : { req, username, password in try await Cognito.signup(req: req, username: username, password: password) }
+            authenticateToken: { req, sessionID, accessToken, eventLoop in try await Cognito.authenticateToken(req: req, sessionID: sessionID, accessToken: accessToken, on: eventLoop)},
+            signup : { req, username, password in try await Cognito.signup(req: req, username: username, password: password) },
+            resetPassword : { req, username, password, confirmationCode in try await Cognito.resetPassword(req: req, username: username, password: password, confirmationCode: confirmationCode) },
+            forgotPassword: { req, username in try await Cognito.forgotPassword(req: req, username: username) },
+            confirmSignUp: { req, username, confirmationCode in try await Cognito.confirmSignUp(req: req, username: username, confirmationCode: confirmationCode) },
+            deleteUser: { req, accessToken in try await Cognito.deleteUser(req: req, accessToken: accessToken) }
         )
     }
 }