Rename main class

Author: rmccue

admin.php

@@ -131,7 +131,7 @@ function json_oauth_admin_handle_edit_submit( $consumer ) {
 	}
 
 	if ( empty( $consumer ) ) {
-		$authenticator = new WP_JSON_Authentication_OAuth1();
+		$authenticator = new WP_REST_OAuth1();
 
 		// Create the consumer
 		$data = array(
@@ -281,7 +281,7 @@ function json_oauth_profile_section( $user ) {
 		return $row['user'] === $user->ID;
 	} );
 
-	$authenticator = new WP_JSON_Authentication_OAuth1();
+	$authenticator = new WP_REST_OAuth1();
 
 	?>
 		<table class="form-table">
@@ -340,7 +340,7 @@ function json_oauth_profile_save( $user_id ) {
 
 	$key = wp_unslash( $_POST['oauth_revoke'] );
 
-	$authenticator = new WP_JSON_Authentication_OAuth1();
+	$authenticator = new WP_REST_OAuth1();
 
 	$result = $authenticator->revoke_access_token( $key );
 	if ( is_wp_error( $result ) ) {

lib/class-wp-rest-oauth1-cli.php

@@ -12,7 +12,7 @@ class WP_REST_OAuth1_CLI extends WP_CLI_Command {
 	 * : Consumer description
 	 */
 	public function add( $_, $args ) {
-		$authenticator = new WP_JSON_Authentication_OAuth1();
+		$authenticator = new WP_REST_OAuth1();
 		$consumer = $authenticator->add_consumer( $args );
 		WP_CLI::line( sprintf( 'ID: %d',     $consumer->ID ) );
 		WP_CLI::line( sprintf( 'Key: %s',    $consumer->key ) );

lib/class-wp-rest-oauth1-ui.php

@@ -68,7 +68,7 @@ public function render_page() {
 			$scope = wp_unslash( $_REQUEST['wp_scope'] );
 		}
 
-		$authenticator = new WP_JSON_Authentication_OAuth1();
+		$authenticator = new WP_REST_OAuth1();
 		$errors = array();
 		$this->token = $authenticator->get_request_token( $token_key );
 		if ( is_wp_error( $this->token ) ) {

lib/class-wp-json-authentication-oauth1.php renamed to lib/class-wp-rest-oauth1.php

@@ -6,7 +6,7 @@
  * @subpackage JSON API
  */
 
-class WP_JSON_Authentication_OAuth1 {
+class WP_REST_OAuth1 {
 	const CONSUMER_KEY_LENGTH = 12;
 	const CONSUMER_SECRET_LENGTH = 48;
 	const TOKEN_KEY_LENGTH = 24;

oauth-server.php

@@ -5,7 +5,7 @@
  * Version 0.1
  */
 
-include_once( dirname( __FILE__ ) . '/lib/class-wp-json-authentication-oauth1.php' );
+include_once( dirname( __FILE__ ) . '/lib/class-wp-rest-oauth1.php' );
 include_once( dirname( __FILE__ ) . '/lib/class-wp-rest-oauth1-ui.php' );
 
 include_once( dirname( __FILE__ ) . '/admin.php' );
@@ -58,7 +58,7 @@ function rest_oauth1_setup_authentication() {
 function rest_oauth1_load() {
 	global $wp_json_authentication_oauth1;
 
-	$wp_json_authentication_oauth1 = new WP_JSON_Authentication_OAuth1();
+	$wp_json_authentication_oauth1 = new WP_REST_OAuth1();
 	add_filter( 'determine_current_user', array( $wp_json_authentication_oauth1, 'authenticate' ) );
 	add_filter( 'rest_authentication_errors', array( $wp_json_authentication_oauth1, 'get_authentication_errors' ) );
 }
@@ -92,7 +92,7 @@ function rest_oauth1_loaded() {
 	if ( empty( $GLOBALS['wp']->query_vars['rest_oauth1'] ) )
 		return;
 
-	$authenticator = new WP_JSON_Authentication_OAuth1();
+	$authenticator = new WP_REST_OAuth1();
 	$response = $authenticator->dispatch( $GLOBALS['wp']->query_vars['rest_oauth1'] );
 
 	if ( is_wp_error( $response ) ) {