Report all errors to API users

Author: rmccue

inc/authentication/namespace.php

@@ -65,11 +65,9 @@ function get_token_from_request() {
 		return $token;
 	}
 
-	// Please note that the following includes PHP 5.3+ code. Ryan said it would be fine, soon. ;)
-	add_filter( 'rest_authentication_errors', function ( $error ) use ( $token ) {
-		return null === $error ? create_invalid_token_error( $token ) : null;
-	} );
-
+	// Got a token, but it's not valid.
+	global $oauth2_error;
+	$oauth2_error = create_invalid_token_error( $token );
 	return null;
 }
 
@@ -83,6 +81,8 @@ function get_token_from_request() {
 function attempt_authentication( $user = null ) {
 	// Lock against infinite loops when querying the token itself.
 	static $is_querying_token = false;
+	global $oauth2_error;
+	$oauth2_error = null;
 
 	if ( ! empty( $user ) || $is_querying_token ) {
 		return $user;
@@ -101,13 +101,31 @@ function attempt_authentication( $user = null ) {
 	$is_querying_token = false;
 
 	if ( empty( $token ) ) {
-		return create_invalid_token_error( $token );
+		$oauth2_error = create_invalid_token_error( $token_value );
+		return $user;
 	}
 
 	// Token found, authenticate as the user.
 	return $token->get_user_id();
 }
 
+/**
+ * Report our errors, if we have any.
+ *
+ * Attached to the rest_authentication_errors filter. Passes through existing
+ * errors registered on the filter.
+ *
+ * @return WP_Error|null Error if one is set, otherwise null.
+ */
+function maybe_report_errors( $error = null ) {
+	if ( ! empty( $error ) ) {
+		return $error;
+	}
+
+	global $oauth2_error;
+	return $oauth2_error;
+}
+
 function create_invalid_token_error( $token ) {
 	return new \WP_Error(
 		'oauth2.authentication.attempt_authentication.invalid_token',

plugin.php

@@ -18,6 +18,7 @@ function bootstrap() {
 
 	/** @todo Implement this :) */
 	add_filter( 'determine_current_user', __NAMESPACE__ . '\\Authentication\\attempt_authentication', 11 );
+	add_filter( 'rest_authentication_errors', __NAMESPACE__ . '\\Authentication\\maybe_report_errors' );
 	add_filter( 'oauth2.grant_types', __NAMESPACE__ . '\\register_grant_types', 0 );
 	add_action( 'init', __NAMESPACE__ . '\\rest_oauth2_load_authorize_page' );
 	add_action( 'admin_menu', array( __NAMESPACE__ . '\\admin\\Admin', 'register' ) );