Merge 7ce06dceba into 0456332325

12 hours ago · bcfb1ec920
parent 0456332325 7ce06dceba
commit bcfb1ec920
1 changed files with 1 additions and 1 deletions
--- a/server/controllers/auth.js
+++ b/server/controllers/auth.js
@ -72,7 +72,7 @@ router.all('/login/:strategy/callback', async (req, res, next) => {
    }, { req, res })
    res.cookie('jwt', authResult.jwt, commonHelper.getCookieOpts())

-    const loginRedirect = req.cookies['loginRedirect']
+    const loginRedirect = req.cookies['loginRedirect'] ?? decodeURI(req.body.RelayState)
    const isValidRedirect = loginRedirect && loginRedirect.startsWith('/') && !loginRedirect.startsWith('//') && !loginRedirect.includes('://')
    if (loginRedirect === '/' && authResult.redirect) {
      res.clearCookie('loginRedirect')