Merge pull request #647 from nextcloud/fix/630/default-idp-value

fix signining in with IdPs other than 1

Author: PVince81

appinfo/routes.php

@@ -27,9 +27,6 @@
 			'name' => 'SAML#login',
 			'url' => '/saml/login',
 			'verb' => 'GET',
-			'defaults' => [
-				'idp' => 1
-			],
 		],
 		[
 			'name' => 'SAML#base',
@@ -40,17 +37,11 @@
 			'name' => 'SAML#getMetadata',
 			'url' => '/saml/metadata',
 			'verb' => 'GET',
-			'defaults' => [
-				'idp' => 1
-			],
 		],
 		[
 			'name' => 'SAML#assertionConsumerService',
 			'url' => '/saml/acs',
 			'verb' => 'POST',
-			'defaults' => [
-				'idp' => 1
-			],
 		],
 		[
 			'name' => 'SAML#singleLogoutService',

lib/Controller/SAMLController.php

@@ -167,7 +167,7 @@ private function autoprovisionIfPossible() {
 	 * @return Http\RedirectResponse
 	 * @throws \Exception
 	 */
-	public function login($idp) {
+	public function login(int $idp = 1) {
 		$type = $this->config->getAppValue($this->appName, 'type');
 		switch ($type) {
 			case 'saml':
@@ -242,7 +242,7 @@ public function login($idp) {
 	 * @return Http\DataDownloadResponse
 	 * @throws Error
 	 */
-	public function getMetadata($idp) {
+	public function getMetadata(int $idp = 1) {
 		$settings = new Settings($this->samlSettings->getOneLoginSettingsArray($idp));
 		$metadata = $settings->getSPMetadata();
 		$errors = $settings->validateMetadata($metadata);