Merge pull request #57 from uwblueprint/LoginError

Login error

backend/rest/authRoutes.ts

@@ -21,6 +21,7 @@ import IAuthService from "../services/interfaces/authService";
 import IEmailService from "../services/interfaces/emailService";
 import IUserService from "../services/interfaces/userService";
 import { getErrorMessage } from "../utilities/errorUtils";
+import { AuthErrorCodes } from "../types/authTypes";
 
 const authRouter: Router = Router();
 const userService: IUserService = new UserService();
@@ -35,20 +36,50 @@ const cookieOptions: CookieOptions = {
 
 /* Returns access token and user info in response body and sets refreshToken as an httpOnly cookie */
 authRouter.post("/login", loginRequestValidator, async (req, res) => {
+  const requestedRole = req.body.attemptedRole;
+  let correctRole = null;
   try {
     const authDTO = await authService.generateToken(
       req.body.email,
       req.body.password,
     );
 
-    const { refreshToken, ...rest } = authDTO;
+    const { accessToken, refreshToken, ...rest } = authDTO;
+    correctRole = rest.role;
+
+    if (correctRole !== requestedRole) {
+      throw new Error(AuthErrorCodes.WRONG_USER_TYPE);
+    }
+
+    const isVerified = await authService.isAuthorizedByEmail(
+      accessToken,
+      req.body.email,
+    );
+
+    if (!isVerified) {
+      throw new Error(AuthErrorCodes.UNVERIFIED_EMAIL);
+    }
 
     res
       .cookie("refreshToken", refreshToken, cookieOptions)
       .status(200)
       .json(rest);
   } catch (error: unknown) {
-    res.status(500).json({ error: getErrorMessage(error) });
+    const message = getErrorMessage(error);
+    if (
+      req.body.attemptedRole !== "Learner" &&
+      (message === AuthErrorCodes.EMAIL_NOT_FOUND ||
+        message === AuthErrorCodes.INCORRECT_PASSWORD)
+    ) {
+      res.status(500).json({ error: AuthErrorCodes.INVALID_LOGIN_CREDENTIALS });
+    } else if (message === AuthErrorCodes.WRONG_USER_TYPE) {
+      res.status(500).json({
+        error: message,
+        errorData: [requestedRole, correctRole],
+      });
+    } else {
+      res.status(500).json({ error: message });
+    }
   }
 });
 

backend/services/implementations/authService.ts

@@ -27,11 +27,11 @@ class AuthService implements IAuthService {
   /* eslint-disable class-methods-use-this */
   async generateToken(email: string, password: string): Promise<AuthDTO> {
     try {
+      const user = await this.userService.getUserByEmail(email);
       const token = await FirebaseRestClient.signInWithPassword(
         email,
         password,
       );
-      const user = await this.userService.getUserByEmail(email);
       return { ...token, ...user };
     } catch (error) {
       Logger.error(`Failed to generate token for user with email ${email}`);

backend/services/implementations/userService.ts

@@ -8,6 +8,7 @@ import {
   UpdateUserDTO,
   UserDTO,
 } from "../../types/userTypes";
+import { AuthErrorCodes } from "../../types/authTypes";
 import { getErrorMessage } from "../../utilities/errorUtils";
 import logger from "../../utilities/logger";
 
@@ -59,7 +60,7 @@ class UserService implements IUserService {
       }
     } catch (error: unknown) {
       Logger.error(`Failed to get user. Reason = ${getErrorMessage(error)}`);
-      throw new Error("EMAIL_NOT_FOUND");
+      throw new Error(AuthErrorCodes.EMAIL_NOT_FOUND);
     }
 
     return {

backend/types/authTypes.ts

@@ -17,3 +17,11 @@ export type NodemailerConfig = {
     refreshToken: string;
   };
 };
+
+export enum AuthErrorCodes {
+  INVALID_LOGIN_CREDENTIALS = "INVALID_LOGIN_CREDENTIALS",
+  UNVERIFIED_EMAIL = "UNVERIFIED_EMAIL",
+  WRONG_USER_TYPE = "WRONG_USER_TYPE",
+  EMAIL_NOT_FOUND = "EMAIL_NOT_FOUND",
+  INCORRECT_PASSWORD = "INCORRECT_PASSWORD",
+}

backend/utilities/firebaseRestClient.ts

@@ -1,6 +1,6 @@
 import fetch, { Response } from "node-fetch";
 
-import { Token } from "../types/authTypes";
+import { AuthErrorCodes, Token } from "../types/authTypes";
 import logger from "./logger";
 
 const Logger = logger(__filename);
@@ -62,15 +62,20 @@ const FirebaseRestClient = {
       await response.json();
 
     if (!response.ok) {
+      const firebaseErrorMessage = (responseJson as RequestError).error.message;
+
       const errorMessage = [
         "Failed to sign-in via Firebase REST API, status code =",
         `${response.status},`,
         "error message =",
-        (responseJson as RequestError).error.message,
+        firebaseErrorMessage,
       ];
       Logger.error(errorMessage.join(" "));
-
-      throw new Error("Failed to sign-in via Firebase REST API");
+      if (firebaseErrorMessage === "INVALID_LOGIN_CREDENTIALS") {
+        throw new Error(AuthErrorCodes.INCORRECT_PASSWORD);
+      } else {
+        throw new Error("Failed to sign-in via Firebase REST API");
+      }
     }
 
     return {