added redirection to originalUrl when using SSO

Signed-off-by: Jean-Baptiste PIN <jeanbaptiste@idruide.com>
nextcloud · Aug 17, 2018 · 3f3cd68 · 3f3cd68
1 parent 0828185
commit 3f3cd68
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/Controller/SAMLController.php b/lib/Controller/SAMLController.php
@@ -161,7 +161,10 @@ public function login($idp) {
 				$this->session->set('user_saml.Idp', $idp);
 				break;
 			case 'environment-variable':
-				$ssoUrl = $this->urlGenerator->getAbsoluteURL('/');
+				$ssoUrl = $this->request->getParam('originalUrl', '');
+				if (empty($ssoUrl)) {
+					$ssoUrl = $this->urlGenerator->getAbsoluteURL('/');
+				}
 				$this->session->set('user_saml.samlUserData', $_SERVER);
 				try {
 					$this->autoprovisionIfPossible($this->session->get('user_saml.samlUserData'));