refs #5887 para eliminar sigue las mismas reglas que para añadir

back/methods/vn-user/specs/addAlias.spec.js

@@ -14,7 +14,7 @@ describe('VnUser addAlias()', () => {
         try {
             const options = {transaction: tx};
 
-            await models.VnUser.addAlias(ctx, employeeId, mailAlias, options);
+            await models.MailAliasAccount.addAlias(ctx, employeeId, mailAlias, options);
 
             await tx.rollback();
         } catch (e) {
@@ -33,7 +33,7 @@ describe('VnUser addAlias()', () => {
         try {
             const options = {transaction: tx};
 
-            await models.VnUser.addAlias(ctx, employeeId, mailAlias, options);
+            await models.MailAliasAccount.addAlias(ctx, employeeId, mailAlias, options);
 
             await tx.rollback();
         } catch (e) {
@@ -41,7 +41,7 @@ describe('VnUser addAlias()', () => {
             await tx.rollback();
         }
 
-        expect(error.message).toContain(`You cannot assign an alias that you are not assigned to`);
+        expect(error.message).toContain(`You cannot assign/remove an alias that you are not assigned to`);
     });
 
     it('should add an alias', async() => {
@@ -55,7 +55,7 @@ describe('VnUser addAlias()', () => {
             const user = await models.VnUser.findById(developerId, null, options);
             await user.updateAttribute('hasGrant', true, options);
 
-            result = await models.VnUser.addAlias(ctx, customerId, mailAlias, options);
+            result = await models.MailAliasAccount.addAlias(ctx, customerId, mailAlias, options);
 
             await tx.rollback();
         } catch (e) {

back/models/vn-user.js

@@ -11,8 +11,6 @@ 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');
 

db/changes/232402/00-hotFix_travelConfig.sql

@@ -1,19 +1,19 @@
-CREATE TABLE `vn`.`travelConfig` (
-    `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-    `warehouseInFk` smallint(6) unsigned NOT NULL DEFAULT 8 COMMENT 'Warehouse de origen',
-    `warehouseOutFk` smallint(6) unsigned NOT NULL DEFAULT 60 COMMENT 'Warehouse destino',
-    `agencyFk` int(11) NOT NULL DEFAULT 1378 COMMENT 'Agencia por defecto',
-    `companyFk` int(10) unsigned NOT NULL DEFAULT 442 COMMENT 'Compañía por defecto',
-    PRIMARY KEY (`id`),
-    KEY `travelConfig_FK` (`warehouseInFk`),
-    KEY `travelConfig_FK_1` (`warehouseOutFk`),
-    KEY `travelConfig_FK_2` (`agencyFk`),
-    KEY `travelConfig_FK_3` (`companyFk`),
-    CONSTRAINT `travelConfig_FK` FOREIGN KEY (`warehouseInFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-    CONSTRAINT `travelConfig_FK_1` FOREIGN KEY (`warehouseOutFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-    CONSTRAINT `travelConfig_FK_2` FOREIGN KEY (`agencyFk`) REFERENCES `agencyMode` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-    CONSTRAINT `travelConfig_FK_3` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+-- CREATE TABLE `vn`.`travelConfig` (
+--     `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+--     `warehouseInFk` smallint(6) unsigned NOT NULL DEFAULT 8 COMMENT 'Warehouse de origen',
+--     `warehouseOutFk` smallint(6) unsigned NOT NULL DEFAULT 60 COMMENT 'Warehouse destino',
+--     `agencyFk` int(11) NOT NULL DEFAULT 1378 COMMENT 'Agencia por defecto',
+--     `companyFk` int(10) unsigned NOT NULL DEFAULT 442 COMMENT 'Compañía por defecto',
+--     PRIMARY KEY (`id`),
+--     KEY `travelConfig_FK` (`warehouseInFk`),
+--     KEY `travelConfig_FK_1` (`warehouseOutFk`),
+--     KEY `travelConfig_FK_2` (`agencyFk`),
+--     KEY `travelConfig_FK_3` (`companyFk`),
+--     CONSTRAINT `travelConfig_FK` FOREIGN KEY (`warehouseInFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+--     CONSTRAINT `travelConfig_FK_1` FOREIGN KEY (`warehouseOutFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+--     CONSTRAINT `travelConfig_FK_2` FOREIGN KEY (`agencyFk`) REFERENCES `agencyMode` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+--     CONSTRAINT `travelConfig_FK_3` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+-- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 
 INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
     VALUES

db/changes/232601/00-aclAddAlias.sql

@@ -1,11 +1,5 @@
 INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
     VALUES
-        ('VnUser', 'addAlias', 'WRITE', 'ALLOW', 'ROLE', 'employee');
-
-INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
-    VALUES
-        ('VnUser', 'removeAlias', 'WRITE', 'ALLOW', 'ROLE', 'employee');
-
-INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
-    VALUES
-        ('VnUser', 'canRemoveAlias', 'WRITE', 'ALLOW', 'ROLE', 'itManagement');
+        ('MailAliasAccount', 'addAlias', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('MailAliasAccount', 'removeAlias', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('MailAliasAccount', 'canEditAlias', 'WRITE', 'ALLOW', 'ROLE', 'itManagement');

loopback/locale/es.json

@@ -299,5 +299,5 @@
 	"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}}",
-	"You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado"
+	"You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado"
 }

modules/account/back/methods/mail-alias-account/addAlias.js

@@ -1,5 +1,3 @@
-const UserError = require('vn-loopback/util/user-error');
-
 module.exports = Self => {
     Self.remoteMethod('addAlias', {
         description: 'Add an alias if the user has the grant',
@@ -32,33 +30,12 @@ module.exports = Self => {
 
     Self.addAlias = async function(ctx, id, mailAlias, options) {
         const models = Self.app.models;
-        const userId = ctx.req.accessToken.userId;
-
         const myOptions = {};
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const user = await Self.findById(userId, {fields: ['hasGrant']}, myOptions);
-
-        if (!user.hasGrant)
-            throw new UserError(`You don't have grant privilege`);
-
-        const account = await models.Account.findById(userId, {
-            fields: ['id'],
-            include: {
-                relation: 'aliases',
-                scope: {
-                    fields: ['mailAlias']
-                }
-            }
-        }, myOptions);
-
-        const aliases = account.aliases().map(alias => alias.mailAlias);
-
-        const hasAlias = aliases.includes(mailAlias);
-        if (!hasAlias)
-            throw new UserError(`You cannot assign an alias that you are not assigned to`);
+        await Self.hasGrant(ctx, mailAlias, myOptions);
 
         return models.MailAliasAccount.create({
             mailAlias: mailAlias,

modules/account/back/methods/mail-alias-account/removeAlias.js

@@ -32,16 +32,12 @@ module.exports = Self => {
 
     Self.removeAlias = async function(ctx, id, mailAlias, options) {
         const models = Self.app.models;
-        const userId = ctx.req.accessToken.userId;
-
         const myOptions = {};
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const canRemoveAlias = await models.ACL.checkAccessAcl(ctx, 'VnUser', 'canRemoveAlias', 'WRITE');
-
-        if (userId != id && !canRemoveAlias) throw new UserError(`You don't have grant privilege`);
+        await Self.hasGrant(ctx, mailAlias, myOptions);
 
         const mailAliasAccount = await models.MailAliasAccount.findOne({
             where: {

modules/account/back/models/mail-alias-account.js

@@ -0,0 +1,53 @@
+
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    require('../methods/account/sync')(Self);
+    require('../methods/account/sync-by-id')(Self);
+    require('../methods/account/sync-all')(Self);
+    require('../methods/account/login')(Self);
+    require('../methods/account/logout')(Self);
+    require('../methods/account/change-password')(Self);
+    require('../methods/account/set-password')(Self);
+    require('../methods/mail-alias-account/addAlias')(Self);
+    require('../methods/mail-alias-account/removeAlias')(Self);
+
+    /**
+     * Checks if current user has
+     * read privileges over a dms
+     *
+     * @param {Object} ctx - Request context
+     * @param {Interger} mailAlias - mailAlias id
+     * @param {Object} options - Query options
+     * @return {Boolean} True for user with grant
+     */
+    Self.hasGrant = async function(ctx, mailAlias, options) {
+        const models = Self.app.models;
+        const userId = ctx.req.accessToken.userId;
+
+        const canEditAlias = await models.ACL.checkAccessAcl(ctx, 'MailAliasAccount', 'canEditAlias', 'WRITE');
+        if (canEditAlias) return true;
+
+        const user = await models.VnUser.findById(userId, {fields: ['hasGrant']}, options);
+        if (!user.hasGrant)
+            throw new UserError(`You don't have grant privilege`);
+
+        const account = await models.Account.findById(userId, {
+            fields: ['id'],
+            include: {
+                relation: 'aliases',
+                scope: {
+                    fields: ['mailAlias']
+                }
+            }
+        }, options);
+
+        const aliases = account.aliases().map(alias => alias.mailAlias);
+
+        const hasAlias = aliases.includes(mailAlias);
+        if (!hasAlias)
+            throw new UserError(`You cannot assign/remove an alias that you are not assigned to`);
+
+        return true;
+    };
+};

modules/account/front/aliases/index.js

@@ -25,7 +25,7 @@ export default class Controller extends Section {
     }
 
     onAddSave() {
-        return this.$http.post(`VnUsers/${this.$params.id}/addAlias`, this.addData)
+        return this.$http.post(`MailAliasAccounts/${this.$params.id}/addAlias`, this.addData)
             .then(() => this.refresh())
             .then(() => this.vnApp.showSuccess(
                 this.$t('Subscribed to alias!'))
@@ -36,7 +36,7 @@ export default class Controller extends Section {
         const params = {
             mailAlias: row.mailAlias
         };
-        return this.$http.post(`VnUsers/${this.$params.id}/removeAlias`, params)
+        return this.$http.post(`MailAliasAccounts/${this.$params.id}/removeAlias`, params)
             .then(() => this.refresh())
             .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
     }

modules/account/front/aliases/index.spec.js

@@ -27,7 +27,7 @@ describe('component vnUserAliases', () => {
             controller.addData = {account: 1};
             controller.$params = {id: 1};
 
-            $httpBackend.expectPOST('VnUsers/1/addAlias').respond();
+            $httpBackend.expectPOST('MailAliasAccounts/1/addAlias').respond();
             $httpBackend.expectGET('MailAliasAccounts').respond('foo');
             controller.onAddSave();
             $httpBackend.flush();
@@ -44,7 +44,7 @@ describe('component vnUserAliases', () => {
             ];
             controller.$params = {id: 1};
 
-            $httpBackend.expectPOST('VnUsers/1/removeAlias').respond();
+            $httpBackend.expectPOST('MailAliasAccounts/1/removeAlias').respond();
             $httpBackend.expectGET('MailAliasAccounts').respond(controller.$.data[1]);
             controller.onRemove(controller.$.data[0]);
             $httpBackend.flush();