Skip to content

Fix: Initialize originalInput in OperationParams #1142

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix: Initialize originalInput in OperationParams #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
21d6b76
set original input
tallesborges Aug 9, 2024
d33b51c
add test
tallesborges Aug 9, 2024
c4f3bca
fix style
tallesborges Aug 9, 2024
e0fe6f1
Fix possible null value in originalInput initialization
tallesborges Aug 9, 2024
4fb0d55
Refactor OperationParams to simplify access to properties
tallesborges Aug 10, 2024
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
11 changes: 4 additions & 7 deletions src/Support/OperationParams.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ class OperationParams extends BaseOperationParams
/** @var DocumentNode|null */
protected $parsedQuery;

/** @var BaseOperationParams */
protected $baseOperationParams;

public function __construct(BaseOperationParams $baseOperationParams)
{
$this->init($baseOperationParams);
Expand All @@ -28,21 +25,21 @@ protected function init(BaseOperationParams $baseOperationParams): void
$this->operation = $baseOperationParams->operation;
$this->variables = $baseOperationParams->variables;
$this->extensions = $baseOperationParams->extensions;

$this->baseOperationParams = $baseOperationParams;
$this->originalInput = $baseOperationParams->originalInput ?? [];
$this->readOnly = $baseOperationParams->readOnly ?? false;
}

/**
* @return mixed|null
*/
public function getOriginalInput(string $key)
{
return $this->baseOperationParams->originalInput[$key] ?? null;
return $this->originalInput[$key] ?? null;
}

public function isReadOnly(): bool
{
return $this->baseOperationParams->readOnly;
return $this->readOnly;
}

public function getParsedQuery(): DocumentNode
Expand Down
27 changes: 27 additions & 0 deletions tests/Unit/ExecutionMiddlewareTest/ExecutionMiddlewareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

use Illuminate\Auth\GenericUser;
use Rebing\GraphQL\Support\ExecutionMiddleware\AddAuthUserContextValueMiddleware;
use Rebing\GraphQL\Support\ExecutionMiddleware\ValidateOperationParamsMiddleware;
use Rebing\GraphQL\Tests\TestCase;

class ExecutionMiddlewareTest extends TestCase
Expand Down Expand Up @@ -171,4 +172,30 @@ public function testAddAuthUserContextValueMiddleware(): void
];
self::assertSame($expected, $result);
}

public function testValidateOperationParamsMiddlewareWithInvalidParams(): void
{
$this->app['config']->set('graphql.execution_middleware', [
ValidateOperationParamsMiddleware::class,
]);

$result = $this->httpGraphql($this->queries['examples'], [
'expectErrors' => true,
'variables' => [
[],
],
]);

$expected = [
'errors' => [
[
'message' => 'GraphQL Request parameter "variables" must be object or JSON string parsed to object, but got [[]]',
'extensions' => [
],
],
],
];

self::assertEquals($expected, $result);
}
}