Allow custom model name in @canfind (#2515)

CHANGELOG.md

@@ -9,6 +9,12 @@ You can find and compare releases at the [GitHub release page](https://github.co
 
 ## Unreleased
 
+## v6.33.3
+
+### Fixed
+
+- Allow custom model name in `@canFind` https://github.com/nuwave/lighthouse/pull/2515
+
 ## v6.33.2
 
 ### Fixed

docs/6/api-reference/directives.md

@@ -650,11 +650,11 @@ Deprecated. Use the [@can\* family of directives](#can-family-of-directives) ins
 
 ## @can\* family of directives
 
-All @can\* directives have common arguments. These arguments specify how gates are checked and what to do if the user is not authorized.
+All `@can*` directives have common arguments. These arguments specify how gates are checked and what to do if the user is not authorized.
 Each directive has its own set of arguments that specify what to check against.
 
 ```graphql
-  """
+"""
 The ability to check permissions for.
 """
 ability: String!
@@ -728,6 +728,12 @@ directive @canFind(
   """
   find: String!
 
+  """
+  Specify the class name of the model to use.
+  This is only needed when the default model detection does not work.
+  """
+  model: String
+
   """
   Should the query fail when the models of `find` were not found?
   """
@@ -740,7 +746,7 @@ directive @canFind(
 ) repeatable on FIELD_DEFINITION
 ```
 
-### canModel
+### canRoot
 
 ```graphql
 """

docs/master/api-reference/directives.md

@@ -650,11 +650,11 @@ Deprecated. Use the [@can\* family of directives](#can-family-of-directives) ins
 
 ## @can\* family of directives
 
-All @can\* directives have common arguments. These arguments specify how gates are checked and what to do if the user is not authorized.
+All `@can*` directives have common arguments. These arguments specify how gates are checked and what to do if the user is not authorized.
 Each directive has its own set of arguments that specify what to check against.
 
 ```graphql
-  """
+"""
 The ability to check permissions for.
 """
 ability: String!
@@ -728,6 +728,12 @@ directive @canFind(
   """
   find: String!
 
+  """
+  Specify the class name of the model to use.
+  This is only needed when the default model detection does not work.
+  """
+  model: String
+
   """
   Should the query fail when the models of `find` were not found?
   """
@@ -740,7 +746,7 @@ directive @canFind(
 ) repeatable on FIELD_DEFINITION
 ```
 
-### canModel
+### canRoot
 
 ```graphql
 """

src/Auth/CanFindDirective.php

@@ -39,6 +39,12 @@ public static function definition(): string
   """
   find: String!
 
+  """
+  Specify the class name of the model to use.
+  This is only needed when the default model detection does not work.
+  """
+  model: String
+
   """
   Should the query fail when the models of `find` were not found?
   """

tests/Integration/Auth/CanFindDirectiveDBTest.php

@@ -50,6 +50,44 @@ public function testQueriesForSpecificModel(): void
         ]);
     }
 
+    public function testCustomModelName(): void
+    {
+        $admin = new User();
+        $admin->name = UserPolicy::ADMIN;
+        $this->be($admin);
+
+        $user = factory(User::class)->create();
+        assert($user instanceof User);
+
+        $this->schema = /** @lang GraphQL */ '
+        type Query {
+            account(id: ID! @whereKey): Account
+                @canFind(ability: "view", find: "id", model: "User")
+                @first(model: "User")
+        }
+
+        type Account {
+            name: String!
+        }
+        ';
+
+        $this->graphQL(/** @lang GraphQL */ '
+        query ($id: ID!) {
+            account(id: $id) {
+                name
+            }
+        }
+        ', [
+            'id' => $user->getKey(),
+        ])->assertJson([
+            'data' => [
+                'account' => [
+                    'name' => $user->name,
+                ],
+            ],
+        ]);
+    }
+
     public function testFailsToFindSpecificModel(): void
     {
         $user = new User();