Return-Path: 
 <commits-return-51188-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3ED8018B55
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Wed,  3 Jun 2015 18:30:57 +0000 (UTC)
Received: (qmail 24406 invoked by uid 500); 3 Jun 2015 18:30:57 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 24375 invoked by uid 500); 3 Jun 2015 18:30:57 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 24366 invoked by uid 99); 3 Jun 2015 18:30:57 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jun 2015 18:30:57 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id F0068E005E; Wed,  3 Jun 2015 18:30:56 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bhaisaab@apache.org
To: commits@cloudstack.apache.org
Date: Wed, 03 Jun 2015 18:30:56 -0000
Message-Id: <6e6c6e22679246b0b46a87cb47168aa6@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] git commit: updated refs/heads/saml-production-grade to b8b21aa

Repository: cloudstack
Updated Branches:
  refs/heads/saml-production-grade d80634cc6 -> b8b21aa99


CLOUDSTACK-8458: On UI show dropdown list of discovered IdPs

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/79ef7f36
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/79ef7f36
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/79ef7f36

Branch: refs/heads/saml-production-grade
Commit: 79ef7f360f1945017cce0ebbcb27c8cec6bd20b7
Parents: d80634c
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Wed Jun 3 20:23:19 2015 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Wed Jun 3 20:23:19 2015 +0200

----------------------------------------------------------------------
 ui/index.jsp                  |  7 ++++++-
 ui/scripts/cloudStack.js      |  2 +-
 ui/scripts/ui-custom/login.js | 13 ++++++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79ef7f36/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 4b601a5..e4f2985 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -68,7 +68,12 @@
                         </div>
                         <!-- Submit (login) -->
                         <input type="submit" value="<fmt:message key="label.login"/>" />
-                        <div id="saml-login"><input type="samlsubmit" value="<fmt:message key="label.saml.login"/>"/></div>
+                        <div id="saml-login">
+                            <select id="saml-idps" style="margin-top: 20px">
+                                <option value=""></option> <!-- when this blank option is selected, default IdP will be used -->
+                            </select>
+                            <input type="samlsubmit" value="<fmt:message key="label.saml.login"/>"/>
+                        </div>
                         <!-- Select language -->
                         <div class="select-language">
                             <select name="language">

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79ef7f36/ui/scripts/cloudStack.js
----------------------------------------------------------------------
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index d89f487..28be71c 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -371,7 +371,7 @@
                 $.cookie('domainid', null);
                 $.cookie('role', null);
                 $.cookie('timezone', null);
-                window.location.href = createURL('samlSso');
+                window.location.href = createURL('samlSso&idpid=' + args.data.idpid);
             },
 
             // Show cloudStack main UI widget

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79ef7f36/ui/scripts/ui-custom/login.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/login.js b/ui/scripts/ui-custom/login.js
index 1f82c82..90a19ab 100644
--- a/ui/scripts/ui-custom/login.js
+++ b/ui/scripts/ui-custom/login.js
@@ -123,6 +123,7 @@
         // SAML Login action
         $login.find('input[type=samlsubmit]').click(function() {
             args.samlLoginAction({
+                data: {'idpid': $login.find('#saml-idps').find(':selected').val()}
             });
         });
 
@@ -130,7 +131,7 @@
         $login.find("#saml-login").hide();
         $.ajax({
             type: "GET",
-            url: createURL("getSPMetadata"),
+            url: createURL("listIdps"),
             dataType: "json",
             async: false,
             success: function(data, textStatus, xhr) {
@@ -139,6 +140,16 @@
                 } else {
                     $login.find('#saml-login').hide();
                 }
+                var idpList = data.listidpsresponse.idp.sort(function (a, b) {
+                    return a.orgName.localeCompare(b.orgName);
+                });
+                $.each(idpList, function(index, idp) {
+                    $login.find('#saml-idps')
+                        .append($('<option>', {
+                            value: idp.id,
+                            text: idp.orgName
+                        }));
+                });
             },
             error: function(xhr) {
                 $login.find('#saml-login').hide();