[11.x] Get model PK instead of forcibly id column (#1626)

* Get model PK instead of forcibly id column * Get model PK instead of forcibly id column in tests * Get model PK instead of forcibly id column in command * Get model PK instead of forcibly id column in repository * Get model PK instead of forcibly id column in Passport * stub extending from model * Fix namespace order * Get model PK instead of forcibly id column in blade
laravel · Jan 31, 2023 · 1d8204e · 1d8204e
1 parent b7bc60c
commit 1d8204e
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 19 deletions.
diff --git a/resources/views/authorize.blade.php b/resources/views/authorize.blade.php
@@ -68,7 +68,7 @@
                                 @csrf
 
                                 <input type="hidden" name="state" value="{{ $request->state }}">
-                                <input type="hidden" name="client_id" value="{{ $client->id }}">
+                                <input type="hidden" name="client_id" value="{{ $client->getKey() }}">
                                 <input type="hidden" name="auth_token" value="{{ $authToken }}">
                                 <button type="submit" class="btn btn-success btn-approve">Authorize</button>
                             </form>
@@ -79,7 +79,7 @@
                                 @method('DELETE')
 
                                 <input type="hidden" name="state" value="{{ $request->state }}">
-                                <input type="hidden" name="client_id" value="{{ $client->id }}">
+                                <input type="hidden" name="client_id" value="{{ $client->getKey() }}">
                                 <input type="hidden" name="auth_token" value="{{ $authToken }}">
                                 <button class="btn btn-danger">Cancel</button>
                             </form>

diff --git a/src/ClientRepository.php b/src/ClientRepository.php
@@ -167,7 +167,7 @@ public function createPersonalAccessClient($userId, $name, $redirect)
     {
         return tap($this->create($userId, $name, $redirect, null, true), function ($client) {
             $accessClient = Passport::personalAccessClient();
-            $accessClient->client_id = $client->id;
+            $accessClient->client_id = $client->getKey();
             $accessClient->save();
         });
     }

diff --git a/src/Console/ClientCommand.php b/src/Console/ClientCommand.php
@@ -167,7 +167,7 @@ protected function outputClientDetails(Client $client)
             $this->line('');
         }
 
-        $this->line('<comment>Client ID:</comment> '.$client->id);
+        $this->line('<comment>Client ID:</comment> '.$client->getKey());
         $this->line('<comment>Client secret:</comment> '.$client->plainSecret);
     }
 }
diff --git a/src/Passport.php b/src/Passport.php
@@ -370,7 +370,7 @@ public static function actingAsClient($client, $scopes = [], $guard = 'api')
     {
         $token = app(self::tokenModel());
 
-        $token->client_id = $client->id;
+        $token->client_id = $client->getKey();
         $token->setRelation('client', $client);
 
         $token->scopes = $scopes;

diff --git a/src/PersonalAccessTokenFactory.php b/src/PersonalAccessTokenFactory.php
@@ -98,7 +98,7 @@ protected function createRequest($client, $userId, array $scopes)
 
         return (new ServerRequest('POST', 'not-important'))->withParsedBody([
             'grant_type' => 'personal_access',
-            'client_id' => $client->id,
+            'client_id' => $client->getKey(),
             'client_secret' => $secret,
             'user_id' => $userId,
             'scope' => implode(' ', $scopes),

diff --git a/tests/Feature/AccessTokenControllerTest.php b/tests/Feature/AccessTokenControllerTest.php
@@ -50,13 +50,13 @@ public function testGettingAccessTokenWithClientCredentialsGrant()
         $user->save();
 
         /** @var Client $client */
-        $client = ClientFactory::new()->asClientCredentials()->create(['user_id' => $user->id]);
+        $client = ClientFactory::new()->asClientCredentials()->create(['user_id' => $user->getKey()]);
 
         $response = $this->post(
             '/oauth/token',
             [
                 'grant_type' => 'client_credentials',
-                'client_id' => $client->id,
+                'client_id' => $client->getKey(),
                 'client_secret' => $client->secret,
             ]
         );
@@ -93,13 +93,13 @@ public function testGettingAccessTokenWithClientCredentialsGrantInvalidClientSec
         $user->save();
 
         /** @var Client $client */
-        $client = ClientFactory::new()->asClientCredentials()->create(['user_id' => $user->id]);
+        $client = ClientFactory::new()->asClientCredentials()->create(['user_id' => $user->getKey()]);
 
         $response = $this->post(
             '/oauth/token',
             [
                 'grant_type' => 'client_credentials',
-                'client_id' => $client->id,
+                'client_id' => $client->getKey(),
                 'client_secret' => $client->secret.'foo',
             ]
         );
@@ -137,13 +137,13 @@ public function testGettingAccessTokenWithPasswordGrant()
         $user->save();
 
         /** @var Client $client */
-        $client = ClientFactory::new()->asPasswordClient()->create(['user_id' => $user->id]);
+        $client = ClientFactory::new()->asPasswordClient()->create(['user_id' => $user->getKey()]);
 
         $response = $this->post(
             '/oauth/token',
             [
                 'grant_type' => 'password',
-                'client_id' => $client->id,
+                'client_id' => $client->getKey(),
                 'client_secret' => $client->secret,
                 'username' => $user->email,
                 'password' => $password,
@@ -184,13 +184,13 @@ public function testGettingAccessTokenWithPasswordGrantWithInvalidPassword()
         $user->save();
 
         /** @var Client $client */
-        $client = ClientFactory::new()->asPasswordClient()->create(['user_id' => $user->id]);
+        $client = ClientFactory::new()->asPasswordClient()->create(['user_id' => $user->getKey()]);
 
         $response = $this->post(
             '/oauth/token',
             [
                 'grant_type' => 'password',
-                'client_id' => $client->id,
+                'client_id' => $client->getKey(),
                 'client_secret' => $client->secret,
                 'username' => $user->email,
                 'password' => $password.'foo',
@@ -227,13 +227,13 @@ public function testGettingAccessTokenWithPasswordGrantWithInvalidClientSecret()
         $user->save();
 
         /** @var Client $client */
-        $client = ClientFactory::new()->asPasswordClient()->create(['user_id' => $user->id]);
+        $client = ClientFactory::new()->asPasswordClient()->create(['user_id' => $user->getKey()]);
 
         $response = $this->post(
             '/oauth/token',
             [
                 'grant_type' => 'password',
-                'client_id' => $client->id,
+                'client_id' => $client->getKey(),
                 'client_secret' => $client->secret.'foo',
                 'username' => $user->email,
                 'password' => $password,
@@ -274,13 +274,13 @@ public function testGettingCustomResponseType()
         $user->save();
 
         /** @var Client $client */
-        $client = ClientFactory::new()->asClientCredentials()->create(['user_id' => $user->id]);
+        $client = ClientFactory::new()->asClientCredentials()->create(['user_id' => $user->getKey()]);
 
         $response = $this->post(
             '/oauth/token',
             [
                 'grant_type' => 'client_credentials',
-                'client_id' => $client->id,
+                'client_id' => $client->getKey(),
                 'client_secret' => $client->secret,
             ]
         );

diff --git a/tests/Unit/PersonalAccessTokenFactoryTest.php b/tests/Unit/PersonalAccessTokenFactoryTest.php
@@ -2,6 +2,7 @@
 
 namespace Laravel\Passport\Tests\Unit;
 
+use Laravel\Passport\Client;
 use Laravel\Passport\ClientRepository;
 use Laravel\Passport\PersonalAccessTokenFactory;
 use Laravel\Passport\PersonalAccessTokenResult;
@@ -56,7 +57,7 @@ public function test_access_token_can_be_created()
     }
 }
 
-class PersonalAccessTokenFactoryTestClientStub
+class PersonalAccessTokenFactoryTestClientStub extends Client
 {
     public $id = 1;