From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Sat, 19 Sep 2009 22:42:11 +0000 (+0000)
Subject: Roles management working good
X-Git-Tag: argeo-commons-2.1.30~1771
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=1af54f2dad396ac71d9872d82c2981e4ac9c2281

Roles management working good

git-svn-id: https://svn.argeo.org/commons/trunk@2984 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
index 3533221af..65b5427b3 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
@@ -37,6 +37,15 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   				toolbar  	: null,
   				callback	: function(e){
   					// Prompt for new name
+  					var modal = new org.argeo.ria.components.Modal();
+  					modal.makePromptForm("Please enter a role name", function(roleName){
+  						var service = org.argeo.security.ria.SecurityAPI.getCreateRoleService(roleName);
+  						service.addListener("completed", function(response){
+  							this.loadRolesList();
+  						}, this);
+  						service.send();
+  					}, this);
+  					modal.attachAndShow();
   				},
   				command 	: null
   			},   	
@@ -49,9 +58,13 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   				toolbar  	: null,
   				callback	: function(e){
   					// Call service to delete
-					var crtUsers = this.getViewSelection().getNodes();
-					for(var i=0;i<crtUsers.length;i++){
-						alert("Delete " + crtUsers[i]);
+					var roles = this.getViewSelection().getNodes();
+					for(var i=0;i<roles.length;i++){
+  						var service = org.argeo.security.ria.SecurityAPI.getDeleteRoleService(roles[i]);
+  						service.addListener("completed", function(response){
+  							this.loadRolesList();
+  						}, this);
+  						service.send();
 					}
   				},
   				selectionChange : function(viewName, data){
@@ -86,6 +99,10 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   	guiMode : {
   		apply : "_applyGuiMode"
   	},
+  	rolesList : {
+  		check : "Array",
+  		event : "changeRolesList"
+  	},  	
   	chooserOriginalSelection : {},
   	chooserSelectionModified : {
   		init:false,
@@ -182,6 +199,11 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
 		this.table.addListener("cellDblclick", function(cellEvent){
 			this.setGuiMode("edit");
 		}, this);
+		this.addListener("changeRolesList", function(event){
+  			var data = [];
+  			event.getData().forEach(function(el){data.push([el]);});
+  			this.tableModel.setData(data);  						
+		}, this);
 		
 		this.setGuiMode("clear");
   	},
@@ -231,8 +253,34 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   	},
   	
   	saveRoleModifications : function(deltaPlus, deltaMinus){
-  		console.log(deltaPlus);
-  		console.log(deltaMinus);
+  		//console.log(deltaPlus);
+  		//console.log(deltaMinus);
+  		// LOAD CONCERNED USERS
+  		var selectionModel = this.table.getSelectionModel();
+		if(!selectionModel.getSelectedCount()){
+			return;
+		}
+		var roleValue = this._selectionToValues(selectionModel)[0];
+  		
+  		var users = deltaPlus.concat(deltaMinus);
+  		for(var i=0;i<users.length;i++){
+  			var user = users[i];
+  			var userDetailService = org.argeo.security.ria.SecurityAPI.getUserDetailsService(users[i]);
+  			userDetailService.addListener("completed", function(response){
+  				var userRoles = response.getContent().roles;
+  				if(qx.lang.Array.contains(deltaPlus, user)){
+  					userRoles.push(roleValue);
+  				}else if(qx.lang.Array.contains(deltaMinus, user)){
+  					qx.lang.Array.remove(userRoles, roleValue);
+  				}
+  				var userSaveService = org.argeo.security.ria.SecurityAPI.getUpdateUserService(response.getContent());
+  				userSaveService.addListener("completed", function(e){
+  					this.fireDataEvent("changeRolesList", this.getRolesList());
+  				}, this);
+  				userSaveService.send();
+  			}, this);
+  			userDetailService.send();
+  		}
   	},
   	
   	monitorChooserSelectionChanges : function(event){
@@ -307,14 +355,6 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   	 */
   	load : function(){
   		
-  		var service = org.argeo.security.ria.SecurityAPI.getListRolesService();
-  		service.addListener("completed", function(response){
-  			var data = [];
-  			response.getContent().forEach(function(el){data.push([el]);});
-  			this.tableModel.setData(data);  			
-  		}, this);
-  		service.send();
-  		
   		var commands = this.getCommands();
   		this.toolBarPart.add(commands["new_role"].command.getToolbarButton());
   		this.toolBarPart.add(commands["delete_role"].command.getToolbarButton());
@@ -325,6 +365,17 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   		this.toolBar.add(this.cancelButton);		  		
   		this.toolBar.setShow("icon");
   		
+  		this.loadRolesList();
+  		
+  	},
+  	
+  	loadRolesList : function(){
+  		this.setRolesList([]);
+  		var service = org.argeo.security.ria.SecurityAPI.getListRolesService();
+  		service.addListener("completed", function(response){
+  			this.setRolesList(response.getContent());
+  		}, this);
+  		service.send();  		
   	},
   	  	 
 	addScroll : function(){
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 af3fabf95..962f402d2 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
@@ -9,6 +9,7 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		USERS_LIST_SERVICE : "getUsersList.security",
 		USER_EXISTS_SERVICE : "userExists.security",		
 		DELETE_USER_SERVICE : "deleteUser.security",
+		UPDATE_USER_SERVICE : "updateUser.security",
 		GET_USER_DETAILS_SERVICE : "getUserDetails.security",
 		CREATE_USER_SERVICE : "createUser.security",
 		UPDATE_USER_PASS_SERVICE : "updateUserPassword.security",
@@ -98,6 +99,18 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 			return req;
 		},
 		
+		/**
+		 * @return  {qx.io.remote.Request}
+		 */
+		getUpdateUserService : function(userObject){
+			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.UPDATE_USER_SERVICE);
+			req.setMethod("POST");
+			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
+			var jsonString = qx.util.Json.stringify(userObject);
+			req.setData(jsonString);
+			return req;
+		},
+		
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
index 2d51a172e..55316d26e 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
@@ -159,13 +159,13 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   	 * @param viewPane {org.argeo.ria.components.ViewPane} The viewPane.
   	 */
   	init : function(viewPane, data){
-  		if(!data){
+  		if(!data.USER){
   			var now = new Date();
 	  		this.setInstanceId(now.getTime());
 	  		this.setInstanceLabel("New User");  			
   		}else{
-	  		this.setInstanceId(data);
-	  		this.setInstanceLabel("User " + data);
+	  		this.setInstanceId(data.USER);
+	  		this.setInstanceLabel("User " + data.USER);
   		}
   		this.setView(viewPane);
   		this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));
@@ -211,7 +211,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   		this.basicGB.add(this.usernameField, {row:0,column:1});
   		
   		this.rolesField = new org.argeo.ria.components.ui.MultipleComboBox();
-  		this.rolesField.setChoiceValues(["ROLE_ADMIN", "ROLE_USER", "ROLE_USER1"]);
+  		this.rolesField.setChoiceValues(data.ROLES_LIST);
   		this.basicGB.add(new qx.ui.basic.Label("Roles"), {row:1,column:0});  		
   		this.basicGB.add(this.rolesField, {row:1,column:1});
   		
@@ -250,17 +250,14 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   		var user = this.getCurrentUser();
   		user.setName(this.usernameField.getValue());
   		user.setRoles((this.rolesField.getValue()||"").split(","));
-  		// GO TO AND RETURN FROM SERVER  		
-  		user.setNatures([
-	  		{
-			    "email" : "",
-			    "firstName" : "",
-			    "lastName" : "",
-			    "type" : "org.argeo.security.nature.SimpleUserNature"
-			}]
-  		);
-  		this.partialRefreshUser(user, ["details","natures"]);
-		this.setModified(false);  		
+  		// GO TO AND RETURN FROM SERVER
+  		var userService = user.getSaveService();
+  		userService.send();
+  		userService.addListener("completed", function(e){
+  			this.partialRefreshUser(user, ["details","natures"]);
+			this.setModified(false);
+			this.getViewSelection().triggerEvent();
+  		}, this);
   	},
   	
   	_addNatureTab : function(natureClass, natureData, select){
@@ -294,13 +291,23 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   			cancelB.setVisibility("visible");
   		});
   		cancelB.addListener("execute", function(){
+  			if(newClass.getIsNew()){
+  				this._removeNatureTab(natureClass);
+  			}
   			newClass.setEditMode(false);
   			editB.setVisibility("visible");
   			saveB.setVisibility("excluded");
   			cancelB.setVisibility("excluded");
-  		});
+  		}, this);
   		saveB.addListener("execute", function(){
   			// SAVE CURRENT NATURE
+  			var data = newClass.getData();
+  			if(newClass.getIsNew()){
+  				this.getCurrentUser().addNature(data);
+  			}else{
+  				this.getCurrentUser().updateNature(data);
+  			}
+  			this.saveUser();
   			this.setNaturesModified(false);
   			newClass.setEditMode(false);
   			editB.setVisibility("visible");
@@ -308,9 +315,10 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   			cancelB.setVisibility("excluded");
   		}, this);
   		if(natureData){
-  			newClass.setData(natureData);
+  			newClass.setData(natureData);  			
   			cancelB.execute();
   		}else{
+  			newClass.setIsNew(true);
   			editB.execute();
   		}
   		this.naturesTab.add(page);
@@ -341,7 +349,11 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   	
   	removeSelectedTab : function(){
   		var selected = this.naturesTab.getSelected();
-  		this._removeNatureTab(selected.getUserData("NATURE_CLASS"));
+  		var tabClass = selected.getUserData("NATURE_CLASS");
+  		var user = this.getCurrentUser();
+  		user.removeNature(tabClass.NATURE_TYPE);
+  		this.saveUser();
+  		this._removeNatureTab(tabClass);
   	},
   	
   	removeAllTabs : function(){
@@ -415,9 +427,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   	load : function(user){
   		if(this.getLoaded()){
   			return;
-  		}
-  		this.setRolesList(["ROLE_ADMIN", "ROLE_USER"]);
-  		
+  		}  		
   		// MUST BE DONE AFTER COMMANDS ARE INITIALIZED! 
   		var commands = this.getCommands();
   		var saveButton = commands["save_user"].command.getFormButton(); 
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
index 6a00e787c..206bf1436 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
@@ -50,7 +50,8 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   				callback	: function(e){
   					// Call service to delete
   					var classObj = org.argeo.security.ria.UserEditorApplet;
-					var iView = org.argeo.ria.components.ViewsManager.getInstance().initIViewClass(classObj, "editor");
+  					var initData = {USER:null,ROLES_LIST:this.getRolesList()};
+					var iView = org.argeo.ria.components.ViewsManager.getInstance().initIViewClass(classObj, "editor", initData);
 					iView.load();
   				},
   				command 	: null
@@ -87,7 +88,8 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
 					var crtUser = this.getViewSelection().getNodes()[0];
 					var userObject = this.getUsersList()[crtUser];
   					var classObj = org.argeo.security.ria.UserEditorApplet;
-					var iView = org.argeo.ria.components.ViewsManager.getInstance().initIViewClass(classObj, "editor", crtUser);
+  					var initData = {USER:crtUser,ROLES_LIST:this.getRolesList()};
+					var iView = org.argeo.ria.components.ViewsManager.getInstance().initIViewClass(classObj, "editor", initData);
 					iView.load(userObject);					
   				},
   				selectionChange : function(viewName, data){
@@ -114,8 +116,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   		event : "changeUsersList"
   	},
   	rolesList : {
-  		check : "Array",
-  		event : "changeRolesList"
+  		check : "Array"
   	},
   	instanceId : {init:""},
   	instanceLabel : {init:""}
@@ -155,6 +156,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
 			this.getCommands()["edit_user"].command.execute();
 		}, this);
 		
+		this.setRolesList([]);
   		this.setUsersList({});		
   		this.setGuiMode("clear");
   	},
@@ -204,6 +206,13 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   		this.toolBarPart.add(commands["edit_user"].command.getToolbarButton());  		
   		this.toolBar.setShow("icon");
 		this.loadUsersList();
+		
+		var rolesApplet = org.argeo.ria.components.ViewsManager.getInstance().getViewPaneById("roles").getContent();
+		rolesApplet.addListener("changeRolesList", function(e){
+			this.setRolesList(e.getData());
+			this.loadUsersList();
+		}, this);
+		
   	},
   	
   	loadUsersList : function(){
@@ -223,13 +232,9 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   	
   	_applyUsersList : function(usList){
   		var data = [];
-  		var rolesList = [];
   		qx.lang.Object.getValues(usList).forEach(function(usObject){
-  			var roles = usObject.getRoles();
-  			rolesList = qx.lang.Array.unique(rolesList.concat(roles));
   			data.push([usObject.getName(), usObject.getRoles().join(",")]);
   		});
-  		this.setRolesList(rolesList);
   		this.tableModel.setData(data);  		  		
   	},
   	  	
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/CoworkerNatureImpl.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/CoworkerNatureImpl.js
index a495563e6..e63d37479 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/CoworkerNatureImpl.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/CoworkerNatureImpl.js
@@ -7,7 +7,10 @@ qx.Class.define("org.argeo.security.ria.components.CoworkerNatureImpl", {
 	},
 	
 	construct : function(){
-		this.base(arguments);  		
+		this.base(arguments);
+		this.setDataMap({
+			type:"org.argeo.security.nature.CoworkerNature"
+		});		
 	},
 		
 	members : {
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/INaturePane.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/INaturePane.js
index 5d5c97e4d..1938fa727 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/INaturePane.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/INaturePane.js
@@ -10,6 +10,10 @@ qx.Interface.define("org.argeo.security.ria.components.INaturePane", {
 			init : true,
 			apply : "_applyEditMode",			
 			event : "changeEditMode"
+		},
+		isNew	: {
+			init : false,
+			check : "Boolean"
 		}
 	},
 	members : {
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js
index 342cee246..182183ab1 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js
@@ -20,11 +20,18 @@ qx.Class.define("org.argeo.security.ria.components.SimpleUserNatureImpl", {
 			init : true,
 			apply : "_applyEditMode",
 			event : "changeEditMode"
+		},
+		isNew	: {
+			init : false,
+			check : "Boolean"
 		}		
 	},
 	
 	construct : function(){
 		this.base(arguments);  	
+		this.setDataMap({
+			type:"org.argeo.security.nature.SimpleUserNature"
+		});
 		this._createGui();
  		this.setEditMode(false);		
 	},
@@ -79,10 +86,8 @@ qx.Class.define("org.argeo.security.ria.components.SimpleUserNatureImpl", {
 		},
 		getData    : function(format){
 			var dataMap = this.getDataMap();
-			for(var key in dataMap){
-				if(this.fields[key]){
-					dataMap[key] = this.fields[key].getValue();
-				}
+			for(var key in this.fields){
+				dataMap[key] = this.fields[key].getValue();
 			}
 			this.setDataMap(dataMap);
 			return dataMap;
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/model/User.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/model/User.js
index 935538863..4595fbcb5 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/model/User.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/model/User.js
@@ -27,11 +27,49 @@ qx.Class.define("org.argeo.security.ria.model.User", {
 			this.setNatures(data.userNatures);
 			this.setRawData(data);
 		},
+		getSaveService : function(){
+	  		var userService = org.argeo.security.ria.SecurityAPI.getUpdateUserService(this.toJSON());
+	  		userService.addListener("completed", function(response){
+	  			if(!response || !response.username) return;
+	  			this.load(response.getContent(), "json");
+	  		}, this);
+	  		return userService;	  		
+		},
 		toJSON : function(){
 			var rawData = this.getRawData();
 			rawData.username = this.getName();
 			rawData.roles = this.getRoles();
 			rawData.userNatures = this.getNatures();
+			return rawData;
+		},
+		_getNatureByType : function(natureType){
+			var found = false;
+			this.getNatures().forEach(function(el){
+				if(el.type == natureType){
+					found = el;
+				}
+			});		
+			return found;
+		},
+		addNature : function(nature){
+			if(this._getNatureByType(nature.type)){
+				return;
+			}
+			this.getNatures().push(nature);
+		},
+		removeNature : function(natureType){
+			var foundNature = this._getNatureByType(natureType)
+			if(foundNature){
+				qx.lang.Array.remove(this.getNatures(), foundNature);
+			}
+		},
+		updateNature : function(nature){
+			var natures = this.getNatures();
+			for(var i=0;i<natures;i++){
+				if(natures[i].type == nature.type){
+					natures[i] = nature;
+				}
+			}
 		}
 	}