Instead of adding additional logins via php api - this can perfectly … #27607

DeepDiver1975 · 2017-04-10T08:15:18Z

…be done via the config as well

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
All new and existing tests passed.

PVince81 · 2017-04-10T08:17:25Z

core/Controller/LoginController.php

@@ -146,7 +146,12 @@ public function showLoginForm($user, $redirect_url, $remember_login) {
 			}
 		}

-		$parameters['alt_login'] = OC_App::getAlternativeLogIns();
+		$altLogins = OC_App::getAlternativeLogIns();
+		$altLogins2 = $this->config->getSystemValue('login.alternatives');


please add to config.sample.php

PVince81 · 2017-04-10T08:47:48Z

👍

PVince81 · 2017-04-10T08:48:32Z

Failing tests:

10:39:16 1) Tests\Core\Controller\LoginControllerTest::testShowLoginFormWithPasswordResetOption with data set #0 (true, true)
10:39:16 OCP\IConfig::getSystemValue('login.alternatives', '') was not expected to be called more than once.
10:39:16 
10:39:16 /var/lib/jenkins/workspace/owncloud-core_core_PR-27607-WK4NWSBUHCZGNS5OJCGIPJE5RNXHDVGK7VCLROJOBTRLQP6HBOYQ/core/Controller/LoginController.php:150
10:39:16 /var/lib/jenkins/workspace/owncloud-core_core_PR-27607-WK4NWSBUHCZGNS5OJCGIPJE5RNXHDVGK7VCLROJOBTRLQP6HBOYQ/tests/Core/Controller/LoginControllerTest.php:240
10:39:16 
10:39:16 2) Tests\Core\Controller\LoginControllerTest::testShowLoginFormWithPasswordResetOption with data set #1 (false, false)
10:39:16 OCP\IConfig::getSystemValue('login.alternatives', '') was not expected to be called more than once.
10:39:16 
10:39:16 /var/lib/jenkins/workspace/owncloud-core_core_PR-27607-WK4NWSBUHCZGNS5OJCGIPJE5RNXHDVGK7VCLROJOBTRLQP6HBOYQ/core/Controller/LoginController.php:150
10:39:16 /var/lib/jenkins/workspace/owncloud-core_core_PR-27607-WK4NWSBUHCZGNS5OJCGIPJE5RNXHDVGK7VCLROJOBTRLQP6HBOYQ/tests/Core/Controller/LoginControllerTest.php:240
10:39:16 
10:39:16 3) Tests\Core\Controller\LoginControllerTest::testShowLoginFormForUserNamedNull
10:39:16 OCP\IConfig::getSystemValue('login.alternatives', '') was not expected to be called more than once.
10:39:16 
10:39:16 /var/lib/jenkins/workspace/owncloud-core_core_PR-27607-WK4NWSBUHCZGNS5OJCGIPJE5RNXHDVGK7VCLROJOBTRLQP6HBOYQ/core/Controller/LoginController.php:150
10:39:16 /var/lib/jenkins/workspace/owncloud-core_core_PR-27607-WK4NWSBUHCZGNS5OJCGIPJE5RNXHDVGK7VCLROJOBTRLQP6HBOYQ/tests/Core/Controller/LoginControllerTest.php:279

butonic · 2017-04-10T09:00:04Z

config/config.sample.php

+ * Allows to specify additional login buttons on the logon screen for e.g. SSO integration
+ *	'login.alternatives' => [
+ *    ['href' => '/sso-saml', 'name' => 'Shibboleth SSO', 'img' => '/img/shibboleth.png'],
+ *    ['href' => '/sso-adfs', 'name' => 'ADFS'],


Very bad example: ADFS and Shibboleth are both doing SAML. The use cases out there are showing buttons for different IdPs. The links then go directly to the idp. on oic side the same /login/saml url is protected by mod_shib. It is configured to handle multiple idps with dedicated SessionInitiators, see https://wiki.shibboleth.net/confluence/display/CONCEPT/IdPDiscovery#IdPDiscovery-AttheApplication

<a href="https://www.testshib.org/Shibboleth.sso/ProtectNetwork?target=https%3A%2F%2Fwww.testshib.org%2Ftestshib-two%2Fauth-pages%2Fauth.jsp"> <img src="images/PN_sign-in.gif" alt="Login with ProtectNetwork" border="0"> </a> <a href="https://www.testshib.org/Shibboleth.sso/OpenIdP.org?target=https%3A%2F%2Fwww.testshib.org%2Ftestshib-two%2Fauth-pages%2Fauth.jsp"> <img src="images/openidp.png" alt="Login with OpenIdP.org" border="0"> </a>

make it

* Allows to specify additional login buttons on the logon screen for e.g. SSO integration * 'login.alternatives' => [ * ['href' => 'https://www.testshib.org/Shibboleth.sso/ProtectNetwork?target=https%3A%2F%2Fmy.owncloud.tld%2Flogin%2Fsso-saml%2F', 'name' => 'ProtectNetwork', 'img' => '/img/PN_sign-in.gif'], * ['href' => 'https://www.testshib.org/Shibboleth.sso/OpenIdP.org?target=https%3A%2F%2Fmy.owncloud.tld%2Flogin%2Fsso-saml%2F', 'name' => 'OpenIdP.org'], 'img' => '/img/openidp.png'],

I'm happy to change this to something more reasonable @butonic

butonic · 2017-04-10T14:12:44Z

config/config.sample.php

@@ -203,6 +203,15 @@
 'token_auth_enforced' => false,

 /**
+ * Allows to specify additional login buttons on the logon screen for e.g. SSO integration
+ *	'login.alternatives' => [
+ *	'login.alternatives' => [


207 === 208

butonic · 2017-04-10T14:12:57Z

config/config.sample.php

+ *	'login.alternatives' => [
+ *    ['href' => 'https://www.testshib.org/Shibboleth.sso/ProtectNetwork?target=https%3A%2F%2Fmy.owncloud.tld%2Flogin%2Fsso-saml%2F', 'name' => 'ProtectNetwork', 'img' => '/img/PN_sign-in.gif'],
+ *    ['href' => 'https://www.testshib.org/Shibboleth.sso/OpenIdP.org?target=https%3A%2F%2Fmy.owncloud.tld%2Flogin%2Fsso-saml%2F', 'name' => 'OpenIdP.org'], 'img' => '/img/openidp.png'],
+ * *  ]


butonic · 2017-04-11T08:06:49Z

config/config.sample.php

+ *  ]
+ */
+'login.alternatives' => [],
+/**


missing newline for clarity

PVince81 · 2017-05-04T09:54:31Z

With only one option it doesn't look good, needs some centering:

…be done via the config as well

DeepDiver1975 · 2017-05-12T09:56:36Z

With only one option it doesn't look good, needs some centering:

maybe @felixheidecke can apply some css magic

PVince81 · 2017-05-15T09:45:49Z

I'll just add "text-align: center". As easy as that:

PVince81 · 2017-05-15T09:48:16Z

Here you go: 67486aa

That's just CSS magic level 0

lock · 2019-08-03T10:01:56Z

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

DeepDiver1975 added the 3 - To Review label Apr 10, 2017

DeepDiver1975 added this to the 10.0 milestone Apr 10, 2017

DeepDiver1975 requested review from PVince81 and butonic April 10, 2017 08:15

PVince81 reviewed Apr 10, 2017

View reviewed changes

butonic reviewed Apr 10, 2017

View reviewed changes

DeepDiver1975 force-pushed the additional-logins-in-config.php branch from c11dc5a to 65c833f Compare April 10, 2017 13:38

butonic reviewed Apr 10, 2017

View reviewed changes

DeepDiver1975 force-pushed the additional-logins-in-config.php branch from 65c833f to 2663456 Compare April 10, 2017 14:21

butonic reviewed Apr 11, 2017

View reviewed changes

config/config.sample.php Outdated

* ]

*/

'login.alternatives' => [],

/**

Copy link

Member

butonic Apr 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing newline for clarity

PVince81 modified the milestones: 10.0.1, 10.0 Apr 26, 2017

DeepDiver1975 added 2 commits May 12, 2017 11:48

Instead of adding additional logins via php api - this can perfectly …

cf78100

…be done via the config as well

Add login-alternatives to config.sample.php

513363b

DeepDiver1975 force-pushed the additional-logins-in-config.php branch from 2663456 to 513363b Compare May 12, 2017 09:56

Center alternative logins

67486aa

DeepDiver1975 merged commit 45cfc02 into master May 15, 2017

DeepDiver1975 deleted the additional-logins-in-config.php branch May 15, 2017 09:51

lock bot locked as resolved and limited conversation to collaborators Aug 3, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Instead of adding additional logins via php api - this can perfectly … #27607

Instead of adding additional logins via php api - this can perfectly … #27607

DeepDiver1975 commented Apr 10, 2017 •

edited

Loading

PVince81 Apr 10, 2017

PVince81 commented Apr 10, 2017

PVince81 commented Apr 10, 2017

butonic Apr 10, 2017

butonic Apr 10, 2017

DeepDiver1975 Apr 10, 2017

butonic Apr 10, 2017

DeepDiver1975 Apr 10, 2017

butonic Apr 10, 2017 •

edited

Loading

butonic Apr 11, 2017

PVince81 commented May 4, 2017

DeepDiver1975 commented May 12, 2017

PVince81 commented May 15, 2017

PVince81 commented May 15, 2017

lock bot commented Aug 3, 2019

Instead of adding additional logins via php api - this can perfectly … #27607

Instead of adding additional logins via php api - this can perfectly … #27607

Conversation

DeepDiver1975 commented Apr 10, 2017 • edited Loading

Screenshots (if appropriate):

Types of changes

Checklist:

PVince81 Apr 10, 2017

Choose a reason for hiding this comment

PVince81 commented Apr 10, 2017

PVince81 commented Apr 10, 2017

butonic Apr 10, 2017

Choose a reason for hiding this comment

butonic Apr 10, 2017

Choose a reason for hiding this comment

DeepDiver1975 Apr 10, 2017

Choose a reason for hiding this comment

butonic Apr 10, 2017

Choose a reason for hiding this comment

DeepDiver1975 Apr 10, 2017

Choose a reason for hiding this comment

butonic Apr 10, 2017 • edited Loading

Choose a reason for hiding this comment

butonic Apr 11, 2017

Choose a reason for hiding this comment

PVince81 commented May 4, 2017

DeepDiver1975 commented May 12, 2017

PVince81 commented May 15, 2017

PVince81 commented May 15, 2017

lock bot commented Aug 3, 2019

DeepDiver1975 commented Apr 10, 2017 •

edited

Loading

butonic Apr 10, 2017 •

edited

Loading