Correctly query for token by ID

Author: rmccue

inc/tokens/class-access-token.php

@@ -4,6 +4,7 @@
 
 use WP_Error;
 use WP\OAuth2\Client;
+use WP_Query;
 use WP_User;
 
 class Access_Token extends Token {
@@ -21,14 +22,15 @@ protected static function get_meta_prefix() {
 	 * @return static|null Token if ID is found, null otherwise.
 	 */
 	public static function get_by_id( $id ) {
+		$key = static::META_PREFIX . $id;
 		$args = array(
 			'post_type'      => Client::POST_TYPE,
 			'post_status'    => 'publish',
 			'posts_per_page' => 1,
 			'no_found_rows'  => true,
 			'meta_query'     => array(
 				array(
-					'key'     => static::META_PREFIX . $id,
+					'key'     => $key,
 					'compare' => 'EXISTS',
 				),
 			),
@@ -38,7 +40,12 @@ public static function get_by_id( $id ) {
 			return null;
 		}
 
-		return new static( $query->posts[0] );
+		$value = get_post_meta( $query->posts[0]->ID, wp_slash( $key ), false );
+		if ( empty( $value ) ) {
+			return null;
+		}
+
+		return new static( $key, $value[0] );
 	}
 
 	public static function create( Client $client, WP_User $user ) {