ami/tl-vikunja
1
0
Fork 0
Code Activity

fix: wait until everything is loaded before replacing the current view with the last or login view

Browse Source
This commit is contained in:
kolaente
2022-10-23 16:12:38 +02:00
parent 3f04571e43
commit 6083301d1f
5 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/router/index.ts
View File

@ -9,6 +9,7 @@ import {setTitle} from '@/helpers/setTitle'
import {useListStore} from '@/stores/lists'
import {useAuthStore} from '@/stores/auth'
import {useBaseStore} from '@/stores/base'
import HomeComponent from '../views/Home.vue'
import NotFoundComponent from '../views/404.vue'
@ -464,11 +465,18 @@ const router = createRouter({
],
})
export function getAuthForRoute(route: RouteLocation) {
export async function getAuthForRoute(route: RouteLocation) {
const authStore = useAuthStore()
if (authStore.authUser || authStore.authLinkShare) {
return
}
const baseStore = useBaseStore()
// When trying this before the current user was fully loaded we might get a flash of the login screen
// in the user shell. To make shure this does not happen we check if everything is ready before trying.
if (!baseStore.ready) {
return
}
// Check if the user is already logged in and redirect them to the home page if not
if (
@ -497,7 +505,7 @@ export function getAuthForRoute(route: RouteLocation) {
}
}
router.beforeEach((to) => {
router.beforeEach(async (to) => {
return getAuthForRoute(to)
})