Start preparing 0.3.0

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.ria / src / argeo-ria-lib / security / class / org / argeo / security / ria / model / User.js

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 64ba63e4c898c95c3b13854e6b5b8dde06cfc807..c5185355b3ff336152d64c8c7684ec7881ccaa42 100644 (file)
--- 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
@@ -5,6 +5,10 @@ qx.Class.define("org.argeo.security.ria.model.User", {
                        init : "",\r
                        check : "String"\r
                },\r
+               password : {\r
+                       nullable : true,\r
+                       check : "String"\r
+               },\r
                roles : {\r
                        check : "Array"\r
                },\r
@@ -23,7 +27,7 @@ qx.Class.define("org.argeo.security.ria.model.User", {
                this.base(arguments);\r
                this.setRoles([]);\r
                this.setNatures([]);\r
-               this.setRawData({"password":"{SHA}ieSV55Qc+eQOaYDRSha/AjzNTJE="});\r
+               this.setRawData({password:null});\r
        },\r
        members : {\r
                load : function(data, format){\r
@@ -33,11 +37,11 @@ qx.Class.define("org.argeo.security.ria.model.User", {
                        this.setNatures(data.userNatures);\r
                        this.setRawData(data);\r
                },\r
-               getSaveService : function(){\r
+               getSaveService : function(self){\r
                        if(this.isCreate()){\r
-                               var userService = org.argeo.security.ria.SecurityAPI.getCreateUserService(this.toJSON());                       \r
+                               var userService = org.argeo.security.ria.SecurityAPI.getCreateUserService(this.toJSON(true));                   \r
                        }else{\r
-                               var userService = org.argeo.security.ria.SecurityAPI.getUpdateUserService(this.toJSON());                               \r
+                               var userService = org.argeo.security.ria.SecurityAPI.getUpdateUserService(this.toJSON(), self);                         \r
                        }\r
                        userService.addListener("completed", function(response){\r
                                if(!response || !response.username) return;\r
@@ -45,11 +49,12 @@ qx.Class.define("org.argeo.security.ria.model.User", {
                        }, this);\r
                        return userService;                     \r
                },\r
-               toJSON : function(){\r
+               toJSON : function(create){\r
                        var rawData = this.getRawData();\r
                        rawData.username = this.getName();\r
                        rawData.roles = this.getRoles();\r
                        rawData.userNatures = this.getNatures();\r
+                       if(create) rawData.password = this.getPassword();\r
                        return rawData;\r
                },\r
                _getNatureByType : function(natureType){\r