yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-12 08:08:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue where all policies triggered by GraphQL Mutations and Queries had ctx.state.user as undefined

Browse Source
This commit is contained in:
Don Masakayan 2019-09-01 02:39:34 +08:00
parent fd02d99b28
commit ef82e486e6
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/strapi-plugin-graphql/services/Mutation.js
View File

@ -29,9 +29,6 @@ module.exports = {
queryName = action; queryName = action;
} }
// Retrieve policies.
const policies = _.get(handler, `Mutation.${queryName}.policies`, []);
// Retrieve resolverOf. // Retrieve resolverOf.
const resolverOf = _.get(handler, `Mutation.${queryName}.resolverOf`, ''); const resolverOf = _.get(handler, `Mutation.${queryName}.resolverOf`, '');
@ -158,10 +155,21 @@ module.exports = {
); );
} }
// Retrieve policies.
let policies = [];
if (strapi.plugins['users-permissions']) { if (strapi.plugins['users-permissions']) {
policies.push('plugins.users-permissions.permissions'); policies.push('plugins.users-permissions.permissions');
} }
// Retrieve policies.
if (_.get(handler, `Mutation.${queryName}.policies`)) {
policies = _.concat(
policies,
_.get(handler, `Mutation.${queryName}.policies`)
);
}
// Populate policies. // Populate policies.
policies.forEach(policy => policies.forEach(policy =>
policyUtils.get( policyUtils.get(

13
packages/strapi-plugin-graphql/services/Query.js
View File

@ -91,9 +91,6 @@ module.exports = {
: pluralize.plural(name); : pluralize.plural(name);
} }
// Retrieve policies.
const policies = _.get(handler, `Query.${queryName}.policies`, []);
// Retrieve resolverOf. // Retrieve resolverOf.
const resolverOf = _.get(handler, `Query.${queryName}.resolverOf`, ''); const resolverOf = _.get(handler, `Query.${queryName}.resolverOf`, '');
@ -235,10 +232,20 @@ module.exports = {
); );
} }
// Retrieve policies.
let policies = [];
if (strapi.plugins['users-permissions']) { if (strapi.plugins['users-permissions']) {
policies.push('plugins.users-permissions.permissions'); policies.push('plugins.users-permissions.permissions');
} }
if (_.get(handler, `Query.${queryName}.policies`)) {
policies = _.concat(
policies,
_.get(handler, `Query.${queryName}.policies`)
);
}
// Populate policies. // Populate policies.
policies.forEach(policy => policies.forEach(policy =>
policyUtils.get( policyUtils.get(