Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into apim420

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/api/admin/DeviceTypeManagementAdminService.java

@@ -58,7 +58,7 @@ import javax.ws.rs.core.Response;
                         description = "Add, Edit or View a Device Type",
                         key = "dm:admin:device-type:modify",
                         roles = {"Internal/devicemgt-admin"},
-                        permissions = {"/device-mgt/admin/device-type"}
+                        permissions = {"/device-mgt/admin/device-type/modify"}
                 ),
                 @Scope(
                         name = "Getting Details of a Device Type",

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/RoleManagementServiceImpl.java

@@ -361,7 +361,8 @@ public class RoleManagementServiceImpl implements RoleManagementService {
                 for (UIPermissionNode node : permissionNode.getNodeList()) {
                     if (Constants.Permission.LOGIN.equals(node.getResourcePath()) ||
                             Constants.Permission.DEVICE_MGT.equals(node.getResourcePath()) ||
-                            Constants.Permission.APP_MGT.equals(node.getResourcePath())) {
+                            Constants.Permission.APP_MGT.equals(node.getResourcePath()) ||
+                            Constants.Permission.TENANT.equals(node.getResourcePath())) {
                         deviceMgtPermissionsList.add(node);
                     }
                 }

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/util/Constants.java

@@ -84,6 +84,7 @@ public class Constants {
 		public static final String LOGIN = "/permission/admin/login";
 		public static final String DEVICE_MGT = "/permission/admin/device-mgt";
 		public static final String APP_MGT = "/permission/admin/app-mgt";
+		public static final String TENANT = "/permission/admin/tenants";
 	}
 
 }

features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml

@@ -318,6 +318,7 @@
         <Scope>dm:metadata:create</Scope>
         <Scope>dm:metadata:update</Scope>
         <Scope>and:ops:add-google-acc</Scope>
+        <Scope>and:ops:authenticate-acc</Scope>
         <Scope>and:ops:update-default-sim</Scope>
         <Scope>and:ops:add-google-acc</Scope>
         <Scope>and:ops:device-info</Scope>