ami/tl-vikunja
1
0
Fork 0
Code Activity

fix(auth): correctly redirect the user to the last visited page after login

Browse Source 
Resolves https://kolaente.dev/vikunja/frontend/issues/3682
This commit is contained in:
kolaente
2023-08-24 12:15:45 +02:00
parent a9fb306e46
commit f7e22c8c56
3 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/router/index.ts
View File

@ -448,16 +448,9 @@ export async function getAuthForRoute(to: RouteLocation, authStore) {
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 (
![
// Check if the route the user wants to go to is a route which needs authentication. We use this to
// redirect the user after successful login.
const isValidUserAppRoute = ![
'user.login',
'user.password-reset.request',
'user.password-reset.reset',
@ -468,8 +461,19 @@ export async function getAuthForRoute(to: RouteLocation, authStore) {
localStorage.getItem('passwordResetToken') === null &&
localStorage.getItem('emailConfirmToken') === null &&
!(to.name === 'home' && (typeof to.query.userPasswordReset !== 'undefined' || typeof to.query.userEmailConfirm !== 'undefined'))
) {
if (isValidUserAppRoute) {
saveLastVisited(to.name as string, to.params, to.query)
}
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 sure this does not happen we check if everything is ready before trying.
if (!baseStore.ready) {
return
}
if (isValidUserAppRoute) {
return {name: 'user.login'}
}