Merge pull request #706 from IkkiOcean/agro-backend-route-1

[Fixed] Login State Persistence and User Data Return on Login

backend/controllers/authController.js

@@ -27,8 +27,9 @@ exports.signupController = async (req, res) => {
 
 
 exports.signinController = async (req, res) => {
+
   try {
-    const { email, password } = req.body;
+    const { email, password } = req.body; // Log the request body
     const user = await User.findOne({ email });
 
     if (!user) {
@@ -43,9 +44,10 @@ exports.signinController = async (req, res) => {
     // Include role in the token
     const token = jwt.sign({ userId: user._id, role: user.role }, process.env.JWT_SECRET, { expiresIn: '1h' });
 
-    res.status(200).json({ message: 'Login successful', token });
+    const user_id = user._id.toString()
+    res.status(200).json({ message: 'Login successful', token , user_id});
   } catch (error) {
     console.error("Login error:", error);
     res.status(500).json({ message: 'Login failed' });
   }
-}
+}

frontend/src/components/LoginPage.jsx

@@ -23,7 +23,7 @@ const LoginPage = () => {
           password,
         }
       );
-      login(response.data.token); // Call login method from context
+      login(response.data.token, response.data.user_id); // Call login method from context
       toast.success("Login successful");
     } catch (error) {
       toast.error(error.response?.data?.message || "Login failed");

frontend/src/context/AuthContext.jsx

@@ -1,23 +1,44 @@
-import { createContext, useContext, useState } from 'react';
+import { createContext, useContext, useState, useEffect } from 'react';
 
 const AuthContext = createContext();
 
 export const AuthProvider = ({ children }) => {
-  const [isLoggedIn, setIsLoggedIn] = useState(false);
-  const [userData, setUserData] = useState(null);
+  // Initialize the logged-in state from localStorage
+  const [isLoggedIn, setIsLoggedIn] = useState(() => {
+    const authData = localStorage.getItem('auth');
+    return authData ? true : false;
+  });
+
+  // Initialize user data from localStorage
+  const [userData, setUserData] = useState(() => {
+    const authData = localStorage.getItem('auth');
+    return authData ? JSON.parse(authData).user : null;
+  });
 
   const login = (token, user) => {
+    // Store authentication data in localStorage
     localStorage.setItem('auth', JSON.stringify({ token, user }));
     setIsLoggedIn(true);
-    setUserData(user); // Set user data which includes role
+    setUserData(user);
   };
 
   const logout = () => {
+    // Remove authentication data from localStorage
     localStorage.removeItem('auth');
     setIsLoggedIn(false);
     setUserData(null);
   };
 
+  // Effect to set user data when the component mounts
+  useEffect(() => {
+    const authData = localStorage.getItem('auth');
+    if (authData) {
+      const { user } = JSON.parse(authData);
+      setUserData(user);
+      setIsLoggedIn(true);
+    }
+  }, []);
+
   return (
     <AuthContext.Provider value={{ isLoggedIn, login, logout, userData }}>
       {children}
@@ -26,3 +47,4 @@ export const AuthProvider = ({ children }) => {
 };
 
 export const useAuth = () => useContext(AuthContext);
+