From e3a938d8f0680b2b4ea744079d7731bdb308d2f7 Mon Sep 17 00:00:00 2001
From: jikrana <jikrana.dev@gmail.com>
Date: Tue, 23 Jun 2026 16:00:46 +0530
Subject: [PATCH] feat: move /me route logic into getMe controller function

---
 backend/controllers/authController.js | 45 ++++++++++++++++++++++++-
 backend/routes/authRoutes.js          | 47 ++-------------------------
 2 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/backend/controllers/authController.js b/backend/controllers/authController.js
index 0abeb6d..b886f51 100644
--- a/backend/controllers/authController.js
+++ b/backend/controllers/authController.js
@@ -322,11 +322,54 @@ const refreshAccessToken = async (req, res) => {
     }
 };
 
+// Get current logged-in user
+const getMe = async (req, res) => {
+    try {
+        const [users] = await db.query(
+            "SELECT id, name, email, role, is_active FROM users WHERE id = ? LIMIT 1",
+            [req.user.id]
+        );
+
+        if (!users || !users.length) {
+            return res.status(404).json({
+                success: false,
+                message: "User not found"
+            });
+        }
+
+        const user = users[0];
+
+        if (user.is_active === 0) {
+            return res.status(403).json({
+                success: false,
+                message: "Account has been deactivated"
+            });
+        }
+
+        return res.status(200).json({
+            success: true,
+            user: {
+                id: user.id,
+                name: user.name,
+                email: user.email,
+                role: user.role
+            }
+        });
+    } catch (error) {
+        console.error("GET ME ERROR:", error);
+        return res.status(500).json({
+            success: false,
+            message: "Server error"
+        });
+    }
+};
+
 module.exports = {
     signup,
     verifySignup,
     login,
     forgotPassword,
     resetPassword,
-    refreshAccessToken
+    refreshAccessToken,
+    getMe
 };
\ No newline at end of file
diff --git a/backend/routes/authRoutes.js b/backend/routes/authRoutes.js
index b5ce71e..e16d509 100644
--- a/backend/routes/authRoutes.js
+++ b/backend/routes/authRoutes.js
@@ -10,7 +10,8 @@ const {
     login,
     forgotPassword,
     resetPassword,
-    refreshAccessToken
+    refreshAccessToken,
+    getMe
 } = require(
     "../controllers/authController"
 );
@@ -301,49 +302,7 @@ router.post(
 router.get(
     "/me",
     authMiddleware,
-    async (
-        req,
-        res
-    ) => {
-        try {
-            const [users] = await db.query(
-                "SELECT id, name, email, role, is_active FROM users WHERE id = ? LIMIT 1",
-                [req.user.id]
-            );
-
-            if (!users || !users.length) {
-                return res.status(404).json({
-                    success: false,
-                    message: "User not found"
-                });
-            }
-
-            const user = users[0];
-
-            if (user.is_active === 0) {
-                return res.status(403).json({
-                    success: false,
-                    message: "Account has been deactivated"
-                });
-            }
-
-            return res.status(200).json({
-                success: true,
-                user: {
-                    id: user.id,
-                    name: user.name,
-                    email: user.email,
-                    role: user.role
-                }
-            });
-        } catch (error) {
-            console.error("GET ME ERROR:", error);
-            return res.status(500).json({
-                success: false,
-                message: "Server error"
-            });
-        }
-    }
+    getMe
 );
 
 // route fallback