seperate verify and delete cognito functions

Author: rahafjrw

Sources/App/Controllers/Manage/Cognito.swift

@@ -79,4 +79,34 @@ struct Cognito {
         try await req.application.cognito.authenticatable.confirmForgotPassword(username: username, newPassword: password, confirmationCode: confirmationCode)
         try awsClient.syncShutdown()
     }
+    
+    @Sendable
+    static func confirmSignUp(req: Request, username: String, confirmationCode: String) async throws {
+        let awsClient = AWSClient(httpClientProvider: .shared(req.application.http.client.shared))
+        let awsCognitoConfiguration = CognitoConfiguration(
+            userPoolId: Environment.get("AWS_COGNITO_POOL_ID")!,
+            clientId: Environment.get("AWS_COGNITO_CLIENT_ID")!,
+            clientSecret: Environment.get("AWS_COGNITO_CLIENT_SECRET")!,
+            cognitoIDP: CognitoIdentityProvider(client: awsClient, region: .useast2),
+            adminClient: true
+        )
+        req.application.cognito.authenticatable = CognitoAuthenticatable(configuration: awsCognitoConfiguration)
+        try await req.application.cognito.authenticatable.confirmSignUp(username: username, confirmationCode: confirmationCode)
+    }
+    
+    @Sendable
+    static func deleteUser(req: Request, accessToken: String) async throws {
+        let awsClient = AWSClient(httpClientProvider: .shared(req.application.http.client.shared))
+        let awsCognitoConfiguration = CognitoConfiguration(
+            userPoolId: Environment.get("AWS_COGNITO_POOL_ID")!,
+            clientId: Environment.get("AWS_COGNITO_CLIENT_ID")!,
+            clientSecret: Environment.get("AWS_COGNITO_CLIENT_SECRET")!,
+            cognitoIDP: CognitoIdentityProvider(client: awsClient, region: .useast2),
+            adminClient: true
+        )
+        req.application.cognito.authenticatable = CognitoAuthenticatable(configuration: awsCognitoConfiguration)
+        let request = CognitoIdentityProvider.DeleteUserRequest(accessToken: accessToken)
+        try await req.application.cognito.authenticatable.configuration.cognitoIDP.deleteUser(request)
+        try awsClient.syncShutdown()
+    }
 }

Sources/App/Controllers/Manage/DeleteAccountController.swift

@@ -10,8 +10,7 @@ enum DeleteAccountController {
     @Sendable
     static func deleteAccount(req: Request) async throws -> Response {
         do {
-            let request = try CognitoIdentityProvider.DeleteUserRequest(accessToken: req.auth.require(AuthenticatedUser.self).sessionID)
-            try await req.application.cognito.authenticatable.configuration.cognitoIDP.deleteUser(request)
+            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/VerifyController.swift

@@ -18,15 +18,17 @@ enum VerifyController {
             var email: String
             var confirmationCode: String
         }
-        let info = try req.content.decode(VerifyInformation.self)
         do {
-            try await req.application.cognito.authenticatable.confirmSignUp(username: info.email, confirmationCode: info.confirmationCode)
+            let info = try req.content.decode(VerifyInformation.self)
+            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.")
             return Verify.View(path: req.url.path, model: model).document()
         } catch {
+            let info = try req.content.decode(VerifyInformation.self)
             let model = Verify.Model(email: info.email, errorMessage: "An unknown error occurred: \(error.localizedDescription)")
             return Verify.View(path: req.url.path, model: model).document()
         }