community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
charithag 2015-07-26 06:49:14 +05:30
commit 2f6e195f95
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
View File

@ -78,9 +78,9 @@ if (uriMatcher.match("/{context}/api/user/login/")) {
} else { } else {
userRoles = String(addUserFormData.userRoles).split(","); userRoles = String(addUserFormData.userRoles).split(",");
} }
userRoles=["deviceRole, deviceUser"];
//TODO-Apply new users, userRoles="deviceRole,deviceUser".split(",");
userRoles = [];
try { try {
result = userModule.registerUser(username, firstname, lastname, emailAddress, password, result = userModule.registerUser(username, firstname, lastname, emailAddress, password,
userRoles); userRoles);

2
modules/distribution/src/repository/jaggeryapps/iotserver/modules/policy.js
View File

@ -23,8 +23,6 @@ policyModule = function () {
var constants = require("/modules/constants.js"); var constants = require("/modules/constants.js");
var utility = require("/modules/utility.js").utility; var utility = require("/modules/utility.js").utility;
var userManagementService = utility.getUserManagementService();
var publicMethods = {}; var publicMethods = {};
var privateMethods = {}; var privateMethods = {};

25
modules/distribution/src/repository/jaggeryapps/iotserver/modules/user.js
View File

@ -250,16 +250,25 @@ userModule = function () {
log.error("User object was not found in the session"); log.error("User object was not found in the session");
throw constants.ERRORS.USER_NOT_FOUND; throw constants.ERRORS.USER_NOT_FOUND;
} }
var carbon = require('carbon');
var tenantId = carbon.server.tenantId();
var url = carbon.server.address('https') + "/admin/services";
var server = new carbon.server.Server(url);
var userManager = new carbon.user.UserManager(server, tenantId); var userManager = new carbon.user.UserManager(server, tenantId);
var userList = userManager.listUsers(); var userList = userManager.listUsers();
var i, userObject, email, firstname, lastname;
var i, userObject; for (i = 0; i < userList.length; i++) {
for (i = 0; i < userList.size(); i++) { userObject = userManager.getUser(userList[i]);
userObject = userList.get(i); email = userManager.getClaim(userList[i],"http://wso2.org/claims/emailaddress", null);
var userObj = { firstname = userManager.getClaim(userList[i],"http://wso2.org/claims/givenname", null);
"username" : userObject.getUserName(), lastname = userManager.getClaim(userList[i],"http://wso2.org/claims/lastname", null);
"email" : userObject.getEmail(), //log.info(userManager.getClaimsForSet(userList[i], new Array("http://wso2.org/claims/emailaddress",
"name" : userObject.getFirstName() + " " + userObject.getLastName() // "http://wso2.org/claims/givenname",
// "http://wso2.org/claims/lastname"), null));
userObj = {
"username" : userObject.username,
"email" : email,
"name" : firstname + " " + lastname
}; };
if(userObj.username == "admin"){ if(userObj.username == "admin"){
userObj.name = "admin"; userObj.name = "admin";