inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 04:26:44 +00:00
Code

Handle error on logout (#6482)

Browse Source 
* Handle error on logout

- Logout failure redirects to login page

* Handle case if user is undefined when fetching role data

* Cleanup error messages

* More error message cleanup
This commit is contained in:
Oliver 2024-02-15 01:17:01 +11:00 committed by GitHub
parent aa7eaaab3a
commit 0e1923a90c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontend/src/functions/auth.tsx
View File

@ -53,7 +53,11 @@ export const doBasicLogin = async (username: string, password: string) => {
*/ */
export const doLogout = async (navigate: any) => { export const doLogout = async (navigate: any) => {
// Logout from the server session // Logout from the server session
await api.post(apiUrl(ApiEndpoints.user_logout)); await api.post(apiUrl(ApiEndpoints.user_logout)).catch(() => {
// If an error occurs here, we are likely already logged out
navigate('/login');
return;
});
// Logout from this session // Logout from this session
// Note that clearToken() then calls setApiDefaults() // Note that clearToken() then calls setApiDefaults()

15
src/frontend/src/states/SettingsState.tsx
View File

@ -41,8 +41,8 @@ export const useGlobalSettingsState = create<SettingsStateProps>(
lookup: generate_lookup(response.data) lookup: generate_lookup(response.data)
}); });
}) })
.catch((error) => { .catch((_error) => {
console.error('Error fetching global settings:', error); console.error('Error fetching global settings');
}); });
}, },
getSetting: (key: string, default_value?: string) => { getSetting: (key: string, default_value?: string) => {
@ -75,8 +75,8 @@ export const useUserSettingsState = create<SettingsStateProps>((set, get) => ({
lookup: generate_lookup(response.data) lookup: generate_lookup(response.data)
}); });
}) })
.catch((error) => { .catch((_error) => {
console.error('Error fetching user settings:', error); console.error('Error fetching user settings');
}); });
}, },
getSetting: (key: string, default_value?: string) => { getSetting: (key: string, default_value?: string) => {
@ -115,11 +115,8 @@ export const createPluginSettingsState = ({
lookup: generate_lookup(settings) lookup: generate_lookup(settings)
}); });
}) })
.catch((error) => { .catch((_error) => {
console.error( console.error(`Error fetching plugin settings for plugin ${plugin}`);
`Error fetching plugin settings for plugin ${plugin}:`,
error
);
}); });
}, },
getSetting: (key: string, default_value?: string) => { getSetting: (key: string, default_value?: string) => {

10
src/frontend/src/states/UserState.tsx
View File

@ -54,8 +54,8 @@ export const useUserState = create<UserStateProps>((set, get) => ({
}; };
set({ user: user }); set({ user: user });
}) })
.catch((error) => { .catch((_error) => {
console.error('Error fetching user data:', error); console.error('Error fetching user data');
}); });
// Fetch role data // Fetch role data
@ -65,13 +65,15 @@ export const useUserState = create<UserStateProps>((set, get) => ({
const user: UserProps = get().user as UserProps; const user: UserProps = get().user as UserProps;
// Update user with role data // Update user with role data
if (user) {
user.roles = response.data?.roles ?? {}; user.roles = response.data?.roles ?? {};
user.is_staff = response.data?.is_staff ?? false; user.is_staff = response.data?.is_staff ?? false;
user.is_superuser = response.data?.is_superuser ?? false; user.is_superuser = response.data?.is_superuser ?? false;
set({ user: user }); set({ user: user });
}
}) })
.catch((error) => { .catch((_error) => {
console.error('Error fetching user roles:', error); console.error('Error fetching user roles');
}); });
}, },
checkUserRole: (role: UserRoles, permission: UserPermissions) => { checkUserRole: (role: UserRoles, permission: UserPermissions) => {