Fixes for #993

GluuFederation · Feb 4, 2019 · d87cd47 · d87cd47
1 parent f51fde6
commit d87cd47
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 51 deletions.
diff --git a/Server/integrations/passport/PassportExternalAuthenticator.py b/Server/integrations/passport/PassportExternalAuthenticator.py
@@ -147,11 +147,10 @@ def prepareForStep(self, configurationAttributes, requestParameters, step):
         identity = CdiUtil.bean(Identity)
 
         if step == 1:
-            # This param is needed in passportlogin.xhtml
-            identity.setWorkingParameter("behaviour", "social")
-
             #re-read the strategies config (for instance to know which strategies have enabled the email account linking)
             self.parseProviderConfigs()
+            identity.setWorkingParameter("externalProviders", json.dumps(self.registeredProviders))
+
             providerParam = self.customAuthzParameter
             url = None
 
@@ -190,7 +189,7 @@ def prepareForStep(self, configurationAttributes, requestParameters, step):
     def getExtraParametersForStep(self, configurationAttributes, step):
         print "Passport. getExtraParametersForStep called"
         if step == 1:
-            return Arrays.asList("selectedProvider")
+            return Arrays.asList("selectedProvider", "externalProviders")
         elif step == 2:
             return Arrays.asList("passport_user_profile")
         return None

diff --git a/Server/integrations/saml-passport/SamlPassportAuthenticator.py b/Server/integrations/saml-passport/SamlPassportAuthenticator.py
@@ -157,11 +157,10 @@ def prepareForStep(self, configurationAttributes, requestParameters, step):
         identity = CdiUtil.bean(Identity)
 
         if step == 1:
-            # This param is needed in passportlogin.xhtml
-            identity.setWorkingParameter("behaviour", "saml")
-
             #re-read the strategies config (for instance to know which strategies have enabled the email account linking)
             self.parseProviderConfigs()
+            identity.setWorkingParameter("externalProviders", json.dumps(self.registeredProviders))
+
             providerParam = self.customAuthzParameter
             url = None
 
@@ -200,7 +199,7 @@ def prepareForStep(self, configurationAttributes, requestParameters, step):
     def getExtraParametersForStep(self, configurationAttributes, step):
         print "Passport. getExtraParametersForStep called"
         if step == 1:
-            return Arrays.asList("selectedProvider")
+            return Arrays.asList("selectedProvider", "externalProviders")
         elif step == 2:
             return Arrays.asList("passport_user_profile")
         return None

diff --git a/Server/src/main/webapp/auth/passport/passportlogin.xhtml b/Server/src/main/webapp/auth/passport/passportlogin.xhtml
@@ -319,18 +319,6 @@ input[type="text"]:focus, input[type="password"]:focus {
 		</div>
 
 		<script type="text/javascript">
-			var behaviour = "${identity.getWorkingParameter('behaviour')}";
-
-			try {
-				if (behaviour == "") {
-					behaviour = localStorage.behaviour ? localStorage.behaviour
-							: "";
-				} else {
-					localStorage.behaviour = behaviour;
-				}
-			} catch (e) {
-			}
-
 			function idp_redirect(provider) {
 				var form = document.forms.loginForm;
 				form["loginForm:provider"].value = provider;
@@ -354,37 +342,15 @@ input[type="text"]:focus, input[type="password"]:focus {
 
 			jQuery(document).ready(
 					function() {
-
-						var APIURL = window.location.origin;
-
-						if (behaviour == "social") {
-							//social provider
-							$.get(APIURL + "/passport/passportstrategies",
-									function(data) {
-
-										var providers = JSON.parse(data);
-										for ( var name in providers) {
-											dynamic_link(name,
-													providers[name].logo_img);
-										}
-
-									});
-						}
-						if (behaviour == "saml") {
-							//saml provider
-							$.get(APIURL + "/passport/saml_config", function(
-									data) {
-
-								var providers = JSON.parse(data);
-								for ( var name in providers) {
-									if (providers[name].enable == "true") {
-										dynamic_link(name,
-												providers[name].logo_img);
-									}
-								}
-
-							});
-						}
+                        var jsonProviders = '${identity.getWorkingParameter('externalProviders')}'
+                        try {
+                            var providers = JSON.parse(jsonProviders)
+
+                            for (var idprv in providers) {
+                                dynamic_link(idprv, providers[idprv].logo_img)
+                            }
+                        } catch (e) {
+                        }
 
 						//error message display
 						var errormsg = window.location.href.split("=");