extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-06-24 05:51:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rearrange BeforeEach hook - New fix for #232

Browse Source
This commit is contained in:
Bubka 2023-09-18 16:48:03 +02:00
parent 0ddb2e7551
commit 1f000aab9b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
resources/js/routes.js vendored
View File

@ -82,8 +82,14 @@ router.beforeEach((to, from, next) => {
// See https://github.com/garethredfern/laravel-vue/ if one day the middleware pattern // See https://github.com/garethredfern/laravel-vue/ if one day the middleware pattern
// becomes relevant (i.e when some admin only pages are necessary) // becomes relevant (i.e when some admin only pages are necessary)
if (to.name !== 'login' && to.meta.requiresAuth && ! Vue.$storage.get('authenticated', false)) { if (to.meta.requiresAuth
next({ name: 'login' }) && ! Vue.$storage.get('authenticated', false)
&& ! window.appConfig.proxyAuth) {
next({ name: 'login' })
}
else if (to.matched.some(record => record.meta.disabledWithAuthProxy) && window.appConfig.proxyAuth) {
// The page is not relevant with auth proxy On so we push to the main view
next({ name: 'accounts' })
} }
else if (to.name.startsWith('settings.')) { else if (to.name.startsWith('settings.')) {
if (to.params.returnTo == undefined) { if (to.params.returnTo == undefined) {
@ -107,12 +113,6 @@ router.beforeEach((to, from, next) => {
} }
else next({ name: to.name, params: {goBackTo: '/accounts'} }) else next({ name: to.name, params: {goBackTo: '/accounts'} })
} }
else if (to.matched.some(record => record.meta.disabledWithAuthProxy)) {
if (window.appConfig.proxyAuth) {
next({ name: 'accounts' })
}
else next()
}
else if (to.name === 'genericError' && to.params.err == undefined) { else if (to.name === 'genericError' && to.params.err == undefined) {
// return to home if no err object is provided to prevent an empty error message // return to home if no err object is provided to prevent an empty error message
next({ name: 'accounts' }); next({ name: 'accounts' });