Skip to content

Fix for #387 #388

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 4 commits into from
Sep 21, 2018
Merged

Fix for #387 #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4d72c5
Testcase for #387
akomm Sep 20, 2018
4cc3ba7
Testcase for #387 expected line numbers fix
akomm Sep 20, 2018
b9badca
Fix for #387
akomm Sep 20, 2018
21a51d2
CS fix
akomm Sep 20, 2018
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
6 changes: 5 additions & 1 deletion src/Resolver/AccessResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
use GraphQL\Executor\Promise\Adapter\SyncPromise;
use GraphQL\Executor\Promise\Promise;
use GraphQL\Executor\Promise\PromiseAdapter;
use GraphQL\Type\Definition\ListOfType;
use GraphQL\Type\Definition\ResolveInfo;
use Overblog\GraphQLBundle\Error\UserError;
use Overblog\GraphQLBundle\Error\UserWarning;
use Overblog\GraphQLBundle\Relay\Connection\Output\Connection;
Expand Down Expand Up @@ -59,7 +61,9 @@ function ($result) use ($accessChecker, $resolveArgs) {

private function processFilter($result, $accessChecker, $resolveArgs)
{
if (\is_array($result)) {
/** @var ResolveInfo $resolveInfo */
$resolveInfo = $resolveArgs[3];
if (\is_array($result) && $resolveInfo->returnType instanceof ListOfType) {
$result = \array_map(
function ($object) use ($accessChecker, $resolveArgs) {
return $this->hasAccess($accessChecker, $object, $resolveArgs) ? $object : null;
Expand Down
15 changes: 15 additions & 0 deletions tests/Functional/App/config/access/mapping/access.types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ RootQuery:
user:
type: User
resolve: '@=resolver("query")'
youShallNotSeeThisUnauthenticated:
type: SecureField
access: '@=isFullyAuthenticated()'
resolve: '@=[]'

Mutation:
type: object
Expand Down Expand Up @@ -48,6 +52,17 @@ User:
interfaces: [Human]
isTypeOf: true

SecureField:
type: object
config:
fields:
secretValue:
type: String!
resolve: 'top secret'
youAreAuthenticated:
type: Boolean!
resolve: '@=isFullyAuthenticated()'

friendConnection:
type: relay-connection
config:
Expand Down
35 changes: 35 additions & 0 deletions tests/Functional/Security/AccessTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,41 @@ public function testNotAuthenticatedUserAccessToUserName(): void
$this->assertResponse($this->userNameQuery, $expected, static::ANONYMOUS_USER, 'access');
}

public function testNonAuthenticatedUserAccessSecuredFieldWhichInitiallyResolvesToArray(): void
{
$expected = [
'data' => [
'youShallNotSeeThisUnauthenticated' => null,
],
'extensions' => [
'warnings' => [
[
'message' => 'Access denied to this field.',
'locations' => [
[
'line' => 2,
'column' => 3,
],
],
'path' => ['youShallNotSeeThisUnauthenticated'],
'category' => 'user',
],
],
],
];

$query = <<<'EOF'
{
youShallNotSeeThisUnauthenticated {
secretValue
youAreAuthenticated
}
}
EOF;

$this->assertResponse($query, $expected, static::ANONYMOUS_USER, 'access');
}

public function testFullyAuthenticatedUserAccessToUserName(): void
{
$expected = [
Expand Down