Merge branch '10.x'

# Conflicts:
#	CHANGELOG.md

Author: driesvints

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/passport/compare/v10.1.3...master)
+## [Unreleased](https://github.com/laravel/passport/compare/v10.1.4...master)
+
+
+## [v10.1.4 (2021-10-19)](https://github.com/laravel/passport/compare/v10.1.3...v10.1.4)
+
+### Fixed
+- Ensure client model factory always creates models with a primary key ([#1492](https://github.com/laravel/passport/pull/1492)
 
 
 ## [v10.1.3 (2021-04-06)](https://github.com/laravel/passport/compare/v10.1.2...v10.1.3)

README.md

@@ -13,7 +13,7 @@ Laravel Passport is an OAuth2 server and API authentication package that is simp
 
 ## Official Documentation
 
-Documentation for Passport can be found on the [Laravel website](https://laravel.com/docs/master/passport).
+Documentation for Passport can be found on the [Laravel website](https://laravel.com/docs/passport).
 
 ## Contributing
 

art/logo.svg

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Str;
 use Laravel\Passport\Client;
+use Laravel\Passport\Passport;
 
 class ClientFactory extends Factory
 {
@@ -22,15 +23,32 @@ class ClientFactory extends Factory
      */
     public function definition()
     {
-        return [
+        return $this->ensurePrimaryKeyIsSet([
             'user_id' => null,
             'name' => $this->faker->company,
             'secret' => Str::random(40),
             'redirect' => $this->faker->url,
             'personal_access_client' => false,
             'password_client' => false,
             'revoked' => false,
-        ];
+        ]);
+    }
+
+    /**
+     * Ensure the primary key is set on the model when using UUIDs.
+     *
+     * @param  array  $data
+     * @return array
+     */
+    protected function ensurePrimaryKeyIsSet(array $data)
+    {
+        if (Passport::clientUuids()) {
+            $keyName = (new $this->model)->getKeyName();
+
+            $data[$keyName] = (string) Str::orderedUuid();
+        }
+
+        return $data;
     }
 
     /**

database/factories/ClientFactory.php

@@ -72,7 +72,7 @@ public function handle($request, Closure $next, ...$scopes)
     /**
      * Validate the scopes and token on the incoming request.
      *
-     * @param  \Psr\Http\Message\ServerRequestInterface $psr
+     * @param  \Psr\Http\Message\ServerRequestInterface  $psr
      * @param  array  $scopes
      * @return void
      *

src/Http/Middleware/CheckCredentials.php

@@ -345,8 +345,8 @@ public static function actingAs($user, $scopes = [], $guard = 'api')
     /**
      * Set the current client for the application with the given scopes.
      *
-     * @param \Laravel\Passport\Client $client
-     * @param array $scopes
+     * @param  \Laravel\Passport\Client  $client
+     * @param  array  $scopes
      * @return \Laravel\Passport\Client
      */
     public static function actingAsClient($client, $scopes = [])

src/Passport.php

@@ -216,11 +216,11 @@ public function testGettingAccessTokenWithPasswordGrantWithInvalidPassword()
         $this->assertArrayNotHasKey('expires_in', $decodedResponse);
         $this->assertArrayNotHasKey('access_token', $decodedResponse);
         $this->assertArrayNotHasKey('refresh_token', $decodedResponse);
+        $this->assertArrayNotHasKey('hint', $decodedResponse);
 
         $this->assertArrayHasKey('error', $decodedResponse);
         $this->assertSame('invalid_grant', $decodedResponse['error']);
         $this->assertArrayHasKey('error_description', $decodedResponse);
-        $this->assertArrayHasKey('hint', $decodedResponse);
         $this->assertArrayHasKey('message', $decodedResponse);
 
         $this->assertSame(0, Token::count());

tests/Feature/AccessTokenControllerTest.php

@@ -34,7 +34,7 @@ public function test_can_use_crypto_keys_from_config()
 
         $this->assertSame(
             $privateKeyString,
-            file_get_contents($cryptKey->getKeyPath())
+            $cryptKey->getKeyContents()
         );
     }