Prevent crashes with explicit nulls on arg directives

nuwave · Sep 18, 2023 · de25722 · de25722
1 parent d2fdb8f
commit de25722
Show file tree

Hide file tree

Showing 6 changed files with 230 additions and 0 deletions.
diff --git a/src/Schema/Directives/NotInDirective.php b/src/Schema/Directives/NotInDirective.php
@@ -27,6 +27,10 @@ public static function definition(): string
 
     public function handleBuilder(QueryBuilder|EloquentBuilder|Relation $builder, $value): QueryBuilder|EloquentBuilder|Relation
     {
+        if ($value === null) {
+            return $builder;
+        }
+
         return $builder->whereNotIn(
             $this->directiveArgValue('key', $this->nodeName()),
             $value,

diff --git a/src/Schema/Directives/WhereBetweenDirective.php b/src/Schema/Directives/WhereBetweenDirective.php
@@ -30,6 +30,10 @@ public static function definition(): string
 
     public function handleBuilder(QueryBuilder|EloquentBuilder|Relation $builder, $value): QueryBuilder|EloquentBuilder|Relation
     {
+        if ($value === null) {
+            return $builder;
+        }
+
         return $builder->whereBetween(
             $this->directiveArgValue('key', $this->nodeName()),
             $value,

diff --git a/src/Schema/Directives/WhereNotBetweenDirective.php b/src/Schema/Directives/WhereNotBetweenDirective.php
@@ -30,6 +30,10 @@ public static function definition(): string
 
     public function handleBuilder(QueryBuilder|EloquentBuilder|Relation $builder, $value): QueryBuilder|EloquentBuilder|Relation
     {
+        if ($value === null) {
+            return $builder;
+        }
+
         return $builder->whereNotBetween(
             $this->directiveArgValue('key', $this->nodeName()),
             $value,

diff --git a/tests/Integration/Schema/Directives/NotInDirectiveTest.php b/tests/Integration/Schema/Directives/NotInDirectiveTest.php
@@ -0,0 +1,132 @@
+<?php declare(strict_types=1);
+
+namespace Schema\Directives;
+
+use Tests\DBTestCase;
+use Tests\Utils\Models\User;
+
+final class NotInDirectiveTest extends DBTestCase
+{
+    public function testNotInIDs(): void
+    {
+        $user1 = factory(User::class)->create();
+        assert($user1 instanceof User);
+
+        $user2 = factory(User::class)->create();
+        assert($user2 instanceof User);
+
+        $this->schema = /** @lang GraphQL */ '
+        type User {
+            id: ID!
+        }
+
+        type Query {
+            users(notIDs: [ID!] @notIn(key: "id")): [User!]! @all
+        }
+        ';
+
+        $user1ID = (string) $user1->id;
+        $user2ID = (string) $user2->id;
+
+        $this
+            ->graphQL(/** @lang GraphQL */ '
+            query ($notIDs: [ID!]) {
+                users(notIDs: $notIDs) {
+                    id
+                }
+            }
+            ', [
+                'notIDs' => [$user1ID],
+            ])
+            ->assertJson([
+                'data' => [
+                    'users' => [
+                        [
+                            'id' => $user2ID,
+                        ],
+                    ],
+                ],
+            ]);
+    }
+
+    public function testExplicitNull(): void
+    {
+        $users = factory(User::class, 2)->create();
+
+        $this->schema = /** @lang GraphQL */ '
+        type User {
+            id: ID!
+        }
+
+        type Query {
+            users(notIDs: [ID!] @notIn(key: "id")): [User!]! @all
+        }
+        ';
+
+        $this
+            ->graphQL(/** @lang GraphQL */ '
+            query ($notIDs: [ID!]) {
+                users(notIDs: $notIDs) {
+                    id
+                }
+            }
+            ', [
+                'notIDs' => null,
+            ])
+            ->assertJsonCount($users->count(), 'data.users');
+    }
+
+    public function testExplicitNullInArray(): void
+    {
+        factory(User::class, 2)->create();
+
+        $this->schema = /** @lang GraphQL */ '
+        type User {
+            id: ID!
+        }
+
+        type Query {
+            users(notIDs: [ID] @notIn(key: "id")): [User!]! @all
+        }
+        ';
+
+        $this
+            ->graphQL(/** @lang GraphQL */ '
+            query ($notIDs: [ID]) {
+                users(notIDs: $notIDs) {
+                    id
+                }
+            }
+            ', [
+                'notIDs' => [null],
+            ])
+            ->assertJsonCount(0, 'data.users');
+    }
+
+    public function testEmptyArray(): void
+    {
+        $users = factory(User::class, 2)->create();
+
+        $this->schema = /** @lang GraphQL */ '
+        type User {
+            id: ID!
+        }
+
+        type Query {
+            users(notIDs: [ID!] @notIn(key: "id")): [User!]! @all
+        }
+        ';
+
+        $this
+            ->graphQL(/** @lang GraphQL */ '
+            query ($notIDs: [ID!]) {
+                users(notIDs: $notIDs) {
+                    id
+                }
+            }
+            ', [
+                'notIDs' => [],
+            ])
+            ->assertJsonCount($users->count(), 'data.users');
+    }
+}
diff --git a/tests/Integration/Schema/Directives/WhereBetweenDirectiveTest.php b/tests/Integration/Schema/Directives/WhereBetweenDirectiveTest.php
@@ -0,0 +1,43 @@
+<?php declare(strict_types=1);
+
+namespace Schema\Directives;
+
+use Tests\DBTestCase;
+use Tests\Utils\Models\User;
+
+final class WhereBetweenDirectiveTest extends DBTestCase
+{
+    public function testExplicitNull(): void
+    {
+        $users = factory(User::class, 2)->create();
+
+        $this->schema = /** @lang GraphQL */'
+        scalar DateTime @scalar(class: "Nuwave\\\Lighthouse\\\Schema\\\Types\\\Scalars\\\DateTime")
+
+        type User {
+            id: ID!
+            created_at: DateTime!
+        }
+
+        type Query {
+            users(createdBetween: DateTimeRange @whereBetween(key: "created_at")): [User!]! @all
+        }
+
+        input DateTimeRange {
+            from: DateTime!
+            to: DateTime!
+        }
+        ';
+
+        $this
+            ->graphQL(/** @lang GraphQL */'
+            {
+                users(createdBetween: null) {
+                    id
+                }
+            }
+            ')
+            ->assertGraphQLErrorFree()
+            ->assertJsonCount($users->count(), 'data.users');
+    }
+}
diff --git a/tests/Integration/Schema/Directives/WhereNotBetweenDirectiveTest.php b/tests/Integration/Schema/Directives/WhereNotBetweenDirectiveTest.php
@@ -0,0 +1,43 @@
+<?php declare(strict_types=1);
+
+namespace Schema\Directives;
+
+use Tests\DBTestCase;
+use Tests\Utils\Models\User;
+
+final class WhereNotBetweenDirectiveTest extends DBTestCase
+{
+    public function testExplicitNull(): void
+    {
+        $users = factory(User::class, 2)->create();
+
+        $this->schema = /** @lang GraphQL */'
+        scalar DateTime @scalar(class: "Nuwave\\\Lighthouse\\\Schema\\\Types\\\Scalars\\\DateTime")
+
+        type User {
+            id: ID!
+            created_at: DateTime!
+        }
+
+        type Query {
+            users(notCreatedBetween: DateTimeRange @whereNotBetween(key: "created_at")): [User!]! @all
+        }
+
+        input DateTimeRange {
+            from: DateTime!
+            to: DateTime!
+        }
+        ';
+
+        $this
+            ->graphQL(/** @lang GraphQL */'
+            {
+                users(notCreatedBetween: null) {
+                    id
+                }
+            }
+            ')
+            ->assertGraphQLErrorFree()
+            ->assertJsonCount($users->count(), 'data.users');
+    }
+}