From 827fc7bacd4d38d88cbff8d5f64d8153cac58bb2 Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 19 Apr 2023 09:07:23 +0200 Subject: [PATCH] refs #4074 vn-user refactored --- back/methods/vn-user/user-acl.js | 6 +++--- back/models/vn-user.js | 1 + front/core/services/acl-service.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/back/methods/vn-user/user-acl.js b/back/methods/vn-user/user-acl.js index 2254726c62..08cd4dd400 100644 --- a/back/methods/vn-user/user-acl.js +++ b/back/methods/vn-user/user-acl.js @@ -1,9 +1,9 @@ module.exports = Self => { - Self.remoteMethodCtx('userAcl', { + Self.remoteMethod('userAcl', { description: 'Get all of the current user permissions', accepts: { arg: 'roles', - type: 'any', + type: ['string'], required: true, }, returns: { @@ -17,6 +17,6 @@ module.exports = Self => { }); Self.userAcl = async function(roles) { - return Self.app.models.ACL.find({principalId: {inq: {roles}}}, null); + return Self.rawSql(`SELECT * FROM salix.ACL a WHERE a.principalId IN (?)`, [roles]); }; }; diff --git a/back/models/vn-user.js b/back/models/vn-user.js index 84ba117942..ad12c9376f 100644 --- a/back/models/vn-user.js +++ b/back/models/vn-user.js @@ -10,6 +10,7 @@ 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/user-acl')(Self); // Validations diff --git a/front/core/services/acl-service.js b/front/core/services/acl-service.js index 58203502ea..f216d08573 100644 --- a/front/core/services/acl-service.js +++ b/front/core/services/acl-service.js @@ -21,7 +21,7 @@ class AclService { } this.acls = {}; - await this.$http.post('Accounts/user/acl', + await this.$http.post('VnUsers/user/acl', {roles: Object.keys(this.roles)}).then(res => { res.data.forEach(acl => { this.acls[acl.model] = this.acls[acl.model] || {};