user api conflict resolved

9 years ago · 81cd1f9ece
parent 166236f46a
commit 81cd1f9ece
1 changed files with 3 additions and 3 deletions
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
@ -78,9 +78,9 @@ if (uriMatcher.match("/{context}/api/user/login/")) {
 	} else {
 		userRoles = String(addUserFormData.userRoles).split(",");
 	}
-	userRoles=["deviceRole, deviceUser"];
-	//TODO-Apply new users,
-	userRoles = [];
+
+	userRoles="deviceRole,deviceUser".split(",");
+
 	try {
 		result = userModule.registerUser(username, firstname, lastname, emailAddress, password,
 				userRoles);