Unverified Commit 3f001dca authored by PaulD987's avatar PaulD987 Committed by GitHub

fix: loginRedirect doesn't work for non local strategies (#3222)

parent e87d5119
...@@ -71,7 +71,19 @@ router.all('/login/:strategy/callback', async (req, res, next) => { ...@@ -71,7 +71,19 @@ router.all('/login/:strategy/callback', async (req, res, next) => {
strategy: req.params.strategy strategy: req.params.strategy
}, { req, res }) }, { req, res })
res.cookie('jwt', authResult.jwt, { expires: moment().add(1, 'y').toDate() }) res.cookie('jwt', authResult.jwt, { expires: moment().add(1, 'y').toDate() })
res.redirect(authResult.redirect)
const loginRedirect = req.cookies['loginRedirect']
if (loginRedirect === '/' && authResult.redirect) {
res.clearCookie('loginRedirect')
res.redirect(authResult.redirect)
} else if (loginRedirect) {
res.clearCookie('loginRedirect')
res.redirect(loginRedirect)
} else if (authResult.redirect) {
res.redirect(authResult.redirect)
} else {
res.redirect('/')
}
} catch (err) { } catch (err) {
next(err) next(err)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment