Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed: logout loader not dismissing in case of user without access (#669) #678

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −5
Open

Fixed: logout loader not dismissing in case of user without access (#669) #678

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/store/modules/user/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ const actions: ActionTree<UserState, RootState> = {
}
}

emitter.emit("presentLoader", { message: "Logging in...", backdropDismiss: false })
const api_key = await UserService.login(token)

const userProfile = await UserService.getUserProfile(api_key);
Expand All @@ -74,9 +73,7 @@ const actions: ActionTree<UserState, RootState> = {
commit(types.USER_INFO_UPDATED, userProfile);
if(hasPermission("APP_DRAFT_VIEW")) await dispatch("fetchProductStores")
await dispatch('getFieldMappings')
emitter.emit("dismissLoader")
} catch (err: any) {
emitter.emit("dismissLoader")
logger.error("error", err);
return Promise.reject(new Error(err))
}
Expand All @@ -85,8 +82,8 @@ const actions: ActionTree<UserState, RootState> = {
/**
* Logout user
*/
async logout({ commit, dispatch }) {
emitter.emit('presentLoader', { message: 'Logging out', backdropDismiss: false })
async logout({ commit, dispatch }, payload = { isUserUnauthorised: false }) {
if(!payload.isUserUnauthorised) emitter.emit('presentLoader', { message: 'Logging out', backdropDismiss: false })

const authStore = useAuthStore()

Expand Down
Loading