Merge pull request WP-API#20 from WP-API/late-authentication

Authenticate on init, rather than before

Author: rachelbaker

oauth-server.php

@@ -59,7 +59,28 @@ function json_oauth_load() {
 	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' );
+add_action( 'init', 'json_oauth_load' );
+
+/**
+ * Force reauthentication after we've registered our handler
+ *
+ * We could have checked authentication before OAuth was loaded. If so, let's
+ * try and reauthenticate now that OAuth is loaded.
+ */
+function json_oauth_force_reauthentication() {
+	if ( is_user_logged_in() ) {
+		// Another handler has already worked successfully, no need to
+		// reauthenticate.
+
+		return;
+	}
+
+	// Force reauthentication
+	global $current_user;
+	$current_user = null;
+	get_currentuserinfo();
+}
+add_action( 'init', 'json_oauth_force_reauthentication', 100 );
 
 /**
  * Load the JSON API