descriptive env variables + entirely move cognito config

Author: rahafjrw

Sources/App/Controllers/Manage/Cognito.swift

@@ -8,9 +8,9 @@ struct Cognito {
     static func authenticate(req: Request, username: String, password: String) async throws {
         let awsClient = AWSClient(httpClientProvider: .shared(req.application.http.client.shared))
         let awsCognitoConfiguration = CognitoConfiguration(
-            userPoolId: Environment.get("POOL_ID")!,
-            clientId: Environment.get("CLIENT_ID")!,
-            clientSecret: Environment.get("CLIENT_SECRET")!,
+            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
         )
@@ -30,9 +30,9 @@ struct Cognito {
     static func signup(req: Request, username: String, password: String) async throws {
         let awsClient = AWSClient(httpClientProvider: .shared(req.application.http.client.shared))
         let awsCognitoConfiguration = CognitoConfiguration(
-            userPoolId: Environment.get("POOL_ID")!,
-            clientId: Environment.get("CLIENT_ID")!,
-            clientSecret: Environment.get("CLIENT_SECRET")!,
+            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
         )

Sources/App/Controllers/Manage/LoginController.swift

@@ -16,23 +16,13 @@ enum LoginController {
     @Sendable
     static func login(req: Request) async throws -> Response {
         @Dependency(\.cognito) var cognito
-        let awsClient = AWSClient(httpClientProvider: .shared(req.application.http.client.shared))
-        let awsCognitoConfiguration = CognitoConfiguration(
-            userPoolId: Environment.get("POOL_ID")!,
-            clientId: Environment.get("CLIENT_ID")!,
-            clientSecret: Environment.get("CLIENT_SECRET")!,
-            cognitoIDP: CognitoIdentityProvider(client: awsClient, region: .useast2),
-            adminClient: true
-        )
-        req.application.cognito.authenticatable = CognitoAuthenticatable(configuration: awsCognitoConfiguration)
         struct UserCreds: Content {
             var email: String
             var password: String
         }
         do {
             let user = try req.content.decode(UserCreds.self)
             try await cognito.authenticate(req: req, username: user.email, password: user.password)
-            try await awsClient.shutdown()
             return req.redirect(to: SiteURL.portal.relativeURL(), redirectType: .normal)
         } catch let error as SotoCognitoError {
             var model = Login.Model(errorMessage: "There was an error. Please try again.")
@@ -44,13 +34,10 @@ enum LoginController {
             case .invalidPublicKey:
                 break
             }
-            try await awsClient.shutdown()
             return Login.View(path: req.url.path, model: model).document().encodeResponse(status: .unauthorized)
         } catch let error as AWSClientError {
-            try await awsClient.shutdown()
             return Login.View(path: SiteURL.login.relativeURL(), model: Login.Model(errorMessage: "An AWS client error occurred: \(error.errorCode)")).document().encodeResponse(status: .unauthorized)
         } catch {
-            try await awsClient.shutdown()
             return Login.View(path: SiteURL.login.relativeURL(), model: Login.Model(errorMessage: "An unknown error occurred: \(error.localizedDescription)")).document().encodeResponse(status: .unauthorized)
         }
 

Sources/App/Controllers/Manage/SignupController.swift

@@ -15,30 +15,18 @@ enum SignupController {
     @Sendable
     static func signup(req: Request) async throws -> HTML {
         @Dependency(\.cognito) var cognito
-        let awsClient = AWSClient(httpClientProvider: .shared(req.application.http.client.shared))
-        let awsCognitoConfiguration = CognitoConfiguration(
-            userPoolId: Environment.get("POOL_ID")!,
-            clientId: Environment.get("CLIENT_ID")!,
-            clientSecret: Environment.get("CLIENT_SECRET")!,
-            cognitoIDP: CognitoIdentityProvider(client: awsClient, region: .useast2),
-            adminClient: true
-        )
-        req.application.cognito.authenticatable = CognitoAuthenticatable(configuration: awsCognitoConfiguration)
         struct UserCreds: Content {
             var email: String
             var password: String
         }
         do {
             let user = try req.content.decode(UserCreds.self)
             try await cognito.signup(req: req, username: user.email, password: user.password)
-            try await awsClient.shutdown()
             return Verify.View(path: SiteURL.verify.relativeURL(), model: Verify.Model(email: user.email)).document()
         } catch let error as AWSErrorType {
             let model = Signup.Model(errorMessage: error.message ?? "There was an error.")
-            try await awsClient.shutdown()
             return Signup.View(path: req.url.path, model: model).document()
         } catch {
-            try await awsClient.shutdown()
             return Signup.View(path: SiteURL.signup.relativeURL(), model: Signup.Model(errorMessage: "An unknown error occurred: \(error.localizedDescription)")).document()
         }