refs #6085 trad, remove front, back test

back/models/specs/mailAliasAccount.spec.js

@@ -0,0 +1,73 @@
+const models = require('vn-loopback/server/server').models;
+
+fdescribe('loopback model MailAliasAccount', () => {
+    it('should fail to add a mail Alias if the worker doesnt have ACLs', async() => {
+        const tx = await models.MailAliasAccount.beginTransaction({});
+        let error;
+
+        try {
+            const options = {transaction: tx, accessToken: {userId: 1}};
+            await models.MailAliasAccount.create({mailAliasFk: 2, roleFk: 5}, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            error = e;
+        }
+
+        expect(error.message).toEqual('The alias cant be modified');
+    });
+
+    it('should add a mail Alias', async() => {
+        const tx = await models.MailAliasAccount.beginTransaction({});
+        let error;
+
+        try {
+            const options = {transaction: tx, accessToken: {userId: 9}};
+            await models.MailAliasAccount.create({mailAliasFk: 2, roleFk: 5}, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            error = e;
+        }
+
+        expect(error).toBeUndefined();
+    });
+
+    it('should add a mail Alias of an inherit role', async() => {
+        const tx = await models.MailAliasAccount.beginTransaction({});
+        let error;
+
+        try {
+            const options = {transaction: tx, accessToken: {userId: 9}};
+            await models.MailAliasAccount.create({mailAliasFk: 3, roleFk: 5}, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            error = e;
+        }
+
+        expect(error).toBeUndefined();
+    });
+
+    it('should delete a mail Alias', async() => {
+        const tx = await models.MailAliasAccount.beginTransaction({});
+        let error;
+
+        try {
+            const options = {transaction: tx, accessToken: {userId: 1}};
+            const mailAclId = 2;
+            await models.MailAliasAccount.destroyAll({id: mailAclId}, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            error = e;
+        }
+
+        expect(error).toBeUndefined();
+    });
+});
+

db/changes/235001/00-aclsMails.sql

@@ -1,5 +1,6 @@
 -- Definición de la tabla mailAliasACL
-CREATE TABLE `account`.`mailAliasACL` (
+
+CREATE OR REPLACE TABLE `account`.`mailAliasAcl` (
   `mailAliasFk` int(10) unsigned NOT NULL,
   `roleFk` int(10) unsigned NOT NULL,
   FOREIGN KEY (`mailAliasFk`) REFERENCES `account`.`mailAlias` (`id`),

db/dump/fixtures.sql

@@ -3002,3 +3002,10 @@ INSERT INTO `vn`.`invoiceCorrectionType` (`id`, `description`)
         (1, 'Error in VAT calculation'),
         (2, 'Error in sales details'),
         (3, 'Error in customer data');
+
+INSERT INTO `account`.`mailAliasAcl` (`mailAliasFk`, `roleFk`)
+    VALUES
+        (1, 1),
+        (2, 9),
+        (3, 15);
+

front/core/locale/es.yml

@@ -68,3 +68,4 @@ Load more results: Cargar más resultados
 Send cau: Enviar cau
 By sending this ticket, all the data related to the error, the section, the user, etc., are already sent.: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc
 ExplainReason: Explique el motivo por el que no deberia aparecer este fallo
+You already have the mailAlias: Ya tienes este mail

loopback/locale/es.json

@@ -329,5 +329,7 @@
 	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
 	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
 	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
-	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}"
+	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
+	"You already have the mailAlias": "You already have the mailAlias",
+	"The alias cant be modified": "The alias cant be modified"
 }

modules/account/back/model-config.json

@@ -14,6 +14,9 @@
     "MailAliasAccount": {
         "dataSource": "vn"
     },
+    "MailAliasAcl": {
+        "dataSource": "vn"
+    },
     "MailConfig": {
         "dataSource": "vn"
     },

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

@@ -2,54 +2,54 @@
 const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
+    Self.rewriteDbError(function(err) {
+        if (err.code === 'ER_DUP_ENTRY')
+            return new UserError(`You already have the mailAlias`);
+        return err;
+    });
+
     Self.observe('before save', async ctx => {
         const changes = ctx.currentInstance || ctx.instance;
 
-        await Self.hasGrant(ctx, changes.mailAlias);
+        await checkModifyPermission(ctx, changes.mailAlias);
     });
 
     Self.observe('before delete', async ctx => {
         const mailAliasAccount = await Self.findById(ctx.where.id);
 
-        await Self.hasGrant(ctx, mailAliasAccount.mailAlias);
+        await checkModifyPermission(ctx, mailAliasAccount.mailAlias);
     });
 
-    /**
+    async function checkModifyPermission(ctx, mailAliasFk) {
-     * Checks if current user has
+        const userId = ctx.options.accessToken.userId;
-     * grant to add/remove alias
+        const available = await Self.getAvailable(userId);
-     *
+        if (!available.has(mailAliasFk))
-     * @param {Object} ctx - Request context
+            throw new UserError('The alias cant be modified');
-     * @param {Interger} mailAlias - mailAlias id
+    }
-     * @return {Boolean} True for user with grant
+
-     */
+    Self.getAvailable = async function(userId, options) {
-    Self.hasGrant = async function(ctx, mailAlias) {
         const models = Self.app.models;
-        const accessToken = {req: {accessToken: ctx.options.accessToken}};
-        const userId = accessToken.req.accessToken.userId;
 
-        const canEditAlias = await models.ACL.checkAccessAcl(accessToken, 'MailAliasAccount', 'canEditAlias', 'WRITE');
+        const myOptions = {};
-        if (canEditAlias) return true;
 
-        const user = await models.VnUser.findById(userId, {fields: ['hasGrant']});
+        if (typeof options == 'object')
-        if (!user.hasGrant)
+            Object.assign(myOptions, options);
-            throw new UserError(`You don't have grant privilege`);
 
-        const account = await models.Account.findById(userId, {
+        const roles = await models.RoleMapping.find({
-            fields: ['id'],
+            fields: ['roleId'],
-            include: {
+            where: {principalId: userId}
-                relation: 'aliases',
+        }, myOptions);
-                scope: {
+
-                    fields: ['mailAlias']
+        const availableMailAlias = await models.MailAliasAcl.find({
-                }
+            fields: ['mailAliasFk'],
+            include: {relation: 'mailAlias'},
+            where: {
+                roleFk: {
+                    inq: roles.map(role => role.roleId),
+                },
             }
-        });
+        }, myOptions);
-
+        const mailAliasArray = Array.from(availableMailAlias, alias => alias.mailAliasFk);
-        const aliases = account.aliases().map(alias => alias.mailAlias);
+        return new Set(mailAliasArray);
-
-        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/back/models/mail-alias-acl.js

@@ -1,43 +1,33 @@
+
 const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
-    require('../methods/notification/getList')(Self);
+    Self.rewriteDbError(function(err) {
-
+        if (err.code === 'ER_DUP_ENTRY')
-    Self.observe('before save', async function(ctx) {
+            return new UserError(`You already have the mailAlias`);
-        await checkModifyPermission(ctx);
+        return err;
     });
 
-    Self.observe('before delete', async function(ctx) {
+    Self.observe('before save', async ctx => {
-        await checkModifyPermission(ctx);
+        const changes = ctx.currentInstance || ctx.instance;
+
+        await checkModifyPermission(ctx, changes.mailAlias);
     });
 
-    async function checkModifyPermission(ctx) {
+    Self.observe('before delete', async ctx => {
-        const models = Self.app.models;
+        const mailAliasAccount = await Self.findById(ctx.where.id);
-        const instance = ctx.instance;
+
+        await checkModifyPermission(ctx, mailAliasAccount.mailAlias);
+    });
+
+    async function checkModifyPermission(ctx, mailAliasFk) {
         const userId = ctx.options.accessToken.userId;
-
+        const available = await Self.getAvailable(userId);
-        let mailAliasFk;
+        if (!available.has(mailAliasFk))
-        let roleFk;
-
-        if (instance) {
-            mailAliasFk = instance.mailAliasFk;
-            roleFk = instance.roleFk;
-        } else {
-            const mailAliasAcl = await models.MailAlias.findById(ctx.where.id);
-            mailAliasFk = mailAliasAcl.id;
-            roleFk = mailAliasAcl.roleFk;
-        }
-
-        const role = await models.VnUser.findById(roleFk, {fields: ['id', 'role']});
-        const available = await Self.getAvailable(roleFk);
-        const hasAcl = available.has(mailAliasFk);
-
-        if (!hasAcl || (userId.role != role))
             throw new UserError('The alias cant be modified');
     }
 
     Self.getAvailable = async function(userId, options) {
-        const availableMailAliasMap = new Map();
         const models = Self.app.models;
 
         const myOptions = {};
@@ -51,20 +41,15 @@ module.exports = Self => {
         }, myOptions);
 
         const availableMailAlias = await models.MailAliasAcl.find({
-            fields: ['mailAliasFk', 'roleFk'],
+            fields: ['mailAliasFk'],
-            include: {relation: 'roleFk'},
+            include: {relation: 'mailAlias'},
             where: {
                 roleFk: {
                     inq: roles.map(role => role.roleId),
                 },
             }
         }, myOptions);
-
+        const mailAliasArray = Array.from(availableMailAlias, alias => alias.mailAliasFk);
-        for (available of availableMailAlias) {
+        return new Set(mailAliasArray);
-            availableMailAliasMap.set(available.mailAliasFk, {
-                mailAliasFk: available.mailAliasFk,
-            });
-        }
-        return availableMailAliasMap;
     };
 };

modules/account/back/models/mail-alias-acl.json

@@ -1,28 +1,30 @@
 {
-    "name": "mailAliasACL",
+    "name": "MailAliasAcl",
     "base": "VnModel",
     "options": {
         "mysql": {
-            "table": "account.mailAliasACL"
+            "table": "account.mailAliasAcl"
         }
     },
     "properties": {
         "mailAliasFk": {
+            "id": true,
             "type": "number"
         },
         "roleFk": {
+            "id": true,
             "type": "number"
         }
     },
     "relations": {
         "mailAlias": {
             "type": "belongsTo",
-            "model": "VnUser",
+            "model": "MailAlias",
             "foreignKey": "mailAliasFk"
         },
         "role": {
             "type": "belongsTo",
-            "model": "VnUser",
+            "model": "Role",
             "foreignKey": "roleFk"
         }
     }

modules/account/front/alias/acl/create/index.js

@@ -1,33 +0,0 @@
-import ngModule from '../../../module';
-import Section from 'salix/components/section';
-
-export default class Controller extends Section {
-    constructor(...args) {
-        super(...args);
-        this.accessTypes = [
-            {name: '*'},
-            {name: 'READ'},
-            {name: 'WRITE'}
-        ];
-        this.permissions = [
-            {name: 'ALLOW'},
-            {name: 'DENY'}
-        ];
-
-        this.models = [];
-        for (let model in window.validations)
-            this.models.push({name: model});
-
-        this.acl = {
-            property: '*',
-            principalType: 'ROLE',
-            accessType: 'READ',
-            permission: 'ALLOW'
-        };
-    }
-}
-
-ngModule.component('vnAclMailCreate', {
-    // template: require('./index.html'),
-    controller: Controller
-});

modules/account/front/alias/acl/index.js

@@ -1,4 +0,0 @@
-import './main';
-import './index/';
-import './create';
-import './search-panel';

modules/account/front/alias/acl/index/index.js

@@ -1,15 +0,0 @@
-import ngModule from '../../../module';
-import Section from 'salix/components/section';
-
-export default class Controller extends Section {
-    onDelete(row) {
-        return this.$http.delete(`ACLs/${row.id}`)
-            .then(() => this.$.model.refresh())
-            .then(() => this.vnApp.showSuccess(this.$t('ACL removed')));
-    }
-}
-
-ngModule.component('vnAclMailIndex', {
-    // template: require('./index.html'),
-    controller: Controller
-});

modules/account/front/alias/acl/main/index.js

@@ -1,18 +0,0 @@
-import ngModule from '../../../module';
-import ModuleMain from 'salix/components/module-main';
-
-export default class ACL extends ModuleMain {
-    exprBuilder(param, value) {
-        switch (param) {
-        case 'search':
-            return {model: {like: `%${value}%`}};
-        default:
-            return {[param]: value};
-        }
-    }
-}
-
-ngModule.vnComponent('vnAclMailComponent', {
-    controller: ACL
-    // template: require('./index.html')
-});

modules/account/front/alias/acl/search-panel/index.js

@@ -1,26 +0,0 @@
-import ngModule from '../../../module';
-import SearchPanel from 'core/components/searchbar/search-panel';
-
-export default class Controller extends SearchPanel {
-    constructor(...args) {
-        super(...args);
-        this.accessTypes = [
-            {name: '*'},
-            {name: 'READ'},
-            {name: 'WRITE'}
-        ];
-        this.permissions = [
-            {name: 'ALLOW'},
-            {name: 'DENY'}
-        ];
-
-        this.models = [];
-        for (let model in window.validations)
-            this.models.push({name: model});
-    }
-}
-
-ngModule.component('vnAclSearchPanel', {
-    // template: require('./index.html'),
-    controller: Controller
-});

modules/account/front/alias/index.js

@@ -7,4 +7,3 @@ import './descriptor';
 import './create';
 import './basic-data';
 import './users';
-import './acl';