Merge branch 'main' of https://github.com/cepdnaclk/e19-3yp-impact-tr…

…acker
cepdnaclk · Jan 29, 2024 · e60fd40 · e60fd40
2 parents 3fe5f60 + 3506eb9
commit e60fd40
Show file tree

Hide file tree

Showing 5 changed files with 174 additions and 176 deletions.
diff --git a/code/backend/src/controllers/login.controller.ts b/code/backend/src/controllers/login.controller.ts
@@ -43,14 +43,19 @@ class LoginController {
     }
 
     const email = loginReq.userName;
-    const manager = await ManagerModel.findOne({ email });
+    const manager = await ManagerModel.findOne({
+      teamId: loginReq.teamId,
+      email: email,
+    });
+    console.log(300);
+    console.log(manager);
+
+    console.log(manager?.isVerified);
+
     if (manager?.isVerified == "pending" || manager?.isVerified == "rejected") {
       throw new Error(HttpMsg.MANAGER_NOT_VERIFIED);
     }
 
-
-
-
     try {
       // create refresh token
       const refreshToken = createRefreshTokenManager(loginReq, role);
@@ -84,9 +89,6 @@ class LoginController {
       loginReq.password
     );
 
-
-
-
     if (!isMatch) {
       throw new Error(HttpMsg.PASSWORD_INCORRECT);
     }
@@ -97,7 +99,6 @@ class LoginController {
       throw new Error(HttpMsg.PLAYER_NOT_VERIFIED);
     }
 
-
     try {
       // create refresh token
       const refreshToken = createRefreshToken(loginReq, role);