Only support REST for now

Author: valendesigns

tests/wp-includes/rest-api/auth/class-test-wp-rest-token.php

@@ -134,11 +134,15 @@ public function test_authenticate() {
 			)
 		);
 
-		add_filter( 'rest_authentication_is_api_request', '__return_true' );
-
 		// Another authentication method was used.
 		$this->assertEquals( 'alt_auth', $this->token->authenticate( 'alt_auth' ) );
 
+		// Not is REST request.
+		$this->assertNull( $this->token->authenticate( null ) );
+
+		// Fake the request.
+		add_filter( 'rest_authentication_is_rest_request', '__return_true' );
+
 		// Authentication is not required.
 		$mock = $this->getMockBuilder( get_class( $this->token ) )
 			->setMethods(
@@ -191,10 +195,7 @@ public function test_authenticate() {
 		$authenticate = $mock->authenticate( null );
 		$this->assertTrue( $authenticate );
 		$this->assertEquals( $user_id, get_current_user_id() );
-		remove_filter( 'rest_authentication_is_api_request', '__return_true' );
-
-		$authenticate = $mock->authenticate( null );
-		$this->assertNull( $authenticate );
+		remove_filter( 'rest_authentication_is_rest_request', '__return_true' );
 	}
 
 	/**

wp-includes/rest-api/auth/class-wp-rest-token.php

@@ -211,16 +211,20 @@ public function get_item_schema() {
 	 */
 	public function authenticate( $result ) {
 
-		// Check for valid API requests.
-		$api_request = ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST ) || ( defined( 'REST_REQUEST' ) && REST_REQUEST );
-
-		// This is not the authentication you're looking for.
-		if ( ! apply_filters( 'rest_authentication_is_api_request', $api_request ) ) {
+		// Another authentication method was used.
+		if ( ! is_null( $result ) ) {
 			return $result;
 		}
 
-		// Another authentication method was used.
-		if ( ! is_null( $result ) ) {
+		/**
+		 * Check for REST request.
+		 *
+		 * @param bool $rest_request Whether or not this is a REST request.
+		 */
+		$rest_request = apply_filters( 'rest_authentication_is_rest_request', ( defined( 'REST_REQUEST' ) && REST_REQUEST ) );
+
+		// This is not the authentication you're looking for.
+		if ( ! $rest_request ) {
 			return $result;
 		}