Merge pull request #367 from Megala21/master

[EMM-1129]Fixing SSO problem

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/login.js

@@ -26,14 +26,16 @@ var onFail;
         var utility = require("/app/modules/utility.js").utility;
         var apiWrapperUtil = require("/app/modules/oauth/token-handlers.js")["handlers"];
         if (context.input.samlToken) {
-            apiWrapperUtil.setupTokenPairBySamlGrantType(context.input.username, context.input.samlToken);
+            apiWrapperUtil.setupTokenPairBySamlGrantType(context.user.username + '@' + context.user.domain, context.input.samlToken);
         } else {
             apiWrapperUtil.setupTokenPairByPasswordGrantType(context.input.username, context.input.password);
         }
         var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
         var carbonServer = require("carbon").server;
+        if (!context.input.samlToken) {
             (new carbonServer.Server({url: devicemgtProps["adminService"]}))
                 .login(context.input.username, context.input.password);
+        }
     };
 
     onFail = function (error) {

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/constants.js

@@ -105,7 +105,7 @@ var constants = {
     CACHE_KEY_APP_CONF_FILE_LMD: "_UUF_APP_CONF_FILE_LMD",
     CACHE_KEY_LOOKUP_TABLE: "_UUF_LOOKUP_TABLE",
     CACHE_KEY_USER: "_UUF_USER",
-    CACHE_KEY_SSO_SESSIONS: "_UUF_SSO_SESSIONS",
+    CACHE_KEY_SSO_SESSIONS: "sso_sessions",
     CACHE_KEY_HANDLEBARS_ROOT: "_UUF_HANDLEBARS_ROOT",
     // URL Query Params
     URL_PARAM_REFERER: "referer"

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/modules/auth/auth.js

@@ -364,10 +364,10 @@ var module = {};
      *     samlToken: string}>} SSO sessions
      */
     function getSsoSessions() {
-        var ssoSessions = session.get(constants.CACHE_KEY_SSO_SESSIONS);
+        var ssoSessions = application.get(constants.CACHE_KEY_SSO_SESSIONS);
         if (!ssoSessions) {
             ssoSessions = {};
-            session.put(constants.CACHE_KEY_SSO_SESSIONS, ssoSessions);
+            application.put(constants.CACHE_KEY_SSO_SESSIONS, ssoSessions);
         }
         return ssoSessions;
     }
@@ -486,14 +486,11 @@ var module = {};
      */
     module.ssoAcs = function (request, response) {
         var samlResponse = request.getParameter("SAMLResponse");
-        if (!samlResponse) {
+        var samlRequest = request.getParameter('SAMLRequest');
-            var msg = "SAML response is not found in request parameters.";
-            log.error(msg);
-            response.sendError(400, msg);
-            return;
-        }
         var ssoClient = require("sso").client;
         var samlResponseObj;
+
+        if (samlResponse) {
             try {
                 samlResponseObj = ssoClient.getSamlObject(samlResponse);
             } catch (e) {
@@ -535,8 +532,8 @@ var module = {};
                 if (ssoSession.sessionId) {
                     var ssoSessions = getSsoSessions();
                     ssoSessions[ssoSession.sessionId] = ssoSession;
-                if (ssoSessions.sessionIndex != null || ssoSessions.sessionIndex != 'undefined') {
+                    if (ssoSession.sessionIndex != null || ssoSession.sessionIndex != 'undefined') {
-                    module.loadTenant(ssoSessions.loggedInUser);
+                        module.loadTenant(ssoSession.loggedInUser);
                         var carbonUser = (require("carbon")).server.tenantUser(ssoSession.loggedInUser);
                         utils.setCurrentUser(carbonUser.username, carbonUser.domain, carbonUser.tenantId);
                         var scriptArgument = {input: {samlToken: ssoSession.samlToken}, user: module.getCurrentUser()};
@@ -548,6 +545,17 @@ var module = {};
                     response.sendError(500, msg);
                 }
             }
+        }
+        // If it is a logout request
+        if (samlRequest) {
+            var index = ssoClient.decodeSAMLLogoutRequest(ssoClient.getSamlObject(samlRequest));
+            if (log.isDebugEnabled()) {
+                log.debug("Back end log out request received for the session Id : " + index);
+            }
+            var jSessionId = getSsoSessions()[index];
+            delete getSsoSessions()[index];
+            session.invalidate();
+        }
     };
 
     /**