Merge pull request #50 from WildCodeSchool-2023-09/logout

rajout du bouton logout et quelque modif
WildCodeSchool-2023-09 · Feb 7, 2024 · ae53303 · ae53303
2 parents 81f0f4a + 217ac57
commit ae53303
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/backend/src/controllers/userControllers.js b/backend/src/controllers/userControllers.js
@@ -61,7 +61,7 @@ const login = async (req, res, next) => {
         res
           .cookie("auth", createToken(user), { httpOnly: true })
           .status(200)
-          .json({ id: user.id, email: user.email, roleId: user.role_id });
+          .json({ id: user.id, email: user.email, role_id: user.role_id });
       } else {
         res.sendStatus(403);
       }

diff --git a/backend/src/middleware/checkCredentials.js b/backend/src/middleware/checkCredentials.js
@@ -1,12 +1,16 @@
 const { verifyToken } = require("../services/jwt");
 
 const checkCredentials = (req, res, next) => {
-  const decode = verifyToken(req.cookies.auth);
-  if (decode.role_id !== null) {
-    req.user = decode;
-    next();
+  if (req.cookies.auth) {
+    const decode = verifyToken(req.cookies.auth);
+    if (decode.role_id !== null) {
+      req.user = decode;
+      next();
+    } else {
+      res.sendStatus(403);
+    }
   } else {
-    res.sendStatus(403);
+    next();
   }
 };
 

diff --git a/frontend/src/components/NavBar.jsx b/frontend/src/components/NavBar.jsx
@@ -14,7 +14,6 @@ function NavBar() {
       await connexion.post("/logout");
       logout();
       navigate("/");
-      window.location.reload();
     } catch (err) {
       console.error("Erreur lors de la déconnexion :", err);
     }

diff --git a/frontend/src/contexts/auth.jsx b/frontend/src/contexts/auth.jsx
@@ -16,9 +16,9 @@ export const useAuthContext = () => useContext(AuthContext);
 export function AuthProvider({ children }) {
   const [connected, setConnected] = useState("not connected");
 
-  function logout() {
+  const logout = () => {
     setConnected("not connected");
-  }
+  };
 
   const contextValue = useMemo(
     () => ({ connected, setConnected, logout }),