From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Wed, 24 Feb 2010 11:38:23 +0000 (+0000)
Subject: User self edition case
X-Git-Tag: argeo-commons-2.1.30~1645
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=db670ac0765e10e856fde50a04f6896b7a551c9d;p=lgpl%2Fargeo-commons.git

User self edition case

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

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 0d26d4776..55b9053b4 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
@@ -10,6 +10,7 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		USER_EXISTS_SERVICE : "userExists.security",		
 		DELETE_USER_SERVICE : "deleteUser.security",
 		UPDATE_USER_SERVICE : "updateUser.security",
+		UPDATE_USER_SELF_SERVICE : "updateUserSelf.security",
 		GET_USER_DETAILS_SERVICE : "getUserDetails.security",
 		CREATE_USER_SERVICE : "createUser.security",
 		UPDATE_USER_PASS_SERVICE : "updateUserPassword.security",
@@ -55,7 +56,7 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 			var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();
 			for(var i=startIndex;i<argumentsArray.length;i++){
 				var argument = argumentsArray[i];
-				if(qx.lang.Array.isArray(argument)){
+				if(qx.lang.Type.isArray(argument)){
 					serviceManager.attachILoadStatusables(request, argument);
 				}else if(typeof argument == "string"){
 					serviceManager.attachReloadEventType(request, argument);
@@ -102,8 +103,9 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		/**
 		 * @return  {qx.io.remote.Request}
 		 */
-		getUpdateUserService : function(userObject){
-			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.UPDATE_USER_SERVICE);
+		getUpdateUserService : function(userObject, self){
+			var service = (self?org.argeo.security.ria.SecurityAPI.UPDATE_USER_SELF_SERVICE:org.argeo.security.ria.SecurityAPI.UPDATE_USER_SERVICE);
+			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(service);
 			req.setMethod("POST");
 			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 1);
 			var jsonString = qx.util.Json.stringify(userObject);
@@ -137,10 +139,10 @@ qx.Class.define("org.argeo.security.ria.SecurityAPI", {
 		 * @return  {qx.io.remote.Request}
 		 */
 		getUpdatePassService : function(oldPassword, newPassword){
-			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.UPDATE_USER_PASS_SERVICE);
+			var req = org.argeo.security.ria.SecurityAPI.getServiceRequest(org.argeo.security.ria.SecurityAPI.UPDATE_PASS_SERVICE);
 			org.argeo.security.ria.SecurityAPI.parseOptionalArguments(req, arguments, 2);
 			req.setParameter("password", newPassword);
-			req.setParameter("oldpassword", oldPassword);
+			req.setParameter("oldPassword", oldPassword);
 			return req;
 		},
 		
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/PasswordCredentialImpl.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/PasswordCredentialImpl.js
index a7b648b23..48723506e 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/PasswordCredentialImpl.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/PasswordCredentialImpl.js
@@ -8,6 +8,9 @@ qx.Class.define("org.argeo.security.ria.components.PasswordCredentialImpl", {
 		valid : {
 			init : false
 		},
+		selfEdition : {
+			init : false
+		},
 		encoderCallback : {
 			init : function(string){
 				var encoderShort = org.argeo.ria.util.Encoder;
@@ -17,13 +20,23 @@ qx.Class.define("org.argeo.security.ria.components.PasswordCredentialImpl", {
 		}
 	},
 	
-	construct : function(){
+	construct : function(selfEdition){
 		this.base(arguments);
+		if(selfEdition){
+			this.setSelfEdition(selfEdition);
+		}
 		this.setLayout(new qx.ui.layout.HBox(5, "center"));
-		this.add(new qx.ui.basic.Label("Password"), {flex:1});
+		this.getLayout().setAlignY("middle");
+		if(this.getSelfEdition()){
+			this.oldPass = new qx.ui.form.PasswordField();
+			this.add(new qx.ui.basic.Label("Old"), {flex:1});
+			this.add(this.oldPass, {flex:2});
+			this.oldPass.addListener("changeValue", function(){this.fireEvent("modified");}, this);
+		}
+		this.add(new qx.ui.basic.Label((selfEdition?"New":"Password")), {flex:1});
 		this.pass1 = new qx.ui.form.PasswordField();
 		this.add(this.pass1, {flex:2});
-		this.add(new qx.ui.basic.Label("Confirm Password"), {flex:1});
+		this.add(new qx.ui.basic.Label((selfEdition?"Confirm":"Confirm Password")), {flex:1});
 		this.pass2 = new qx.ui.form.PasswordField();
 		this.add(this.pass2, {flex:2});
 		this.pass1.addListener("changeValue", function(){this.fireEvent("modified");}, this);
@@ -36,22 +49,28 @@ qx.Class.define("org.argeo.security.ria.components.PasswordCredentialImpl", {
 			return this;
 		},
 		getData : function(format){
-			var encoded = null;
+			var encoder = this.getEncoderCallback();
+			var encoded = null;			
 			if(this.pass1.getValue() != null && this.pass1.getValue() != ""){
-				var encoder = this.getEncoderCallback();
 				encoded = encoder(this.pass1.getValue()); 
 			}
+			if(this.getSelfEdition() && encoded && this.oldPass.getValue()!=""){
+				return {oldPass:encoder(this.oldPass.getValue()), newPass:encoded};
+			}
 			return encoded;
 		},
 		clear : function(){
 			this.pass1.setValue("");
-			this.pass2.setValue("");			
+			this.pass2.setValue("");		
+			if(this.getSelfEdition()){
+				this.oldPass.setValue("");
+			}
 		},
 		validate : function(){
 			if(this.pass1.getValue() != this.pass2.getValue()){
 				this.pass1.setValid(false);
-				this.pass2.setValid(false); 
-				this.setValid(false);
+				this.pass2.setValid(false);
+				this.setValid(false);				
 			}else{
 				this.pass1.setValid(true);
 				this.pass2.setValid(true); 
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditor.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditor.js
index b2dd95d08..0fc5bb12a 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditor.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditor.js
@@ -20,6 +20,9 @@ qx.Class.define("org.argeo.security.ria.components.UserEditor",
   
   properties : 
   {
+  	selfEdition : {
+  		init : false
+  	},
   	modified : {
   		init : false,
   		apply : "_applyDetailsModified"
@@ -95,7 +98,7 @@ qx.Class.define("org.argeo.security.ria.components.UserEditor",
   		this.basicGB.add(new qx.ui.basic.Label("Roles"), {row:1,column:0});  		
   		this.basicGB.add(this.rolesField, {row:1,column:1});
   		
-  		this.passPane = new org.argeo.security.ria.components.PasswordCredentialImpl();
+  		this.passPane = new org.argeo.security.ria.components.PasswordCredentialImpl(this.getSelfEdition());
   		this.passGB.add(this.passPane.getContainer());
   		
   		//this.naturesTab.add(this.basicPage);
@@ -162,7 +165,7 @@ qx.Class.define("org.argeo.security.ria.components.UserEditor",
   			if(pass != null && !this.passPane.validate()){
   				this.error("Warning, passwords differ!");
   				return;  				
-  			}
+  			}  			
   		}
   		this.passPane.clear();
   		var saveCompletedCallback = qx.lang.Function.bind(function(){
@@ -171,16 +174,21 @@ qx.Class.define("org.argeo.security.ria.components.UserEditor",
 			this.setModified(false);
 			this.fireDataEvent("savedUser", user);  			
   		}, this);
-  		var userService = user.getSaveService();
+  		var userService = user.getSaveService(this.getSelfEdition());
   		userService.addListener("completed", function(response){
   			if(response.getContent().status && response.getContent().status == "ERROR"){
   				return;
   			}
   			user.load(response.getContent(), "json");
   			if(pass!=null){
-  				var passService = org.argeo.security.ria.SecurityAPI.getUpdateUserPassService(user.getName(), pass);
+  				var passService;
+  				if(!this.getSelfEdition()){
+  					passService = org.argeo.security.ria.SecurityAPI.getUpdateUserPassService(user.getName(), pass);
+  				}else{
+  					passService = org.argeo.security.ria.SecurityAPI.getUpdatePassService(pass.oldPass, pass.newPass);
+  				}
   				passService.addListener("completed", function(response){
-  					if(response.getContent().status){
+  					if(response.getContent().status != "ERROR"){
   						this.info(response.getContent().message);
   					}
   					saveCompletedCallback();
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditorPrefPane.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditorPrefPane.js
index ae1dbb3eb..15bd3c088 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditorPrefPane.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditorPrefPane.js
@@ -5,7 +5,8 @@ qx.Class.define("org.argeo.security.ria.components.UserEditorPrefPane", {
 	  
 	construct : function(){
 		this.base(arguments);
-		this.initGUI();
+		this.setSelfEdition(true);
+		this.initGUI();		
 		this.basicGB.setVisibility("excluded");
 		var saveButton = new qx.ui.form.Button("Save", "org.argeo.security.ria/document-save.png");
 		saveButton.addListener("execute", this.saveUser, this);
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 c3f46970d..c5185355b 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
@@ -37,11 +37,11 @@ qx.Class.define("org.argeo.security.ria.model.User", {
 			this.setNatures(data.userNatures);
 			this.setRawData(data);
 		},
-		getSaveService : function(){
+		getSaveService : function(self){
 			if(this.isCreate()){
 		  		var userService = org.argeo.security.ria.SecurityAPI.getCreateUserService(this.toJSON(true));			
 			}else{
-		  		var userService = org.argeo.security.ria.SecurityAPI.getUpdateUserService(this.toJSON());				
+		  		var userService = org.argeo.security.ria.SecurityAPI.getUpdateUserService(this.toJSON(), self);				
 			}
 	  		userService.addListener("completed", function(response){
 	  			if(!response || !response.username) return;