Get client ID by real client id instead of post id

Author: almirbi

inc/class-client.php

@@ -246,6 +246,33 @@ public static function get_by_id( $id ) {
 		return new static( $post );
 	}
 
+	/**
+	 * Get a client by Client ID.
+	 *
+	 * @param int $id Client ID of the app.
+	 * @return static|null Client instance on success, null if invalid/not found.
+	 */
+	public static function get_by_client_id( $id ) {
+		$args = array(
+			'meta_query' => array(
+				array(
+					'key' => '_oauth2_client_id',
+					'value' => $id,
+					'compare' => '=',
+				)
+			),
+			'post_type' => 'oauth2_client',
+			'post_status' => 'any'
+		);
+
+		$client_ids = get_posts( $args );
+		if ( count( $client_ids ) !== 1 ) {
+			return null;
+		}
+
+		return new static( $client_ids[0] );
+	}
+
 	/**
 	 * Create a new client.
 	 *

inc/types/class-base.php

@@ -2,6 +2,7 @@
 
 namespace WP\OAuth2\Types;
 
+use WP_Http;
 use WP_Error;
 use WP\OAuth2\Client;
 
@@ -24,7 +25,7 @@ public function handle_authorisation() {
 		$scope        = isset( $_GET['scope'] ) ? wp_unslash( $_GET['scope'] ) : null;
 		$state        = isset( $_GET['state'] ) ? wp_unslash( $_GET['state'] ) : null;
 
-		$client = Client::get_by_id( $client_id );
+		$client = Client::get_by_client_id( $client_id );
 		if ( empty( $client ) ) {
 			return new WP_Error(
 				'oauth2.types.authorization_code.handle_authorisation.invalid_client_id',

plugin.php

@@ -72,7 +72,7 @@ function get_grant_types() {
  * @return array Grant types with additional types registered.
  */
 function register_grant_types( $types ) {
-	$types['authorization_code'] = new Types\Authorization_Code();
+	$types['authorization_code'] = new Types\AuthorizationCode();
 	$types['implicit'] = new Types\Implicit();
 
 	return $types;