Test PR - Ignore

FrontEnd/main.scss

@@ -38,6 +38,7 @@ $mobile-breakpoint: 740px;
 @import 'styles/package_list';
 @import 'styles/package';
 @import 'styles/panel_button';
+@import 'styles/portal';
 @import 'styles/readme';
 @import 'styles/search_results';
 @import 'styles/search';

FrontEnd/styles/header_footer.scss

@@ -36,6 +36,7 @@ footer {
             display: flex;
             flex-direction: row;
             flex-wrap: wrap;
+            align-items: center;
             justify-content: center;
             margin: 0;
             padding: 0;
@@ -91,6 +92,13 @@ header {
                 border-color: var(--header-link-highlight);
             }
         }
+
+        li.portal {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            height: 100%;
+        }
     }
 
     @media screen and (max-width: $mobile-breakpoint) {

FrontEnd/styles/portal.scss

@@ -0,0 +1,29 @@
+// Copyright Dave Verwer, Sven A. Schmidt, and other contributors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// -------------------------------------------------------------------------
+// Styles for authentication pages (login, signup, etc.)
+// -------------------------------------------------------------------------
+
+.portal-form-container {
+    height: 55vh;
+    padding: 10%;
+}
+
+.portal-form-inputs {
+    display: flex;
+    flex-direction: column;
+    width: 50%;
+    margin-bottom: 15px;
+}

FrontEnd/styles/search.scss

@@ -111,7 +111,7 @@ section.search {
 
 nav > ul > li.search > form {
     grid-template-columns: auto 30px;
-    max-width: 160px;
+    max-width: 140px;
 
     input[type='search'] {
         padding: 5px;

Sources/App/Controllers/Portal/DeleteAccountController.swift

@@ -0,0 +1,27 @@
+import Foundation
+import Dependencies
+import Fluent
+import Plot
+import Vapor
+import SotoCognitoAuthentication
+import SotoCognitoIdentityProvider
+import SotoCognitoIdentity
+
+extension Portal {
+
+    enum DeleteAccountController {
+        @Sendable
+        static func deleteAccount(req: Request) async throws -> Response {
+            @Dependency(\.cognito) var cognito
+            do {
+                try await cognito.deleteUser(req: req)
+                req.auth.logout(AuthenticatedUser.self)
+                req.session.unauthenticate(AuthenticatedUser.self)
+                req.session.destroy()
+                return req.redirect(to: SiteURL.home.relativeURL())
+            } catch {
+                return PortalPage.View(path: SiteURL.portal.relativeURL(), model: PortalPage.Model(errorMessage: "An unknown error occurred: \(error.localizedDescription)")).document().encodeResponse(status: .internalServerError)
+            }
+        }
+    }
+}

Sources/App/Controllers/Portal/ForgotPasswordController.swift

@@ -0,0 +1,32 @@
+import Fluent
+import Dependencies
+import Plot
+import Vapor
+import SotoCognitoAuthentication
+import SotoCognitoIdentityProvider
+import SotoCognitoIdentity
+
+extension Portal {
+
+    enum ForgotPasswordController {
+        @Sendable
+        static func show(req: Request) async throws -> HTML {
+            return ForgotPassword.View(path: req.url.path, model: ForgotPassword.Model()).document()
+        }
+
+        @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)
+                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/Portal/LoginController.swift

@@ -0,0 +1,56 @@
+import Foundation
+import Dependencies
+import Fluent
+import Plot
+import Vapor
+import SotoCognitoAuthentication
+import SotoCognitoIdentityProvider
+import SotoCognitoIdentity
+
+enum Portal {
+
+    enum LoginController {
+        @Sendable
+        static func show(req: Request) async throws -> HTML {
+            return Login.View(path: req.url.path, model: Login.Model(errorMessage: "")).document()
+        }
+
+        @Sendable
+        static func login(req: Request) async throws -> Response {
+            @Dependency(\.cognito) var cognito
+            struct UserCreds: Content {
+                var email: String
+                var password: String
+            }
+            do {
+                let user = try req.content.decode(UserCreds.self)
+                let response = try await cognito.authenticate(req: req, username: user.email, password: user.password)
+                switch response {
+                case .authenticated(let authenticatedResponse):
+                    let user = AuthenticatedUser(accessToken: authenticatedResponse.accessToken!)
+                    req.auth.login(user)
+                case .challenged(_): // Cognito is not configured to send challenges, so we should never receive this response.
+                    break
+                }
+                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.")
+                switch error {
+                case .unauthorized(let reason):
+                    model = Login.Model(errorMessage: reason ?? "There was an error. Please try again.")
+                case .unexpectedResult(let reason):
+                    model = Login.Model(errorMessage: reason ?? "There was an error. Please try again.")
+                case .invalidPublicKey:
+                    break
+                }
+                return Login.View(path: req.url.path, model: model).document().encodeResponse(status: .unauthorized)
+            } catch let error as AWSClientError {
+                return Login.View(path: SiteURL.login.relativeURL(), model: Login.Model(errorMessage: "An AWS client error occurred: \(error.errorCode)")).document().encodeResponse(status: .unauthorized)
+            } catch {
+                return Login.View(path: SiteURL.login.relativeURL(), model: Login.Model(errorMessage: "An unknown error occurred: \(error.localizedDescription)")).document().encodeResponse(status: .unauthorized)
+            }
+
+        }
+    }
+}
+

Sources/App/Controllers/Portal/LogoutController.swift

@@ -0,0 +1,21 @@
+import Foundation
+import Fluent
+import Plot
+import Vapor
+import SotoCognitoAuthentication
+import SotoCognitoIdentityProvider
+import SotoCognitoIdentity
+
+extension Portal {
+
+    enum LogoutController {
+        @Sendable
+        static func logout(req: Request) async throws -> Response {
+            req.auth.logout(AuthenticatedUser.self)
+            req.session.unauthenticate(AuthenticatedUser.self)
+            req.session.destroy()
+            return req.redirect(to: SiteURL.home.relativeURL())
+        }
+    }
+}
+

Sources/App/Controllers/Portal/PortalController.swift

@@ -0,0 +1,14 @@
+import Fluent
+import Plot
+import Vapor
+import SotoCognitoAuthenticationKit
+
+extension Portal {
+
+    enum PortalController {
+        @Sendable
+        static func show(req: Request) async throws -> HTML {
+            return PortalPage.View(path: req.url.path, model: PortalPage.Model()).document()
+        }
+    }
+}

Sources/App/Controllers/Portal/ResetController.swift

@@ -0,0 +1,40 @@
+import Fluent
+import Dependencies
+import Plot
+import Vapor
+import SotoCognitoAuthentication
+import SotoCognitoIdentityProvider
+import SotoCognitoIdentity
+
+extension Portal {
+
+    enum ResetController {
+        @Sendable
+        static func show(req: Request) async throws -> HTML {
+            return Reset.View(path: req.url.path, model: Reset.Model()).document()
+        }
+
+        @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)
+                let model = SuccessfulChange.Model(successMessage: "Successfully changed password")
+                return SuccessfulChange.View(path: req.url.path, model: model).document()
+            } catch let error as AWSErrorType {
+                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)")
+                return Reset.View(path: req.url.path, model: model).document()
+            }
+        }
+    }
+}

Sources/App/Controllers/Portal/SignupController.swift

@@ -0,0 +1,38 @@
+import Fluent
+import Dependencies
+import Plot
+import Vapor
+import SotoCognitoAuthentication
+import SotoCognitoIdentityProvider
+import SotoCognitoIdentity
+
+extension Portal {
+
+    enum SignupController {
+        @Sendable
+        static func show(req: Request) async throws -> HTML {
+            return Signup.View(path: req.url.path, model: Signup.Model(errorMessage: "")).document()
+        }
+
+        @Sendable
+        static func signup(req: Request) async throws -> HTML {
+            @Dependency(\.cognito) var cognito
+            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)
+                return Verify.View(path: SiteURL.verify.relativeURL(), model: Verify.Model(email: user.email)).document()
+            } catch let error as AWSErrorType {
+                let errorMessage = (error.message != nil) ? "There was an error: \(error.message)" : "There was an error: \(error.localizedDescription)"
+                let model = Signup.Model(errorMessage: errorMessage)
+                return Signup.View(path: req.url.path, model: model).document()
+            } catch {
+                return Signup.View(path: SiteURL.signup.relativeURL(), model: Signup.Model(errorMessage: "An unknown error occurred: \(error.localizedDescription)")).document()
+            }
+
+        }
+    }
+}

Sources/App/Controllers/Portal/VerifyController.swift

@@ -0,0 +1,42 @@
+
+import Fluent
+import Plot
+import Vapor
+import SotoCognitoAuthentication
+import SotoCognitoIdentityProvider
+import SotoCognitoIdentity
+import Dependencies
+
+extension Portal {
+
+    enum VerifyController {
+        @Sendable
+        static func show(req: Request) async throws -> HTML {
+            return Verify.View(path: req.url.path, model: Verify.Model(email: "")).document()
+        }
+
+        @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)
+                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 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)
+                let model = Verify.Model(email: info.email, errorMessage: "An unknown error occurred: \(error.localizedDescription)")
+                return Verify.View(path: req.url.path, model: model).document()
+            }
+        }
+    }
+}