Merge with main

.github/workflows/build-and-deploy.yml

@@ -25,7 +25,7 @@ jobs:
         run: |
           cd frontend
           touch .env
-          echo APP_FIREBASE_CONFIG=${{ secrets.APP_FIREBASE_CONFIG }} >> .env
+          echo NEXT_PUBLIC_FIREBASE_CONFIG=${{ secrets.NEXT_PUBLIC_FIREBASE_CONFIG }} >> .env
       - name: Create Backend .env
         run: |
           cd backend

backend/package.json

@@ -15,6 +15,9 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
+  "engines": {
+    "node": "18"
+  },
   "dependencies": {
     "cors": "^2.8.5",
     "dotenv": "^16.3.1",

backend/src/controllers/user.ts

@@ -1,11 +1,10 @@
 import { NextFunction, Request, Response } from "express";
 import { validationResult } from "express-validator";
-import { signInWithEmailAndPassword } from "firebase/auth";
 import admin from "firebase-admin";
 
-import { AuthError } from "../errors/auth";
+import { ValidationError } from "../errors/validation";
 import UserModel from "../models/user";
-import { firebaseAdminAuth, firebaseAuth } from "../util/firebase";
+import { firebaseAdminAuth } from "../util/firebase";
 import validationErrorParser from "../util/validationErrorParser";
 
 // Define the type for req.body
@@ -17,8 +16,7 @@ type CreateUserRequestBody = {
 };
 
 type LoginUserRequestBody = {
-  email: string;
-  password: string;
+  uid: string;
 };
 
 export const createUser = async (
@@ -65,31 +63,20 @@ export const loginUser = async (
   nxt: NextFunction,
 ) => {
   try {
-    // Check for validation errors
-    const errors = validationResult(req);
-    validationErrorParser(errors);
-
-    const { email, password } = req.body;
-    // Sign user into Firebase
-    await signInWithEmailAndPassword(firebaseAuth, email, password)
-      .then((userCredential) => {
-        const user = userCredential.user;
-        console.log(user);
-        return UserModel.findById(user.uid);
-      })
-      .then((user) => {
-        if (user !== null) {
-          res.status(200).json({ uid: user._id, approvalStatus: user.approvalStatus });
-        }
-        throw AuthError.LOGIN_ERROR;
-      })
-      .catch(() => {
-        throw AuthError.LOGIN_ERROR;
-      });
-  } catch (error) {
-    console.error(error);
-    nxt(error);
+    const uid = req.body.uid;
+    const user = await UserModel.findById(uid);
+    if (!user) {
+      throw ValidationError.USER_NOT_FOUND;
+    }
+    res
+      .status(200)
+      .json({ uid: user._id, role: user.accountType, approvalStatus: user.approvalStatus });
+    return;
+  } catch (e) {
+    nxt();
+    console.log(e);
+    return res.status(400).json({
+      error: e,
+    });
   }
-
-  return;
 };

backend/src/errors/auth.ts

@@ -4,8 +4,6 @@
 
 import { CustomError } from "./errors";
 
-const LOGIN_ERROR = "Login Failed. Please check the username and password.";
-
 const DECODE_ERROR = "Error decoding the auth token. Make sure the auth token is valid";
 const TOKEN_NOT_IN_HEADER =
   "Token was not found in the header. Be sure to use Bearer <Token> syntax";
@@ -17,6 +15,4 @@ export class AuthError extends CustomError {
   static TOKEN_NOT_IN_HEADER = new AuthError(1, 401, TOKEN_NOT_IN_HEADER);
 
   static INVALID_AUTH_TOKEN = new AuthError(2, 401, INVALID_AUTH_TOKEN);
-
-  static LOGIN_ERROR = new AuthError(3, 401, LOGIN_ERROR);
 }

backend/src/errors/validation.ts

@@ -1,10 +1,12 @@
 import { CustomError } from "./errors";
 
 const USER_CREATION_UNSUCCESSFUL = "User not created successfully";
+const USER_NOT_FOUND = "User not found in database";
 
 export class ValidationError extends CustomError {
   constructor(code: number, status: number, message: string) {
     super(code, status, "VALIDATION ERROR: " + message);
   }
   static USER_CREATION_UNSUCCESSFUL = new ValidationError(1, 400, USER_CREATION_UNSUCCESSFUL);
+  static USER_NOT_FOUND = new ValidationError(1, 400, USER_NOT_FOUND);
 }

backend/src/routes/user.ts

@@ -1,13 +1,14 @@
 import express from "express";
 
 import * as UserController from "../controllers/user";
+import { verifyAuthToken } from "../validators/auth";
 import * as UserValidator from "../validators/user";
 
 const router = express.Router();
 
 router.use(express.json());
 
-router.post("/login", UserValidator.loginUser, UserController.loginUser);
-router.post("/", UserValidator.createUser, UserController.createUser);
+router.post("/create", UserValidator.createUser, UserController.createUser);
+router.get("/", [verifyAuthToken], UserController.loginUser);
 
 export default router;

backend/src/util/firebase.ts

@@ -5,12 +5,10 @@
  * firebase to for authentication.
  */
 
-import * as firebase from "firebase/app";
-import { getAuth } from "firebase/auth";
 import * as firebaseAdmin from "firebase-admin/app";
 import { getAuth as getAdminAuth } from "firebase-admin/auth";
 
-import { firebaseConfig, serviceAccountKey } from "../config";
+import { serviceAccountKey } from "../config";
 
 /**
  * This will initialize the firebase app to store
@@ -21,9 +19,6 @@ firebaseAdmin.initializeApp({
   credential: firebaseAdmin.cert(JSON.parse(serviceAccountKey) as string),
 });
 
-const firebaseApp = firebase.initializeApp(JSON.parse(firebaseConfig) as object);
-
 const firebaseAdminAuth = getAdminAuth();
-const firebaseAuth = getAuth(firebaseApp);
 
-export { firebaseAdminAuth, firebaseAuth };
+export { firebaseAdminAuth };

backend/src/validators/user.ts

@@ -26,7 +26,7 @@ export const createUser: ValidationChain[] = [
 ];
 
 export const loginUser: ValidationChain[] = [
-  body("email")
+  body("uid")
     .notEmpty()
     .withMessage("Email cannot be empty.")
     .isEmail()

frontend/.eslintrc.json

@@ -27,6 +27,7 @@
     // "@typescript-eslint/ban-ts-comment": "off",
     // "@typescript-eslint/no-explicit-any": "off",
     // "@typescript-eslint/no-non-null-assertion": "off",
+    "@typescript-eslint/no-empty-function": "off",
 
     "@typescript-eslint/no-unsafe-assignment": "warn",