From b5885368666f1b29bd5f6337e551270e316da712 Mon Sep 17 00:00:00 2001 From: pierreburgy Date: Mon, 9 Nov 2015 19:05:33 +0100 Subject: [PATCH] Improve router for user permissions --- lib/configuration/hooks/router/index.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/configuration/hooks/router/index.js b/lib/configuration/hooks/router/index.js index 790fc4bf7e..a710fe42ae 100644 --- a/lib/configuration/hooks/router/index.js +++ b/lib/configuration/hooks/router/index.js @@ -50,13 +50,14 @@ module.exports = function (strapi) { // Middleware used for every routes. // Expose the endpoint in `this`. - function globalPolicy(endpoint, route) { + function globalPolicy(endpoint, value, route) { return function * (next) { this.request.route = { - endpoint: endpoint, - controller: route.controller, - firstWord: _.startsWith(route.endpoint, '/') ? route.endpoint.split('/')[1] : route.endpoint.split('/')[0], - value: route + endpoint: _.trim(endpoint), + controller: _.trim(value.controller), + action: _.trim(value.action), + splittedEndpoint: _.trim(route.endpoint), + verb: route.verb && _.trim(route.verb.toLowerCase()) }; yield next; }; @@ -85,7 +86,7 @@ module.exports = function (strapi) { policies = []; // Add the `globalPolicy`. - policies.push(globalPolicy(endpoint, route)); + policies.push(globalPolicy(endpoint, value, route)); if (_.isArray(value.policies) && !_.isEmpty(value.policies)) { _.forEach(value.policies, function (policy) {