Merge branch '10.x'

# Conflicts:
#	CHANGELOG.md

Author: driesvints

.github/workflows/tests.yml

@@ -13,8 +13,13 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.3, 7.4, 8.0, 8.1]
-        laravel: [^8.0]
+        php: [7.3, 7.4, '8.0', 8.1]
+        laravel: [8, 9]
+        exclude:
+          - php: 7.3
+            laravel: 9
+          - php: 7.4
+            laravel: 9
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
@@ -32,7 +37,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-           composer require "illuminate/contracts=${{ matrix.laravel }}" --no-update
+           composer require "illuminate/contracts=^${{ matrix.laravel }}" --no-update
            composer update --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/passport/compare/v10.2.1...master)
+## [Unreleased](https://github.com/laravel/passport/compare/v10.3.0...master)
+
+
+## [v10.3.0 (2022-01-12)](https://github.com/laravel/passport/compare/v10.2.2...v10.3.0)
+
+### Changed
+- Laravel 9 Support ([#1516](https://github.com/laravel/passport/pull/1516))
+
+
+## [v10.2.2 (2021-12-07)](https://github.com/laravel/passport/compare/v10.2.1...v10.2.2)
+
+### Fixed
+- Fix jsonSerialize PHP 8.1 issue ([#1512](https://github.com/laravel/passport/pull/1512))
 
 
 ## [v10.2.1 (2021-12-07)](https://github.com/laravel/passport/compare/v10.2.0...v10.2.1)

composer.json

@@ -17,15 +17,15 @@
         "php": "^7.3|^8.0",
         "ext-json": "*",
         "firebase/php-jwt": "^5.0",
-        "illuminate/auth": "^8.2",
-        "illuminate/console": "^8.2",
-        "illuminate/container": "^8.2",
-        "illuminate/contracts": "^8.2",
-        "illuminate/cookie": "^8.2",
-        "illuminate/database": "^8.2",
-        "illuminate/encryption": "^8.2",
-        "illuminate/http": "^8.2",
-        "illuminate/support": "^8.2",
+        "illuminate/auth": "^8.2|^9.0",
+        "illuminate/console": "^8.2|^9.0",
+        "illuminate/container": "^8.2|^9.0",
+        "illuminate/contracts": "^8.2|^9.0",
+        "illuminate/cookie": "^8.2|^9.0",
+        "illuminate/database": "^8.2|^9.0",
+        "illuminate/encryption": "^8.2|^9.0",
+        "illuminate/http": "^8.2|^9.0",
+        "illuminate/support": "^8.2|^9.0",
         "lcobucci/jwt": "^3.4|^4.0",
         "league/oauth2-server": "^8.2",
         "nyholm/psr7": "^1.3",
@@ -34,7 +34,7 @@
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^6.0",
+        "orchestra/testbench": "^6.0|^7.0",
         "phpunit/phpunit": "^9.3"
     },
     "autoload": {

src/Bridge/Scope.php

@@ -25,6 +25,7 @@ public function __construct($name)
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->getIdentifier();

src/Passport.php

@@ -181,6 +181,13 @@ class Passport
      */
     public static $withInheritedScopes = false;
 
+    /**
+     * The authorization server response type.
+     *
+     * @var \League\OAuth2\Server\ResponseTypes\ResponseTypeInterface|null
+     */
+    public static $authorizationServerResponseType;
+
     /**
      * Enable the implicit grant type.
      *

src/PassportServiceProvider.php

@@ -258,7 +258,8 @@ public function makeAuthorizationServer()
             $this->app->make(Bridge\AccessTokenRepository::class),
             $this->app->make(Bridge\ScopeRepository::class),
             $this->makeCryptKey('private'),
-            app('encrypter')->getKey()
+            app('encrypter')->getKey(),
+            Passport::$authorizationServerResponseType
         );
     }
 

tests/Feature/AccessTokenControllerTest.php

@@ -10,6 +10,7 @@
 use Laravel\Passport\ClientRepository;
 use Laravel\Passport\Database\Factories\ClientFactory;
 use Laravel\Passport\HasApiTokens;
+use Laravel\Passport\Passport;
 use Laravel\Passport\Token;
 use Laravel\Passport\TokenRepository;
 use Lcobucci\JWT\Configuration;
@@ -270,9 +271,65 @@ public function testGettingAccessTokenWithPasswordGrantWithInvalidClientSecret()
 
         $this->assertSame(0, Token::count());
     }
+
+    public function testGettingCustomResponseType()
+    {
+        $this->withoutExceptionHandling();
+        Passport::$authorizationServerResponseType = new IdTokenResponse('foo_bar_open_id_token');
+
+        $user = new User();
+        $user->email = '[email protected]';
+        $user->password = $this->app->make(Hasher::class)->make('foobar123');
+        $user->save();
+
+        /** @var Client $client */
+        $client = ClientFactory::new()->asClientCredentials()->create(['user_id' => $user->id]);
+
+        $response = $this->post(
+            '/oauth/token',
+            [
+                'grant_type' => 'client_credentials',
+                'client_id' => $client->id,
+                'client_secret' => $client->secret,
+            ]
+        );
+
+        $response->assertOk();
+
+        $decodedResponse = $response->decodeResponseJson()->json();
+
+        $this->assertArrayHasKey('id_token', $decodedResponse);
+        $this->assertSame('foo_bar_open_id_token', $decodedResponse['id_token']);
+    }
 }
 
 class User extends \Illuminate\Foundation\Auth\User
 {
     use HasApiTokens;
 }
+
+class IdTokenResponse extends \League\OAuth2\Server\ResponseTypes\BearerTokenResponse
+{
+    /**
+     * @var string Id token.
+     */
+    protected $idToken;
+
+    /**
+     * @param  string  $idToken
+     */
+    public function __construct($idToken)
+    {
+        $this->idToken = $idToken;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getExtraParams(\League\OAuth2\Server\Entities\AccessTokenEntityInterface $accessToken)
+    {
+        return [
+            'id_token' => $this->idToken,
+        ];
+    }
+}