Merge pull request #34 from WP-API/sync-application-status

Sync application status - always search published clients only

Author: rmccue

inc/class-client.php

@@ -314,33 +314,6 @@ public static function get_by_post_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

@@ -39,7 +39,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_client_id( $client_id );
+		$client = Client::get_by_id( $client_id );
 		if ( empty( $client ) ) {
 			return new WP_Error(
 				'oauth2.types.authorization_code.handle_authorisation.invalid_client_id',