Skip to content

Mutation access denied throws error instead of a warning #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2016
Merged

Mutation access denied throws error instead of a warning #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions Resolver/AccessResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace Overblog\GraphQLBundle\Resolver;

use Overblog\GraphQLBundle\Error\UserError;
use Overblog\GraphQLBundle\Error\UserWarning;
use Overblog\GraphQLBundle\Relay\Connection\Output\Connection;
use Overblog\GraphQLBundle\Relay\Connection\Output\Edge;
Expand All @@ -21,7 +22,11 @@ public function resolve(callable $accessChecker, callable $resolveCallback, arra
{
// operation is mutation and is mutation field
if ($isMutation) {
$result = $this->checkAccess($accessChecker, null, $resolveArgs, true) ? call_user_func_array($resolveCallback, $resolveArgs) : null;
if (!$this->hasAccess($accessChecker, null, $resolveArgs)) {
throw new UserError('Access denied to this field.');
}

$result = call_user_func_array($resolveCallback, $resolveArgs);
} else {
$result = $this->filterResultUsingAccess($accessChecker, $resolveCallback, $resolveArgs);
}
Expand All @@ -37,30 +42,32 @@ private function filterResultUsingAccess(callable $accessChecker, callable $reso
case is_array($result):
$result = array_map(
function ($object) use ($accessChecker, $resolveArgs) {
return $this->checkAccess($accessChecker, $object, $resolveArgs) ? $object : null;
return $this->hasAccess($accessChecker, $object, $resolveArgs) ? $object : null;
},
$result
);
break;
case $result instanceof Connection:
$result->edges = array_map(
function (Edge $edge) use ($accessChecker, $resolveArgs) {
$edge->node = $this->checkAccess($accessChecker, $edge->node, $resolveArgs) ? $edge->node : null;
$edge->node = $this->hasAccess($accessChecker, $edge->node, $resolveArgs) ? $edge->node : null;

return $edge;
},
$result->edges
);
break;
default:
$this->checkAccess($accessChecker, $result, $resolveArgs, true);
if (!$this->hasAccess($accessChecker, $result, $resolveArgs)) {
throw new UserWarning('Access denied to this field.');
}
break;
}

return $result;
}

private function checkAccess(callable $accessChecker, $object, array $resolveArgs = [], $throwException = false)
private function hasAccess(callable $accessChecker, $object, array $resolveArgs = [])
{
$resolveArgs[] = $object;

Expand All @@ -69,9 +76,6 @@ private function checkAccess(callable $accessChecker, $object, array $resolveArg
} catch (\Exception $e) {
$access = false;
}
if ($throwException && !$access) {
throw new UserWarning('Access denied to this field.');
}

return $access;
}
Expand Down
16 changes: 7 additions & 9 deletions Tests/Functional/Security/AccessTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,15 +228,13 @@ public function testMutationNotAllowedUser()
'data' => [
'simpleMutationWithThunkFields' => null,
],
'extensions' => [
'warnings' => [
[
'message' => 'Access denied to this field.',
'locations' => [
[
'line' => 2,
'column' => 3,
],
'errors' => [
[
'message' => 'Access denied to this field.',
'locations' => [
[
'line' => 2,
'column' => 3,
],
],
],
Expand Down