yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-18 21:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3372 from grom194/fix/destroy_delete_request

Browse Source 
Remove graphql special condition for delete request
This commit is contained in:
Alexandre BODIN 2019-06-04 17:00:45 +02:00 committed by GitHub
commit d012aa4e9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,17 +43,24 @@ module.exports = {
const resolver = _.get(handler, `Mutation.${queryName}.resolver`); const resolver = _.get(handler, `Mutation.${queryName}.resolver`);
if (_.isString(resolver) || _.isPlainObject(resolver)) { if (_.isString(resolver) || _.isPlainObject(resolver)) {
const { handler = resolver } = _.isPlainObject(resolver) ? resolver : {}; const { handler = resolver } = _.isPlainObject(resolver)
? resolver
: {};
// Retrieve the controller's action to be executed. // Retrieve the controller's action to be executed.
const [name, action] = handler.split('.'); const [name, action] = handler.split('.');
const controller = plugin const controller = plugin
? _.get(strapi.plugins, `${plugin}.controllers.${_.toLower(name)}.${action}`) ? _.get(
strapi.plugins,
`${plugin}.controllers.${_.toLower(name)}.${action}`
)
: _.get(strapi.controllers, `${_.toLower(name)}.${action}`); : _.get(strapi.controllers, `${_.toLower(name)}.${action}`);
if (!controller) { if (!controller) {
return new Error(`Cannot find the controller's action ${name}.${action}`); return new Error(
`Cannot find the controller's action ${name}.${action}`
);
} }
// We're going to return a controller instead. // We're going to return a controller instead.
@ -81,13 +88,17 @@ module.exports = {
// We're going to return a controller instead. // We're going to return a controller instead.
isController = true; isController = true;
const controllers = plugin ? strapi.plugins[plugin].controllers : strapi.controllers; const controllers = plugin
? strapi.plugins[plugin].controllers
: strapi.controllers;
// Try to find the controller that should be related to this model. // Try to find the controller that should be related to this model.
const controller = _.get(controllers, `${name}.${action}`); const controller = _.get(controllers, `${name}.${action}`);
if (!controller) { if (!controller) {
return new Error(`Cannot find the controller's action ${name}.${action}`); return new Error(
`Cannot find the controller's action ${name}.${action}`
);
} }
// Push global policy to make sure the permissions will work as expected. // Push global policy to make sure the permissions will work as expected.
@ -96,7 +107,7 @@ module.exports = {
policyUtils.globalPolicy( policyUtils.globalPolicy(
undefined, undefined,
{ {
handler: `${name}.${action === 'delete' ? 'destroy' : action}`, handler: `${name}.${action}`,
}, },
undefined, undefined,
plugin plugin
@ -121,11 +132,16 @@ module.exports = {
const [name, action] = resolverOf.split('.'); const [name, action] = resolverOf.split('.');
const controller = plugin const controller = plugin
? _.get(strapi.plugins, `${plugin}.controllers.${_.toLower(name)}.${action}`) ? _.get(
strapi.plugins,
`${plugin}.controllers.${_.toLower(name)}.${action}`
)
: _.get(strapi.controllers, `${_.toLower(name)}.${action}`); : _.get(strapi.controllers, `${_.toLower(name)}.${action}`);
if (!controller) { if (!controller) {
return new Error(`Cannot find the controller's action ${name}.${action}`); return new Error(
`Cannot find the controller's action ${name}.${action}`
);
} }
policiesFn[0] = policyUtils.globalPolicy( policiesFn[0] = policyUtils.globalPolicy(
@ -144,7 +160,13 @@ module.exports = {
// Populate policies. // Populate policies.
policies.forEach(policy => policies.forEach(policy =>
policyUtils.get(policy, plugin, policiesFn, `GraphQL query "${queryName}"`, name) policyUtils.get(
policy,
plugin,
policiesFn,
`GraphQL query "${queryName}"`,
name
)
); );
return async (obj, options, { context }) => { return async (obj, options, { context }) => {
@ -159,7 +181,10 @@ module.exports = {
const policy = await strapi.koaMiddlewares.compose(policiesFn)(ctx); const policy = await strapi.koaMiddlewares.compose(policiesFn)(ctx);
// Policy doesn't always return errors but they update the current context. // Policy doesn't always return errors but they update the current context.
if (_.isError(ctx.request.graphql) || _.get(ctx.request.graphql, 'isBoom')) { if (
_.isError(ctx.request.graphql) ||
_.get(ctx.request.graphql, 'isBoom')
) {
return ctx.request.graphql; return ctx.request.graphql;
} }
@ -172,7 +197,8 @@ module.exports = {
if (_.isFunction(resolver)) { if (_.isFunction(resolver)) {
context.params = Query.convertToParams( context.params = Query.convertToParams(
options.input.where || {}, options.input.where || {},
(plugin ? strapi.plugins[plugin].models[name] : strapi.models[name]).primaryKey (plugin ? strapi.plugins[plugin].models[name] : strapi.models[name])
.primaryKey
); );
context.request.body = options.input.data || {}; context.request.body = options.input.data || {};