Skip to content
Snippets Groups Projects
Commit 2b2fcfc5 authored by Embruch, Gerd's avatar Embruch, Gerd
Browse files

fixed login logout

parent d3e2f71f
No related branches found
No related tags found
No related merge requests found
...@@ -32,18 +32,19 @@ function AuthState({ children }) { ...@@ -32,18 +32,19 @@ function AuthState({ children }) {
{ withCredentials: true } { withCredentials: true }
); );
// set current user to login and merge accessToken into currentUser // set current user to login and merge accessToken into currentUser
dispatchCurrentUser({ type: USER_ACTIONS.SET, payload: { ...result.data.record } }); dispatchCurrentUser({ type: USER_ACTIONS.SET, payload: { ...result.data.document } });
setAccessToken(result.data.token); setAccessToken(result.data.accessToken);
// TODO: don't store accessToken in localStorage, keep in memory only // 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; return result;
} }
// ### HANDLE LOGOUT // ### HANDLE LOGOUT
async function logout() { async function logout() {
dispatchCurrentUser({ type: USER_ACTIONS.DROP }); dispatchCurrentUser({ type: USER_ACTIONS.DROP });
const result = await api.get( const result = await api.delete(
'/users/logout', '/auth',
{ withCredentials: true }
); );
return result; return result;
} }
......
import React, { useEffect } from 'react'; import React, { useEffect } from 'react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { useAuth } from '../../contexts/Auth/AuthState'; import { useAuth } from '../../contexts/Auth/AuthState';
import { mergeBackendValidation, setFlashMsg } from '../../utils/ErrorHandling'; import { setFlashMsg } from '../../utils/ErrorHandling';
function Logout() { function Logout() {
// ################################# // #################################
...@@ -25,8 +25,8 @@ function Logout() { ...@@ -25,8 +25,8 @@ function Logout() {
try { try {
const result = await logout(); const result = await logout();
redirect('/login'); redirect('/login');
// set flash mmessagesg // set flash msg
setFlashMsg(result.data?.message); setFlashMsg(result.data?.msg);
} catch (err) { } catch (err) {
mergeBackendValidation(500, err); mergeBackendValidation(500, err);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment