fix: redirect to previous path after login

This commit is contained in:
NGPixel 2020-02-07 14:51:11 -05:00
parent 1fc786e2ed
commit ff5acba358
2 changed files with 12 additions and 1 deletions

View File

@ -294,7 +294,13 @@ export default {
this.loaderTitle = this.$t('auth:loginSuccess')
Cookies.set('jwt', respObj.jwt, { expires: 365 })
_.delay(() => {
window.location.replace('/') // TEMPORARY - USE RETURNURL
const loginRedirect = Cookies.get('loginRedirect')
if (loginRedirect) {
Cookies.remove('loginRedirect')
window.location.replace(loginRedirect)
} else {
window.location.replace('/')
}
}, 1000)
}
} else {

View File

@ -245,6 +245,11 @@ router.get('/*', async (req, res, next) => {
pageArgs.tags = _.get(page, 'tags', [])
if (!WIKI.auth.checkAccess(req.user, ['read:pages'], pageArgs)) {
if (req.user.id === 2) {
res.cookie('loginRedirect', req.path, {
maxAge: 15 * 60 * 1000
})
}
if (pageArgs.path === 'home' && req.user.id === 2) {
return res.redirect('/login')
}