Merge pull request #241 from nextcloud/redirect2

Add orignalURL to redirect when using SSO
nextcloud · Aug 17, 2018 · f07420d · f07420d
2 parents 378cd6e + 3f3cd68
commit f07420d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/Controller/SAMLController.php b/lib/Controller/SAMLController.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ * @copyright Copyright (c) 2018 Jean-Baptiste Pin <jibet.pin@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -160,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'));