yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-07 13:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve policies loading into dictionary and lazy load hooks

Browse Source
This commit is contained in:
Aurélien Georget 2016-10-25 18:04:32 +02:00
parent 5a9ca376db
commit dd13dff7ad
4 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi/lib/Strapi.js
View File

@ -50,7 +50,7 @@ class Strapi extends EventEmitter {
scope: ['dependencies', 'devDependencies'],
replaceString: /^koa(-|\.)/,
camelize: true,
lazy: false
lazy: true
});
// New Winston logger.

42
packages/strapi/lib/configuration/hooks/core/router/index.js
View File

@ -60,16 +60,18 @@ module.exports = strapi => {
try {
const {route, policies, action, validate} = routerChecker(value, endpoint);
if (_.isUndefined(action) || !_.isFunction(action)) {
return strapi.log.warn('Ignored attempt to bind route `' + endpoint + '` to unknown controller/action.');
}
strapi.router.route(_.omitBy({
method: value.method,
path: value.path,
handler: [strapi.middlewares.compose(policies), action],
validate: validate
}, _.isEmpty));
// strapi.router[route.verb.toLowerCase()](route.endpoint, strapi.middlewares.compose(policies), action);
} catch (err) {
strapi.log.warn('Ignored attempt to bind route `' + endpoint + '` to unknown controller/action.');
cb(err);
}
});
@ -89,14 +91,18 @@ module.exports = strapi => {
try {
const {route, policies, action, validate} = routerChecker(value, endpoint, plugin);
if (_.isUndefined(action) || !_.isFunction(action)) {
return strapi.log.warn('Ignored attempt to bind route `' + endpoint + '` to unknown controller/action.');
}
router.route(_.omitBy({
method: value.method,
path: value.path,
handler: [strapi.middlewares.compose(policies), action],
handler: _.remove([strapi.middlewares.compose(policies), action], o => _.isFunction(o)),
validate: validate
}, _.isEmpty));
} catch (err) {
strapi.log.warn('Ignored attempt to bind route `' + endpoint + '` to unknown controller/action.');
cb(err);
}
});
@ -110,14 +116,18 @@ module.exports = strapi => {
try {
const {route, policies, action, validate} = routerChecker(value, endpoint, plugin);
if (_.isUndefined(action) || !_.isFunction(action)) {
return strapi.log.warn('Ignored attempt to bind route `' + endpoint + '` to unknown controller/action.');
}
strapi.router.route(_.omitBy({
method: value.method,
path: value.path,
handler: [strapi.middlewares.compose(policies), action],
handler: _.remove([strapi.middlewares.compose(policies), action], o => _.isFunction(o)),
validate: validate
}, _.isEmpty));
} catch (err) {
strapi.log.warn('Ignored attempt to bind route `' + endpoint + '` to unknown controller/action.');
cb(err);
}
});
}
@ -180,6 +190,10 @@ module.exports = strapi => {
const controller = strapi.controllers[handler[0].toLowerCase()] || strapi.plugins[plugin].controllers[handler[0].toLowerCase()];
const action = controller[handler[1]];
// Retrieve the API's name where the controller is located
// to access to the right validators
const currentApiName = finder(strapi.api, controller);
// Init policies array.
const policies = [];
// Add the `globalPolicy`.
@ -187,6 +201,7 @@ module.exports = strapi => {
// Add the `responsesPolicy`.
policies.push(responsesPolicy);
// Allow string instead of array of policies
if (!_.isArray(_.get(value, 'config.policies')) && !_.isEmpty(_.get(value, 'config.policies'))) {
value.config.policies = [value.config.policies];
@ -194,12 +209,14 @@ module.exports = strapi => {
if (_.isArray(_.get(value, 'config.policies')) && !_.isEmpty(_.get(value, 'config.policies'))) {
_.forEach(value.config.policies, policy => {
if (strapi.policies[policy]) {
return policies.push(strapi.policies[policy]);
// Looking for global policy or namespaced
if (_.startsWith(policy, '*', 0) && !_.isEmpty(_.get(strapi.policies, policy.substring(1).toLowerCase()))) {
return policies.push(strapi.policies[policy.substring(1).toLowerCase()]);
} else if (!_.startsWith(policy, '*', 0) && !_.isEmpty(_.get(strapi.api, currentApiName + '.policies.' + policy.toLowerCase()))) {
return policies.push(strapi.api[currentApiName].policies[policy.toLowerCase()]);
}
strapi.log.error('Ignored attempt to bind route `' + endpoint + '` with unknown policy `' + policy + '`.');
process.exit(1);
});
}
@ -207,10 +224,7 @@ module.exports = strapi => {
const validate = {};
if (_.isString(_.get(value, 'config.validate')) && !_.isEmpty(_.get(value, 'config.validate'))) {
// Retrieve the API's name where the controller is located
// to access to the right validators
const api = finder(strapi.api, controller);
const validator = _.get(strapi.api, api + '.validators.' + value.config.validate);
const validator = _.get(strapi.api, currentApiName + '.validators.' + value.config.validate);
_.merge(validate, _.mapValues(validator, value => {
return builder.build(value);

6
packages/strapi/lib/configuration/hooks/dictionary/_api/index.js
View File

@ -84,16 +84,16 @@ module.exports = strapi => {
dictionary.optional({
dirname: path.resolve(strapi.config.appPath, strapi.config.paths.api, api, strapi.config.paths.config, strapi.config.paths.policies),
filter: /(.+)\.(js)$/,
depth: 1
depth: 2
}, cb);
},
// Load API validators from `./api/*/config/validators/*.js`.
'validators/*': cb => {
dictionary.optional({
dictionary.aggregate({
dirname: path.resolve(strapi.config.appPath, strapi.config.paths.api, api, strapi.config.paths.config, strapi.config.paths.validators),
filter: /(.+)\.(json|js)$/,
depth: 1
depth: 2
}, cb);
},

1
packages/strapi/lib/configuration/hooks/dictionary/_externalHooks/index.js
View File

@ -42,7 +42,6 @@ module.exports = strapi => {
// Callback.
(err, hooks) => {
// Just in case there is an error.
if (err) {
return cb(err);