fixes: user data formatting

Avdhesh-Varshney · Mar 3, 2025 · 6b74fd7 · 6b74fd7
1 parent 2ba0340
commit 6b74fd7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/backend/Controllers/auth.controller.js b/backend/Controllers/auth.controller.js
@@ -1,5 +1,4 @@
 import bcrypt from "bcrypt";
-import jwt from "jsonwebtoken";
 import User from "../Models/user.model.js";
 import { formatDataToSend, generateUsername, emailRegex, passwordRegex } from "../utils/helpers.js";
 
@@ -38,10 +37,7 @@ export const login = async (req, res) => {
         const isMatch = await bcrypt.compare(password, user.personal_info.password);
         if (!isMatch) return res.status(401).json({ error: "Incorrect password" });
 
-        // Generate JWT Token
-        const token = jwt.sign({ id: user._id, role: user.role }, process.env.SECRET_ACCESS_KEY, { expiresIn: "7d" });
-
-        return res.status(200).json({ token, user: formatDataToSend(user) });
+        return res.status(200).json(formatDataToSend(user));
     } catch (err) {
         return res.status(500).json({ error: "Internal Server Error" });
     }

diff --git a/backend/utils/helpers.js b/backend/utils/helpers.js
@@ -1,11 +1,17 @@
+import jwt from "jsonwebtoken";
 import { nanoid } from "nanoid";
 import User from "../Models/user.model.js";
 
 export const emailRegex = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/;
 export const passwordRegex = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{6,20}$/;
 
 export const formatDataToSend = (user) => {
+
+    // Generate JWT Token
+    const access_token = jwt.sign({ id: user._id, role: user.role }, process.env.SECRET_ACCESS_KEY, { expiresIn: "7d" });
+
     return {
+        access_token,
         profile_img: user.personal_info.profile_img,
         username: user.personal_info.username,
         fullname: user.personal_info.fullname,