From aea39dd0b7385ba2ea6a28c74cd03a6be8ca7534 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Tue, 23 May 2023 08:45:03 +0200
Subject: [PATCH] refs #5468 feat: modificalos acl de VnUser

---
 back/methods/vn-user/createUser.js            | 72 +++++++++++++++++++
 back/models/vn-user.js                        |  3 +
 .../{232001 => 232201}/00-aclAccount.sql      |  0
 .../{232001 => 232201}/00-aclVnUser.sql       |  3 +-
 modules/account/front/create/index.html       | 10 +--
 modules/account/front/index/index.html        | 10 +--
 6 files changed, 87 insertions(+), 11 deletions(-)
 create mode 100644 back/methods/vn-user/createUser.js
 rename db/changes/{232001 => 232201}/00-aclAccount.sql (100%)
 rename db/changes/{232001 => 232201}/00-aclVnUser.sql (71%)

diff --git a/back/methods/vn-user/createUser.js b/back/methods/vn-user/createUser.js
new file mode 100644
index 000000000..0c9151fb1
--- /dev/null
+++ b/back/methods/vn-user/createUser.js
@@ -0,0 +1,72 @@
+module.exports = function(Self) {
+    Self.remoteMethodCtx('createUser', {
+        description: 'Create a user',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'name',
+            type: 'string',
+            required: true
+        },
+        {
+            arg: 'nickname',
+            type: 'string',
+            required: true
+        },
+        {
+            arg: 'email',
+            type: 'string',
+            required: true
+        },
+        {
+            arg: 'roleFk',
+            type: 'number',
+            required: true
+        },
+        {
+            arg: 'password',
+            type: 'string',
+            required: true
+        },
+        {
+            arg: 'active',
+            type: 'boolean'
+        }],
+        returns: {
+            root: true,
+            type: 'object'
+        },
+        http: {
+            verb: 'POST',
+            path: '/createUser'
+        }
+    });
+
+    Self.createUser = async(ctx, options) => {
+        const models = Self.app.models;
+        const args = ctx.args;
+        let tx;
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            if (!args.active) args.active = false;
+
+            delete args.ctx; // Remove unwanted properties
+            const newUser = await models.VnUser.create(args, myOptions);
+
+            if (tx) await tx.commit();
+
+            return newUser;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};
diff --git a/back/models/vn-user.js b/back/models/vn-user.js
index 84ba11794..2fa040d84 100644
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@@ -10,6 +10,9 @@ module.exports = function(Self) {
     require('../methods/vn-user/recover-password')(Self);
     require('../methods/vn-user/validate-token')(Self);
     require('../methods/vn-user/privileges')(Self);
+    require('../methods/vn-user/createUser')(Self);
+
+    Self.definition.settings.acls.find(acl => acl.property == 'create').permission = 'DENY';
 
     // Validations
 
diff --git a/db/changes/232001/00-aclAccount.sql b/db/changes/232201/00-aclAccount.sql
similarity index 100%
rename from db/changes/232001/00-aclAccount.sql
rename to db/changes/232201/00-aclAccount.sql
diff --git a/db/changes/232001/00-aclVnUser.sql b/db/changes/232201/00-aclVnUser.sql
similarity index 71%
rename from db/changes/232001/00-aclVnUser.sql
rename to db/changes/232201/00-aclVnUser.sql
index 1a63ed964..2cbadb548 100644
--- a/db/changes/232001/00-aclVnUser.sql
+++ b/db/changes/232201/00-aclVnUser.sql
@@ -6,4 +6,5 @@ INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalTyp
     VALUES
         ('VnUser', '*', '*', 'ALLOW', 'ROLE', 'itManagement'),
         ('VnUser', '__get__preview', 'READ', 'ALLOW', 'ROLE', 'employee'),
-        ('VnUser', 'preview', '*', 'ALLOW', 'ROLE', 'employee');
+        ('VnUser', 'preview', '*', 'ALLOW', 'ROLE', 'employee'),
+        ('VnUser', 'createUser', 'WRITE', 'ALLOW', 'ROLE', 'itManagement');
diff --git a/modules/account/front/create/index.html b/modules/account/front/create/index.html
index ee2de926a..f373cc468 100644
--- a/modules/account/front/create/index.html
+++ b/modules/account/front/create/index.html
@@ -1,6 +1,6 @@
 <vn-watcher
     vn-id="watcher"
-    url="VnUsers"
+    url="VnUsers/createUser"
     data="$ctrl.user"
     insert-mode="true"
     form="form">
@@ -12,18 +12,18 @@
     <vn-card class="vn-pa-lg">
         <vn-vertical>
             <vn-textfield
-                label="Name" 
+                label="Name"
                 ng-model="$ctrl.user.name"
                 rule="VnUser"
                 vn-focus>
             </vn-textfield>
             <vn-textfield
-                label="Nickname" 
+                label="Nickname"
                 ng-model="$ctrl.user.nickname"
                 rule="VnUser">
             </vn-textfield>
             <vn-textfield
-                label="Email" 
+                label="Email"
                 ng-model="$ctrl.user.email"
                 rule="VnUser">
             </vn-textfield>
@@ -39,7 +39,7 @@
                 type="password">
             </vn-textfield>
             <vn-check
-                label="Active" 
+                label="Active"
                 ng-model="$ctrl.user.active">
             </vn-check>
         </vn-vertical>
diff --git a/modules/account/front/index/index.html b/modules/account/front/index/index.html
index d067c8c37..7502c8b3d 100644
--- a/modules/account/front/index/index.html
+++ b/modules/account/front/index/index.html
@@ -14,11 +14,11 @@
                 <vn-item-section>
                     <h6>{{::user.nickname}}</h6>
                     <vn-label-value
-                        label="Id" 
+                        label="Id"
                         value="{{::user.id}}">
                     </vn-label-value>
                     <vn-label-value
-                        label="User" 
+                        label="User"
                         value="{{::user.name}}">
                     </vn-label-value>
                 </vn-item-section>
@@ -36,12 +36,12 @@
 <vn-popup vn-id="summary">
     <vn-user-summary user="$ctrl.selectedUser"></vn-user-summary>
 </vn-popup>
-<a 
+<a
     fixed-bottom-right
     ui-sref="account.create"
     vn-tooltip="New user"
     vn-bind="+"
-    vn-acl="it"
+    vn-acl="itManagement"
     vn-acl-action="remove">
     <vn-float-button icon="add"></vn-float-button>
-</a>
\ No newline at end of file
+</a>