diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-10-19 11:18:28 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-10-19 11:18:28 +0200 |
| commit | fa9e9510e5d993d183feb942fe74be5fdd07f5cf (patch) | |
| tree | 41fec09f527a9346e043b8099b458a97d81b03ed /Zotlabs/Identity/OAuth2Server.php | |
| parent | 32de123db0ac526795a237ff46885fe8a332cbc0 (diff) | |
| parent | 06b3ad1071c755757555baf941e2c0f446f97b21 (diff) | |
| download | volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.tar.gz volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.tar.bz2 volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.zip | |
Merge branch '3.8RC'3.8
Diffstat (limited to 'Zotlabs/Identity/OAuth2Server.php')
| -rw-r--r-- | Zotlabs/Identity/OAuth2Server.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Identity/OAuth2Server.php b/Zotlabs/Identity/OAuth2Server.php index cbb4748fe..b747b95db 100644 --- a/Zotlabs/Identity/OAuth2Server.php +++ b/Zotlabs/Identity/OAuth2Server.php @@ -4,7 +4,7 @@ namespace Zotlabs\Identity; class OAuth2Server extends \OAuth2\Server { - public function __construct(OAuth2Storage $storage, $config = []) { + public function __construct(OAuth2Storage $storage, $config = null) { if(! is_array($config)) { $config = [ @@ -19,7 +19,8 @@ class OAuth2Server extends \OAuth2\Server { $this->addGrantType(new \OAuth2\GrantType\ClientCredentials($storage)); // Add the "Authorization Code" grant type (this is where the oauth magic happens) - $this->addGrantType(new \OAuth2\GrantType\AuthorizationCode($storage)); + // Need to use OpenID\GrantType to return id_token (see:https://github.com/bshaffer/oauth2-server-php/issues/443) + $this->addGrantType(new \OAuth2\OpenID\GrantType\AuthorizationCode($storage)); $keyStorage = new \OAuth2\Storage\Memory( [ 'keys' => [ |