community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #799 from hasuniea/master

Browse Source 
Fixing permission issue which resolves wso2/product-iots#430
This commit is contained in:
Harshan Liyanage 2017-06-22 13:54:28 +05:30 committed by GitHub
commit d07098ae1d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
View File

@ -115,7 +115,6 @@ var userModule = function () {
var url = carbon.server.address('https') + "/admin/services"; var url = carbon.server.address('https') + "/admin/services";
var server = new carbon.server.Server(url); var server = new carbon.server.Server(url);
var userManager = new carbon.user.UserManager(server, tenantId); var userManager = new carbon.user.UserManager(server, tenantId);
try { try {
if (userManager.userExists(username)) { if (userManager.userExists(username)) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
@ -632,11 +631,17 @@ var userModule = function () {
var url = carbon.server.address('https') + "/admin/services"; var url = carbon.server.address('https') + "/admin/services";
var server = new carbon.server.Server(url); var server = new carbon.server.Server(url);
var userManager = new carbon.user.UserManager(server, tenantId); var userManager = new carbon.user.UserManager(server, tenantId);
try { try {
if (!userManager.roleExists(roleName)) { if (!userManager.roleExists(roleName)) {
userManager.addRole(roleName, users, permissions); userManager.addRole(roleName, users, permissions);
} else { } else {
log.info("Role exist with name: " + roleName); var array = Object.keys(permissions);
var i, permission;
for (i = 0; i < array.length; i++) {
permission = array[i];
userManager.authorizeRole(roleName, permission, "ui.execute");
}
} }
} catch (e) { } catch (e) {
throw e; throw e;