Merge pull request WP-API#7 from WP-API/determine-user

Actually yse determine_current_user

Author: rmccue

lib/class-wp-json-authentication-oauth1.php

@@ -21,6 +21,12 @@ class WP_JSON_Authentication_OAuth1 extends WP_JSON_Authentication {
 	 */
 	protected $type = 'oauth1';
 
+	/**
+	 * Errors that occurred during authentication
+	 * @var WP_Error|null|boolean True if succeeded, WP_Error if errored, null if not OAuth
+	 */
+	protected $auth_status = null;
+
 	/**
 	 * Parse the Authorization header into parameters
 	 *
@@ -134,35 +140,50 @@ public function authenticate( $user ) {
 
 		$params = $this->get_parameters();
 		if ( ! is_array( $params ) ) {
-			return $params;
+			$this->auth_status = $params;
+			return null;
 		}
 
 		// Fetch user by token key
 		$token = $this->get_access_token( $params['oauth_token'] );
 		if ( is_wp_error( $token ) ) {
-			return $token;
+			$this->auth_status = $token;
+			return null;
 		}
 
 		$result = $this->check_token( $token, $params['oauth_consumer_key'] );
 		if ( is_wp_error( $result ) ) {
-			return $result;
+			$this->auth_status = $result;
+			return null;
 		}
 		list( $consumer, $user ) = $result;
 
 		// Perform OAuth validation
 		$error = $this->check_oauth_signature( $user, $params, $token );
 		if ( is_wp_error( $error ) ) {
-			return $error;
+			$this->auth_status = $error;
+			return null;
 		}
 
 		$error = $this->check_oauth_timestamp_and_nonce( $user, $params['oauth_timestamp'], $params['oauth_nonce'] );
 		if ( is_wp_error( $error ) ) {
-			return $error;
+			$this->auth_status = $error;
+			return null;
 		}
 
+		$this->auth_status = true;
 		return $user;
 	}
 
+	/**
+	 * Report authentication errors to the JSON API
+	 *
+	 * @return WP_Error|boolean|null {@see WP_JSON_Server::check_authentication}
+	 */
+	public function get_authentication_errors() {
+		return $this->auth_status;
+	}
+
 	/**
 	 * Serve an OAuth request
 	 *

oauth-server.php

@@ -40,6 +40,21 @@ function json_oauth_server_setup_authentication() {
 }
 add_action( 'init', 'json_oauth_server_setup_authentication' );
 
+/**
+ * Register the authorization page
+ *
+ * Alas, login_init is too late to register pages, as the action is already
+ * sanitized before this.
+ */
+function json_oauth_load() {
+	global $wp_json_authentication_oauth1;
+
+	$wp_json_authentication_oauth1 = new WP_JSON_Authentication_OAuth1();
+	add_filter( 'determine_current_user', array( $wp_json_authentication_oauth1, 'authenticate' ) );
+	add_filter( 'json_authentication_errors', array( $wp_json_authentication_oauth1, 'get_authentication_errors' ) );
+}
+add_action( 'plugins_loaded', 'json_oauth_load' );
+
 /**
  * Load the JSON API
  */