Merge pull request #780 from mcneilco/754-sso-saml-support

Fixing redirect to client.baseBath
mcneilco · Jul 13, 2021 · 0e71549 · 0e71549
2 parents d7f83a1 + be399ea
commit 0e71549
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/modules/Login/src/server/routes/loginRoutes.coffee b/modules/Login/src/server/routes/loginRoutes.coffee
@@ -106,7 +106,12 @@ exports.ensureAuthenticated = (req, res, next) ->
 		return next()
 	if req.session?
 		req.session.returnTo = req.url
-	redirectURL = req.protocol + '://' + req.get('host') + req.originalUrl
+
+	basePath = req.protocol + '://' + req.get('host')
+	if req.originalUrl == "/" && config.all.client.basePath?
+		redirectURL = "#{basePath}#{config.all.client.basePath}"
+	else
+		redirectURL = "#{basePath}#{req.originalURL}"
 	res.redirect '/login?redirect_url='+redirectURL
 
 exports.ensureAuthenticatedAPI = (req, res, next) ->