Merge pull request #32 from Automattic/remove_overriding_authorize_controller

Remove overriding authorize controller

Author: ashfame

src/Http/Handlers/AuthorizeHandler.php

@@ -6,8 +6,8 @@
 
 use OAuth2\Request;
 use OAuth2\Response;
+use OAuth2\Server as OAuth2Server;
 use OpenIDConnectServer\Http\RequestHandler;
-use OpenIDConnectServer\Overrides\Server as OAuth2Server;
 use OpenIDConnectServer\Storage\ConsentStorage;
 
 const OIDC_DEFAULT_MINIMAL_CAPABILITY = 'edit_posts';

src/Http/Handlers/TokenHandler.php

@@ -4,8 +4,8 @@
 
 use OAuth2\Request;
 use OAuth2\Response;
+use OAuth2\Server as OAuth2Server;
 use OpenIDConnectServer\Http\RequestHandler;
-use OpenIDConnectServer\Overrides\Server as OAuth2Server;
 
 class TokenHandler extends RequestHandler {
 	private OAuth2Server $server;

src/Http/Handlers/UserInfoHandler.php

@@ -4,8 +4,8 @@
 
 use OAuth2\Request;
 use OAuth2\Response;
+use OAuth2\Server as OAuth2Server;
 use OpenIDConnectServer\Http\RequestHandler;
-use OpenIDConnectServer\Overrides\Server as OAuth2Server;
 
 class UserInfoHandler extends RequestHandler {
 	private OAuth2Server $server;

src/OpenIDConnectServer.php

@@ -9,13 +9,13 @@
 use OpenIDConnectServer\Http\Handlers\UserInfoHandler;
 use OpenIDConnectServer\Http\Handlers\WebKeySetsHandler;
 use OpenIDConnectServer\Http\Router;
-use OpenIDConnectServer\Overrides\Server;
 use OpenIDConnectServer\Storage\AuthorizationCodeStorage;
 use OpenIDConnectServer\Storage\ClientCredentialsStorage;
 use OpenIDConnectServer\Storage\ConsentStorage;
 use OpenIDConnectServer\Storage\PublicKeyStorage;
 use OpenIDConnectServer\Storage\UserClaimsStorage;
 use OpenIDConnectServer\Templating\Templating;
+use OAuth2\Server;
 
 class OpenIDConnectServer {
 	private string $public_key;

src/Overrides/OpenID/Controller/AuthorizeController.php

@@ -77,6 +77,7 @@ public function getAuthorizationCode( $code ) {
 					'expires'      => 'expires',
 					'redirect_uri' => 'redirect_uri',
 					'scope'        => 'scope',
+					'id_token'     => 'id_token',
 				) as $key => $meta_key
 			) {
 				$authorization_code[ $key ] = get_term_meta( $term->term_id, $meta_key, true );

src/Overrides/Server.php

@@ -18,7 +18,7 @@ public function getUserClaims( $user_id, $scope ) {
 		}
 
 		$scopes = explode( ' ', $scope );
-		if ( ! isset( $scopes['profile'] ) ) {
+		if ( ! in_array( 'profile', $scopes, true ) ) {
 			return $claims;
 		}