Sign-up Page Functionality

backend/app/rest/auth_routes.py

@@ -3,6 +3,7 @@
     InvalidPasswordException,
     TooManyLoginAttemptsException,
 )
+from ..utilities.exceptions.auth_exceptions import EmailAlreadyInUseException
 
 from flask import Blueprint, current_app, jsonify, request
 from twilio.rest import Client
@@ -188,6 +189,9 @@ def register():
             **cookie_options,
         )
         return response, 200
+    except EmailAlreadyInUseException as e:
+        error_message = getattr(e, "message", None)
+        return jsonify({"error": (error_message if error_message else str(e))}), 409
     except Exception as e:
         error_message = getattr(e, "message", None)
         return jsonify({"error": (error_message if error_message else str(e))}), 500

backend/app/rest/user_routes.py

@@ -12,6 +12,7 @@
 from ..services.implementations.email_service import EmailService
 from ..services.implementations.user_service import UserService
 from ..utilities.csv_utils import generate_csv_from_list
+from ..utilities.exceptions.auth_exceptions import UserNotInvitedException
 
 
 user_service = UserService(current_app.logger)
@@ -91,6 +92,9 @@ def get_user_status():
         email = request.args.get("email")
         user_status = user_service.get_user_status_by_email(email)
         return jsonify({"user_status": user_status, "email": email}), 201
+    except UserNotInvitedException as e:
+        error_message = getattr(e, "message", None)
+        return jsonify({"error": (error_message if error_message else str(e))}), 403
     except Exception as e:
         error_message = getattr(e, "message", None)
         return jsonify({"error": (error_message if error_message else str(e))}), 500

backend/app/services/implementations/user_service.py

@@ -4,6 +4,9 @@
 from ...models.user import User
 from ...models import db
 from ...resources.user_dto import UserDTO
+from ...utilities.exceptions.auth_exceptions import (
+  UserNotInvitedException, EmailAlreadyInUseException
+)
 
 
 class UserService(IUserService):
@@ -146,7 +149,7 @@ def get_user_status_by_email(self, email):
             user = User.query.filter_by(email=email).first()
 
             if not user:
-                raise Exception("user with email {email} not found".format(email))
+                raise UserNotInvitedException
 
             return user.user_status
         except Exception as e:
@@ -210,7 +213,11 @@ def activate_user(self, user, auth_id=None, signup_method="PASSWORD"):
         firebase_user = None
 
         try:
-            if self.get_user_status_by_email(user.email) == "Invited":
+            cur_user_status = self.get_user_status_by_email(user.email)
+
+            if cur_user_status == "Active":
+                raise EmailAlreadyInUseException
+            if cur_user_status == "Invited":
                 if signup_method == "PASSWORD":
                     firebase_user = firebase_admin.auth.create_user(
                         email=user.email, password=user.password

backend/app/utilities/exceptions/auth_exceptions.py

@@ -0,0 +1,17 @@
+class UserNotInvitedException(Exception):
+    """
+    Raised when a user that has not been invited attempts to register
+    """
+
+    def __init__(self):
+        self.message = "This email address has not been invited. Please try again with a different email."
+        super().__init__(self.message)
+
+class EmailAlreadyInUseException(Exception):
+    """
+    Raised when a user attempts to register with an email of a previously activated user
+    """
+
+    def __init__(self):
+        self.message = "This email is already in use. Please try again with a different email."
+        super().__init__(self.message)

frontend/src/APIClients/AuthAPIClient.ts

@@ -1,10 +1,13 @@
 import {
   FetchResult,
   MutationFunctionOptions,
   OperationVariables,
 } from "@apollo/client";
 import { AxiosError } from "axios";
-import getLoginErrMessage from "../helper/authErrorMessage";
+import { 
+  getAuthErrMessage
+} 
+from "../helper/authError";
 import AUTHENTICATED_USER_KEY from "../constants/AuthConstants";
 import {
   AuthenticatedUser,
@@ -29,11 +32,11 @@
     );
     return data;
   } catch (error) {
     const axiosErr = (error as any) as AxiosError;
     if (axiosErr.response && axiosErr.response.status === 401) {
       return {
         errCode: axiosErr.response.status,
-        errMessage: getLoginErrMessage(axiosErr.response),
+        errMessage: getAuthErrMessage(axiosErr.response, 'LOGIN'),
       };
     }
     return {
@@ -99,7 +102,7 @@
   lastName: string,
   email: string,
   password: string,
-): Promise<AuthTokenResponse> => {
+): Promise<AuthTokenResponse | ErrorResponse> => {
   try {
     const { data } = await baseAPIClient.post(
       "/auth/register",
@@ -108,6 +111,13 @@
     );
     return data;
   } catch (error) {
+    const axiosErr = (error as any) as AxiosError;
+    if (axiosErr.response && axiosErr.response.status === 409) {
+      return {
+        errCode: axiosErr.response.status,
+        errMessage: getAuthErrMessage(axiosErr.response, 'SIGNUP'),
+      };
+    }
     return null;
   }
 };

frontend/src/APIClients/CommonAPIClient.ts

@@ -1,6 +1,8 @@
+import { AxiosError } from "axios";
 import AUTHENTICATED_USER_KEY from "../constants/AuthConstants";
 import { getLocalStorageObjProperty } from "../utils/LocalStorageUtils";
 import baseAPIClient from "./BaseAPIClient";
+import { ErrorResponse } from "../types/AuthTypes";
 
 const inviteUser = async (
   email: string,
@@ -19,12 +21,12 @@
       { headers: { Authorization: bearerToken } },
     );
     return "Success";
   } catch (error: any) {
     return error.message;
   }
 };
 
-const getUserStatus = async (email: string): Promise<string> => {
+const getUserStatus = async (email: string): Promise<string | ErrorResponse> => {
   try {
     if (email === "") {
       return "";
@@ -44,6 +46,13 @@
     }
     return "Not invited";
   } catch (error) {
+    const axiosErr = (error as any) as AxiosError;
+    if (axiosErr.response && axiosErr.response.status === 403) {
+      return {
+        errCode: axiosErr.response.status,
+        errMessage: axiosErr.response.data.error,
+      };
+    }
     return "Not invited";
   }
 };

frontend/src/components/forms/Login.tsx

@@ -15,6 +15,7 @@ import { HOME_PAGE, SIGNUP_PAGE } from "../../constants/Routes";
 import AuthContext from "../../contexts/AuthContext";
 import { ErrorResponse, AuthTokenResponse } from "../../types/AuthTypes";
 import commonApiClient from "../../APIClients/CommonAPIClient";
+import { isAuthErrorResponse } from "../../helper/authError";
 
 type CredentialsProps = {
   email: string;
@@ -26,12 +27,6 @@ type CredentialsProps = {
   setToggle: (toggle: boolean) => void;
 };
 
-const isLoginErrorResponse = (
-  res: AuthTokenResponse | ErrorResponse,
-): res is ErrorResponse => {
-  return res !== null && "errCode" in res;
-};
-
 const Login = ({
   email,
   setEmail,
@@ -77,11 +72,11 @@ const Login = ({
   const onLogInClick = async () => {
     setLoginClicked(true);
     const isInvited = await commonApiClient.isUserInvited(email);
-    if (isInvited) {
+    if (isInvited !== "Not Invited") {
       const loginResponse:
         | AuthTokenResponse
         | ErrorResponse = await authAPIClient.login(email, password);
-      if (isLoginErrorResponse(loginResponse)) {
+      if (isAuthErrorResponse(loginResponse)) {
         setPasswordError(true);
         setPasswordErrStr(loginResponse.errMessage);
       } else if (loginResponse) {