From 18dd671020d8d8ff18e29a5a4812f8c9a9c2a4ad Mon Sep 17 00:00:00 2001
From: niyobertin <niyonkurubbertin@gmail.com>
Date: Thu, 27 Jun 2024 22:42:09 +0200
Subject: [PATCH] fix: user should be redirected to otp verification page

---
 src/controllers/userControllers.ts | 8 +++-----
 src/utils/env.ts                   | 3 +--
 src/utils/jsonwebtoken.ts          | 3 +--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/controllers/userControllers.ts b/src/controllers/userControllers.ts
index 063b21c..f6f5a63 100644
--- a/src/controllers/userControllers.ts
+++ b/src/controllers/userControllers.ts
@@ -158,18 +158,16 @@ export const tokenVerification = async (req: Request, res: Response) => {
 
   try {
     const decoded = await decodeMagicLinkToken(token);
+    const link = `${env.fe_url}/2fa-verify`;
     //@ts-ignore
     const { otp, userId } = decoded;
     if (otp) {
       const user = await User.findOne({ where: { id: userId }, attributes: { exclude: ["password"] } });
       //@ts-ignore
       const accessToken = await generateToken(user);
-      const link = process.env.NODE_ENV !== "production"? `${env.redirect_local_url}/2fa-verify?token=${accessToken}`: `${env.redirect_remote_url}/2fa-verify?token=${accessToken}`;
       return res.status(200).redirect(link);
     } else {
-      return res.status(401).json({
-        message: "Token expired",
-      });
+      return res.status(401).redirect(link);
     }
   } catch (error: any) {
     return res.status(500).json({
@@ -202,7 +200,7 @@ export const handleSuccess = async (req: Request, res: Response) => {
       token = await generateToken(foundUser);
     }
 
-    const link = process.env.NODE_ENV !== "production"? `${env.redirect_local_url}/login?token=${token}`: `${env.redirect_remote_url}/login?token=${token}`;
+    const link = process.env.NODE_ENV !== "production"? `${env.fe_url}/login?token=${token}`: `${env.fe_url}/login?token=${token}`;
     return res.status(200).redirect(link);
 
 
diff --git a/src/utils/env.ts b/src/utils/env.ts
index e414a7e..d29c7b2 100644
--- a/src/utils/env.ts
+++ b/src/utils/env.ts
@@ -23,6 +23,5 @@ export const env = {
   stripe_secret: process.env.STRIPE_SECRET_KEY as string,
   password_expiration_time: process.env.TIME_FOR_PASSWORD_EXPIRATION as string,
   ADS_URL: process.env.ADS_URL as String,
-  redirect_local_url:process.env.REDIRECT_LOCAL_URL as string,
-  redirect_remote_url:process.env.REDIRECT_REMOTE_URL as string
+  fe_url:process.env.FE_URL as string,
 };
\ No newline at end of file
diff --git a/src/utils/jsonwebtoken.ts b/src/utils/jsonwebtoken.ts
index 3401c5d..1dd7803 100644
--- a/src/utils/jsonwebtoken.ts
+++ b/src/utils/jsonwebtoken.ts
@@ -8,8 +8,7 @@ export const generateToken = async (user: IUser) => {
       id:user.id,
       roleId:user.roleId,
       name:user.name,
-      email: user.email,
-      password: user.password,
+      email: user.email
     },
     `${env.jwt_secret}`,
     { expiresIn: "72h" },