From 2b2fcfc5610082f286a4ae25f0757374e3a54512 Mon Sep 17 00:00:00 2001
From: "Embruch, Gerd" <gerd.embruch@uni-hamburg.de>
Date: Fri, 2 Aug 2024 12:26:40 +0200
Subject: [PATCH] fixed login logout
---
src/contexts/Auth/AuthState.jsx | 11 ++++++-----
src/pages/User/Logout.jsx | 6 +++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/contexts/Auth/AuthState.jsx b/src/contexts/Auth/AuthState.jsx
index 1cdd601..2777916 100755
--- a/src/contexts/Auth/AuthState.jsx
+++ b/src/contexts/Auth/AuthState.jsx
@@ -32,18 +32,19 @@ function AuthState({ children }) {
{ withCredentials: true }
);
// set current user to login and merge accessToken into currentUser
- dispatchCurrentUser({ type: USER_ACTIONS.SET, payload: { ...result.data.record } });
- setAccessToken(result.data.token);
+ dispatchCurrentUser({ type: USER_ACTIONS.SET, payload: { ...result.data.document } });
+ setAccessToken(result.data.accessToken);
// TODO: don't store accessToken in localStorage, keep in memory only
- localStorage.setItem("accessToken", JSON.stringify(result.data.token));
+ localStorage.setItem("accessToken", JSON.stringify(result.data.accessToken));
return result;
}
// ### HANDLE LOGOUT
async function logout() {
dispatchCurrentUser({ type: USER_ACTIONS.DROP });
- const result = await api.get(
- '/users/logout',
+ const result = await api.delete(
+ '/auth',
+ { withCredentials: true }
);
return result;
}
diff --git a/src/pages/User/Logout.jsx b/src/pages/User/Logout.jsx
index 92358a3..b7631e8 100644
--- a/src/pages/User/Logout.jsx
+++ b/src/pages/User/Logout.jsx
@@ -1,7 +1,7 @@
import React, { useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { useAuth } from '../../contexts/Auth/AuthState';
-import { mergeBackendValidation, setFlashMsg } from '../../utils/ErrorHandling';
+import { setFlashMsg } from '../../utils/ErrorHandling';
function Logout() {
// #################################
@@ -25,8 +25,8 @@ function Logout() {
try {
const result = await logout();
redirect('/login');
- // set flash mmessagesg
- setFlashMsg(result.data?.message);
+ // set flash msg
+ setFlashMsg(result.data?.msg);
} catch (err) {
mergeBackendValidation(500, err);
}
--
GitLab