Merge pull request #196 from nextcloud/multiple-user-back-ends

Multiple user back ends

2 files changed, 29 insertions, 0 deletions

diff --git a/appinfo/app.php b/appinfo/app.php
index a55c333a..841bb548 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -94,6 +94,10 @@ if(!$cli &&
 	!$userSession->isLoggedIn() &&
 	\OC::$server->getRequest()->getPathInfo() === '/login' &&
 	$type !== '') {
+	$params = $request->getParams();
+	if (isset($params['direct'])) {
+		return;
+	}
 	$redirectSituation = true;
 }
 
@@ -114,6 +118,26 @@ if($useSamlForDesktopClients === '1') {
 	}
 }
 
+$multipleUserBackEnds = $config->getAppValue('user_saml', 'general-allow_multiple_user_back_ends', '0');
+
+if ($redirectSituation === true && $multipleUserBackEnds === '1') {
+	$params = $request->getParams();
+	$redirectUrl = '';
+	if(isset($params['redirect_url'])) {
+		$redirectUrl = $params['redirect_url'];
+	}
+
+	$targetUrl = $urlGenerator->linkToRouteAbsolute(
+		'user_saml.SAML.selectUserBackEnd',
+		[
+			'redirectUrl' => $redirectUrl
+		]
+	);
+	header('Location: '.$targetUrl);
+	exit();
+
+}
+
 if($redirectSituation === true) {
 	$params = $request->getParams();
 	$originalUrl = '';
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 5701783e..f1d3bfca 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -53,5 +53,10 @@ return [
 			'url' => '/saml/error',
 			'verb' => 'GET',
 		],
+		[
+			'name' => 'SAML#selectUserBackEnd',
+			'url' => '/saml/selectUserBackEnd',
+			'verb' => 'GET',
+		],
 	],
 ];