X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.ria%2Fsrc%2Fargeo-ria-lib%2Fsecurity%2Fclass%2Forg%2Fargeo%2Fsecurity%2Fria%2FSecurityAPI.js;h=af3fabf95ad6e7b236208d141175a16199e700e2;hb=f7c73e12f9534b0b796686e207dd4b43193977fa;hp=e138d861b76ecc19b30b66322189ed08904eac4c;hpb=e80be147bdb65aa2a0c34e848ca78851b781508d;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/SecurityAPI.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/SecurityAPI.js
index e138d861b..af3fabf95 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/SecurityAPI.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/SecurityAPI.js
@@ -4,22 +4,19 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		
 		DEFAULT_CONTEXT : "/org.argeo.security.webapp",
 		
+		CREDENTIALS_SERVICE : "getCredentials.security",
+		
 		USERS_LIST_SERVICE : "getUsersList.security",
 		USER_EXISTS_SERVICE : "userExists.security",		
 		DELETE_USER_SERVICE : "deleteUser.security",
 		GET_USER_DETAILS_SERVICE : "getUserDetails.security",
 		CREATE_USER_SERVICE : "createUser.security",
 		UPDATE_USER_PASS_SERVICE : "updateUserPassword.security",
+		UPDATE_PASS_SERVICE : "updatePassword.security",
 
 		ROLES_LIST_SERVICE : "getRolesList.security",
-		GET_USERS_ROLE_SERVICE : "getUsersForRole.security",
 		CREATE_ROLE_SERVICE : "createRole.security",
-		DELETE_ROLE_SERVICE : "deleteRole.security",
-		
-		UPDATE_USER_ROLE_LNK_SERVICE : "updateUserRoleLink.security",
-		CREATE_NATURE_SERVICE : "createUserNature.security",
-		DELETE_NATURE_SERVICE : "deleteUserNature.security",
-		UPDATE_NATURE_SERVICE : "updateUserNature.security",
+		DELETE_ROLE_SERVICE : "deleteRole.security",		
 
 	  	/**
 		 * Standard Request getter
@@ -36,7 +33,23 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 				"application/json");
 		},
 		
+		/**
+		 * 
+		 * @param {qx.io.remote.Request} request
+		 * @param {Array} argumentsArray
+		 * @param {Integer} startIndex
+		 */
 		parseOptionalArguments : function(request, argumentsArray, startIndex){
+			// Attach Error listener
+			request.addListener("completed", function(response){
+				var jSonContent = response.getContent();  
+				if(typeof jSonContent == "object" && jSonContent.status && jSonContent.status == "ERROR"){
+					org.argeo.ria.components.Logger.getInstance().error(jSonContent.message);
+				}
+				request.setState("failed");
+			});
+
+			// Attach ILoadStatusables & reloadEvents
 			if(argumentsArray.length <= startIndex) return;
 			var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();
 			for(var i=startIndex;i<argumentsArray.length;i++){
@@ -49,12 +62,19 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 			}
 		},
 		
+		getCredentialsService : function(){
+			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.CREDENTIALS_SERVICE);
+			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 0);
+			return req;			
+		},
+		
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
-		getListUsersService : function(){
+		getListUsersService : function(getNatures){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.USERS_LIST_SERVICE);
 			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
+			req.setParameter("getNatures", (getNatures || false));
 			return req;
 		},
 		
@@ -64,7 +84,7 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		getUserExistsService : function(userName){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.USER_EXISTS_SERVICE);
 			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParameter("userName", userName);
+			req.setParameter("username", userName);
 			return req;
 		},
 		
@@ -74,7 +94,7 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		getDeleteUserService : function(userName){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.DELETE_USER_SERVICE);
 			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParameter("userName", userName);
+			req.setParameter("username", userName);
 			return req;
 		},
 		
@@ -84,55 +104,59 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		getUserDetailsService : function(userName){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.GET_USER_DETAILS_SERVICE);
 			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParameter("userName", userName);
+			req.setParameter("username", userName);
 			return req;
 		},
 		
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
-		getCreateUserService : function(userName){
+		getCreateUserService : function(userName, password){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.CREATE_USER_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParameter("userName", userName);
+			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 2);
+			req.setParameter("username", userName);
+			req.setParameter("password", password);
 			return req;
 		},
 		
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
-		getUpdateUserPassService : function(userName, userPassword){
+		getUpdatePassService : function(oldPassword, newPassword){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.UPDATE_USER_PASS_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParameter("userName", userName);
-			req.addParameter("userPassword", userPassword);
+			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 2);
+			req.setParameter("password", newPassword);
+			req.setParameter("oldpassword", oldPassword);
 			return req;
 		},
 		
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
-		getListRolesService : function(){
-			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.ROLES_LIST_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
+		getUpdateUserPassService : function(userName, userPassword){
+			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.UPDATE_USER_PASS_SERVICE);
+			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 2);
+			req.setParameter("username", userName);
+			req.setParameter("password", userPassword);
 			return req;
 		},
 		
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
-		getUsersForRolesService : function(){
-			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.GET_USERS_ROLE_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
+		getListRolesService : function(){
+			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.ROLES_LIST_SERVICE);
+			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 0);
 			return req;
 		},
-		
+				
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
 		getCreateRoleService : function(roleName){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.CREATE_ROLE_SERVICE);
 			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
+			req.setParameter("role", roleName);
 			return req;
 		},
 		
@@ -142,49 +166,8 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		getDeleteRoleService : function(roleName){
 			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.DELETE_ROLE_SERVICE);
 			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
+			req.setParameter("role", roleName);
 			return req;
-		},
-		
-		/**
-		 * @return  {qx.io.remote.Request}
-		 */
-		getUpdateUserRoleLinkService : function(roleName, userName){
-			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.UPDATE_USER_ROLE_LNK_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParameter("roleName", roleName);
-			req.addParameter("userName", userName);
-			return req;
-		},
-		
-		/**
-		 * @return  {qx.io.remote.Request}
-		 */
-		getCreateNatureService : function(natureData){
-			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.CREATE_NATURE_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParameter("natureData", natureData);
-			return req;
-		},
-		
-		/**
-		 * @return  {qx.io.remote.Request}
-		 */
-		getDeleteNatureService : function(natureUuid){
-			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.DELETE_NATURE_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParamter("natureUuid", natureUuid);
-			return req;
-		},
-		
-		/**
-		 * @return  {qx.io.remote.Request}
-		 */
-		getUpdateNatureService : function(natureUuid, natureData){
-			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.UPDATE_NATURE_SERVICE);
-			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
-			req.addParamter("natureUuid", natureUuid);
-			req.addParameter("natureData", natureData);
-			return req;
-		}		
+		}				
 	}
 });
\ No newline at end of file