cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/saml2 to 145a75c
Date Mon, 18 Aug 2014 02:32:48 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/saml2 ea510d111 -> 145a75c29


Minor fixes

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/145a75c2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/145a75c2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/145a75c2

Branch: refs/heads/saml2
Commit: 145a75c296c5a4573ae91142c0fd6ebdb8ad57a9
Parents: ea510d1
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Mon Aug 18 04:31:46 2014 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Mon Aug 18 04:31:46 2014 +0200

----------------------------------------------------------------------
 server/src/com/cloud/api/auth/SAML2LoginAPIAuthenticatorCmd.java | 2 +-
 ui/scripts/cloudStack.js                                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/145a75c2/server/src/com/cloud/api/auth/SAML2LoginAPIAuthenticatorCmd.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/auth/SAML2LoginAPIAuthenticatorCmd.java b/server/src/com/cloud/api/auth/SAML2LoginAPIAuthenticatorCmd.java
index 1f88c1c..ce97cfd 100644
--- a/server/src/com/cloud/api/auth/SAML2LoginAPIAuthenticatorCmd.java
+++ b/server/src/com/cloud/api/auth/SAML2LoginAPIAuthenticatorCmd.java
@@ -325,7 +325,7 @@ public class SAML2LoginAPIAuthenticatorCmd extends BaseCmd implements
APIAuthent
                             resp.addCookie(new Cookie("sessionKey", URLEncoder.encode(loginResponse.getSessionKey(),
HttpUtils.UTF_8)));
                             resp.addCookie(new Cookie("account", URLEncoder.encode(loginResponse.getAccount(),
HttpUtils.UTF_8)));
                             resp.addCookie(new Cookie("timezone", URLEncoder.encode(loginResponse.getTimeZone(),
HttpUtils.UTF_8)));
-                            resp.addCookie(new Cookie("userfullname", URLEncoder.encode(loginResponse.getFirstName()
+ " " + loginResponse.getLastName(), HttpUtils.UTF_8)));
+                            resp.addCookie(new Cookie("userfullname", loginResponse.getFirstName()
+ "%20" + loginResponse.getLastName()));
                             resp.sendRedirect("http://localhost:8080/client");
                             return ApiResponseSerializer.toSerializedString(loginResponse,
responseType);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/145a75c2/ui/scripts/cloudStack.js
----------------------------------------------------------------------
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 420c137..edc7c21 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -132,7 +132,7 @@
                     g_mySession = $.cookie('JSESSIONID');
                     g_sessionKey = $.cookie('sessionKey');
                     // Unbox quotes from sessionKey cookie value
-                    if (g_sessionKey[0] === '"' && g_sessionKey[g_sessionKey.length-1]
=== '"') {
+                    if (g_sessionKey && g_sessionKey[0] === '"' && g_sessionKey[g_sessionKey.length-1]
=== '"') {
                         g_sessionKey = g_sessionKey.slice(1, g_sessionKey.length-1);
                         $.cookie('sessionKey', g_sessionKey, {
                             expires: 1


Mime
View raw message