Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/RoleManagementServiceImpl.java

@@ -31,6 +31,7 @@ import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
 import org.wso2.carbon.device.mgt.jaxrs.util.SetReferenceTransformer;
 import org.wso2.carbon.user.api.*;
+import org.wso2.carbon.user.core.common.AbstractUserStoreManager;
 import org.wso2.carbon.user.mgt.UserRealmProxy;
 import org.wso2.carbon.user.mgt.common.UIPermissionNode;
 import org.wso2.carbon.user.mgt.common.UserAdminException;
@@ -51,22 +52,29 @@ public class RoleManagementServiceImpl implements RoleManagementService {
 
     private static final String API_BASE_PATH = "/roles";
     private static final Log log = LogFactory.getLog(RoleManagementServiceImpl.class);
+    private static final String PRIMARY_USER_STORE = "PRIMARY";
 
     @GET
     @Override
     public Response getRoles(
             @QueryParam("filter") String filter,
-            @QueryParam("user-store") String userStoreName,
+            @QueryParam("user-store") String userStore,
             @HeaderParam("If-Modified-Since") String ifModifiedSince,
             @QueryParam("offset") int offset, @QueryParam("limit") int limit) {
         List<String> filteredRoles;
         RoleList targetRoles = new RoleList();
+
+        //if user store is null set it to primary
+        if(userStore == null || "".equals(userStore)){
+            userStore = PRIMARY_USER_STORE;
+        }
+
         try {
             //Get the total role count that matches the given filter
-            filteredRoles = getRolesFromUserStore(filter);
+            filteredRoles = getRolesFromUserStore(filter, userStore);
             targetRoles.setCount(filteredRoles.size());
 
-            filteredRoles = FilteringUtil.getFilteredList(getRolesFromUserStore(filter), offset, limit);
+            filteredRoles = FilteringUtil.getFilteredList(getRolesFromUserStore(filter, userStore), offset, limit);
             targetRoles.setList(filteredRoles);
 
             return Response.ok().entity(targetRoles).build();
@@ -343,14 +351,14 @@ public class RoleManagementServiceImpl implements RoleManagementService {
         }
     }
 
-    private List<String> getRolesFromUserStore(String filter) throws UserStoreException {
-        UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager();
+    private List<String> getRolesFromUserStore(String filter, String userStore) throws UserStoreException {
+        AbstractUserStoreManager userStoreManager = (AbstractUserStoreManager) DeviceMgtAPIUtils.getUserStoreManager();
         String[] roles;
         boolean filterRolesByName = (!((filter == null) || filter.isEmpty()));
         if (log.isDebugEnabled()) {
             log.debug("Getting the list of user roles");
         }
-        roles = userStoreManager.getRoleNames();
+        roles = userStoreManager.getRoleNames(userStore+"/*", -1, false, true, true);
         // removing all internal roles, roles created for Service-providers and application related roles.
         List<String> filteredRoles = new ArrayList<>();
         for (String role : roles) {

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceIdentifier.java

@@ -48,7 +48,7 @@ public class DeviceIdentifier implements Serializable{
     }
 
     public void setType(String type) {
-        this.type = type;
+        this.type = type.toLowerCase();
     }
     public String getId() {
         return id;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java

@@ -95,7 +95,7 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             //TODO: Fix this properly later adding device type to be passed in when the task manage executes "addOperations()"
             String type = null;
             if (deviceIds.size() > 0) {
-                type = deviceIds.get(0).getType();
+                type = deviceIds.get(0).getType().toLowerCase();
             }
             Activity activity =  DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().
                    addOperation(type, operation, deviceIds);

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

@@ -41,7 +41,7 @@ var backendServiceInvoker = function () {
      * If the token pair s not set in the session this will send a redirect to the login page.
      */
     privateMethods.getAccessToken = function () {
-        var tokenPair = session.get(constants["ACCESS_TOKEN_PAIR_IDENTIFIER"]);
+        var tokenPair = parse(session.get(constants["ACCESS_TOKEN_PAIR_IDENTIFIER"]));
         if (tokenPair) {
             return tokenPair.accessToken;
         } else {

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

@@ -23,20 +23,17 @@ var onFail;
     var log = new Log("/app/modules/login.js");
     var constants = require("/app/modules/constants.js");
     onSuccess = function (context) {
-        var properties;
         var utility = require("/app/modules/utility.js").utility;
         var apiWrapperUtil = require("/app/modules/api-wrapper-util.js").apiWrapperUtil;
         if (context.input.samlToken) {
-            properties = {samlToken: context.input.samlToken};
-            apiWrapperUtil.setupAccessTokenPair(constants.GRANT_TYPE_SAML, properties);
+            apiWrapperUtil.setupAccessTokenPairBySamlGrantType(context.input.username, context.input.samlToken);
         } else {
-            properties = {username: context.input.username, password: context.input.password};
-            apiWrapperUtil.setupAccessTokenPair(constants.GRANT_TYPE_PASSWORD, properties);
+            apiWrapperUtil.setupAccessTokenPairByPasswordGrantType(context.input.username, context.input.password);
         }
         var devicemgtProps = require("/app/conf/reader/main.js")["conf"];
         var carbonServer = require("carbon").server;
         (new carbonServer.Server({url: devicemgtProps["adminService"]}))
-                .login(context.input.username, context.input.password);
+            .login(context.input.username, context.input.password);
     };
 
     onFail = function (error) {