From e1f12bea020fc367cd8002241f5e950680770fe4 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Tue, 11 Jul 2023 12:33:44 +0200
Subject: [PATCH] a

---
 back/models/vn-user.js                   |  2 ++
 loopback/locale/es.json                  |  5 +++--
 modules/account/front/aliases/index.html |  8 ++------
 modules/account/front/aliases/index.js   | 16 +++++++++-------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/back/models/vn-user.js b/back/models/vn-user.js
index b58395acc..12aab585c 100644
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@@ -11,6 +11,8 @@ module.exports = function(Self) {
     require('../methods/vn-user/validate-token')(Self);
     require('../methods/vn-user/privileges')(Self);
     require('../methods/vn-user/renew-token')(Self);
+    require('../methods/vn-user/addAlias')(Self);
+    require('../methods/vn-user/removeAlias')(Self);
 
     Self.definition.settings.acls = Self.definition.settings.acls.filter(acl => acl.property !== 'create');
 
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 20a9557e9..63b20995d 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -296,7 +296,8 @@
 	"Fecha fuera de rango": "Fecha fuera de rango",
 	"Error while generating PDF": "Error al generar PDF",
 	"Error when sending mail to client": "Error al enviar el correo al cliente",
-    "Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
+	"Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
 	"The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
-    "Negative basis of tickets": "Base negativa para los tickets: {{ticketsIds}}"
+	"Negative basis of tickets": "Base negativa para los tickets: {{ticketsIds}}",
+	"You don't have the alias assigned and you can't assign it to another user": "No tienes el alias asignado y no puedes asignarlo a otro usuario"
 }
diff --git a/modules/account/front/aliases/index.html b/modules/account/front/aliases/index.html
index 11d546afb..4a73ec873 100644
--- a/modules/account/front/aliases/index.html
+++ b/modules/account/front/aliases/index.html
@@ -17,9 +17,7 @@
                         <vn-icon-button
                             icon="delete"
                             translate-attr="{title: 'Unsubscribe'}"
-                            ng-click="removeConfirm.show(row)"
-                            vn-acl="itManagement"
-                            vn-acl-action="remove">
+                            ng-click="removeConfirm.show(row)">
                         </vn-icon-button>
                     </vn-item-section>
                 </vn-item>
@@ -32,9 +30,7 @@
         translate-attr="{title: 'Add'}"
         vn-bind="+"
         ng-click="$ctrl.onAddClick()"
-        fixed-bottom-right
-        vn-acl="itManagement"
-        vn-acl-action="remove">
+        fixed-bottom-right>
     </vn-float-button>
     <vn-dialog
         vn-id="dialog"
diff --git a/modules/account/front/aliases/index.js b/modules/account/front/aliases/index.js
index 0fc806a71..91d0c6e7c 100644
--- a/modules/account/front/aliases/index.js
+++ b/modules/account/front/aliases/index.js
@@ -21,12 +21,11 @@ export default class Controller extends Section {
     }
 
     onAddClick() {
-        this.addData = {account: this.$params.id};
         this.$.dialog.show();
     }
 
     onAddSave() {
-        return this.$http.post(`MailAliasAccounts`, this.addData)
+        return this.$http.post(`VnUsers/${this.$params.id}/addAlias`, this.addData)
             .then(() => this.refresh())
             .then(() => this.vnApp.showSuccess(
                 this.$t('Subscribed to alias!'))
@@ -34,11 +33,14 @@ export default class Controller extends Section {
     }
 
     onRemove(row) {
-        return this.$http.delete(`MailAliasAccounts/${row.id}`)
-            .then(() => {
-                this.$.data.splice(this.$.data.indexOf(row), 1);
-                this.vnApp.showSuccess(this.$t('Unsubscribed from alias!'));
-            });
+        const params = {
+            mailAlias: row.mailAlias
+        };
+        return this.$http.post(`VnUsers/${this.$params.id}/removeAlias`, params)
+            .then(() => this.refresh())
+            .then(() => this.vnApp.showSuccess(
+                this.$t('Subscribed to alias!'))
+            );
     }
 }