Fixing the problem in login

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.user.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 = application.get('sso_sessions');
+        var ssoSessions = application.get(constants.CACHE_KEY_SSO_SESSIONS);
         if (!ssoSessions) {
             ssoSessions = {};
-            application.put('sso_sessions', ssoSessions);
+            application.put(constants.CACHE_KEY_SSO_SESSIONS, ssoSessions);
         }
         return ssoSessions;
     }