Revize 06808454

Logout and Login fixed
re #10715

src/stores/reducers/userSlice.ts

@@ -1 +1 @@
 import { createSlice } from "@reduxjs/toolkit"
-import { checkAuth, login } from "../actions/userThunks"
+import { checkAuth, login, logout } from "../actions/userThunks"
 
 export interface UserState {
     username: string
     loggedIn: boolean
     role: string
     lastError?: string
+    checkedAuth: boolean
 }
 
 const initialState: UserState = {
     username: "",
     loggedIn: false,
-    role: ""
+    role: "",
+    checkedAuth: false
 }
 
 export const userSlice = createSlice({
     name: "user",
     initialState: initialState,
     reducers: {
-        logout: () => initialState,
+        resetState: (state) => {
+            state = initialState
+        }
     },
     extraReducers: (builder) => {
         builder.addCase(login.fulfilled, (state, action) => {
@@ -33 +37 @@
         builder.addCase(checkAuth.fulfilled, (state, action) => {
             state.loggedIn = action.payload.isLogged
             state.lastError = ""
+            state.checkedAuth = true
         })
         builder.addCase(checkAuth.rejected, (state, action) => {
             state.lastError = action.error.message
+            state.checkedAuth = true
         })
+        builder.addCase(logout.fulfilled, (state, action) => initialState)
     }
 })
 
-export const { logout } = userSlice.actions
+export const { resetState } = userSlice.actions
 
 export default userSlice.reducer