Remove base class

Author: rmccue

client.php

@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * Get a client by key.
+ *
+ * @param string $type Client type.
+ * @param string $key Client key.
+ * @return WP_Post|WP_Error
+ */
+function rest_get_client( $type, $key ) {
+	// $this->should_attempt = false;
+
+	$query = new WP_Query();
+	$consumers = $query->query( array(
+		'post_type' => 'json_consumer',
+		'post_status' => 'any',
+		'meta_query' => array(
+			array(
+				'meta_key' => 'key',
+				'meta_value' => $key,
+			),
+			array(
+				'meta_key' => 'type',
+				'meta_value' => $type,
+			),
+		),
+	) );
+
+	// $this->should_attempt = true;
+
+	if ( empty( $consumers ) || empty( $consumers[0] ) ) {
+		return new WP_Error( 'json_consumer_notfound', __( 'Consumer Key is invalid' ), array( 'status' => 401 ) );
+	}
+
+	return new $consumers[0];
+}
+
+/**
+ * Create a new client.
+ *
+ * @param string $type Client type.
+ * @param array $params {
+ *     @type string $name Client name
+ *     @type string $description Client description
+ *     @type array $meta Metadata for the client (map of key => value)
+ * }
+ * @return WP_Post|WP_Error
+ */
+function rest_create_client( $type, $params ) {
+	$default = array(
+		'name' => '',
+		'description' => '',
+		'meta' => array(),
+	);
+	$params = wp_parse_args( $params, $default );
+
+	$data = array();
+	$data['post_title'] = $params['name'];
+	$data['post_content'] = $params['description'];
+	$data['post_type'] = 'json_consumer';
+
+	$ID = wp_insert_post( $data );
+	if ( is_wp_error( $ID ) ) {
+		return $ID;
+	}
+
+	$meta = $params['meta'];
+	$meta['type'] = $type;
+	$meta = apply_filters( 'json_consumer_meta', $meta, $ID, $params );
+
+	foreach ( $meta as $key => $value ) {
+		update_post_meta( $ID, $key, $value );
+	}
+
+	return get_post( $ID );
+}

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

@@ -6,7 +6,7 @@
  * @subpackage JSON API
  */
 
-class WP_JSON_Authentication_OAuth1 extends WP_JSON_Authentication {
+class WP_JSON_Authentication_OAuth1 {
 	const CONSUMER_KEY_LENGTH = 12;
 	const CONSUMER_SECRET_LENGTH = 48;
 	const TOKEN_KEY_LENGTH = 24;
@@ -300,7 +300,7 @@ public function add_consumer( $params ) {
 		}
 		$params['meta'] = array_merge( $params['meta'], $meta );
 
-		return parent::add_consumer( $params );
+		return rest_create_client( $this->type, $params );
 	}
 
 	/**
@@ -311,7 +311,7 @@ public function add_consumer( $params ) {
 	 * @return array Array of consumer object, user object
 	 */
 	public function check_token( $token, $consumer_key ) {
-		$consumer = $this->get_consumer( $consumer_key );
+		$consumer = rest_get_client( $this->type, $consumer_key );
 		if ( is_wp_error( $consumer ) ) {
 			return $consumer;
 		}
@@ -352,7 +352,7 @@ public function get_request_token( $key ) {
 	 * @return array|WP_Error Array of token data on success, error otherwise
 	 */
 	public function generate_request_token( $params ) {
-		$consumer = $this->get_consumer( $params['oauth_consumer_key'] );
+		$consumer = rest_get_client( $this->type, $params['oauth_consumer_key'] );
 		if ( is_wp_error( $consumer ) ) {
 			return $consumer;
 		}
@@ -479,7 +479,7 @@ public function generate_access_token( $oauth_consumer_key, $oauth_token, $oauth
 			return new WP_Error( 'json_oauth1_invalid_verifier', __( 'OAuth verifier does not match' ), array( 'status' => 400 ) );
 		}
 
-		$consumer = $this->get_consumer( $oauth_consumer_key );
+		$consumer = rest_get_client( $this->type, $oauth_consumer_key );
 		if ( is_wp_error( $consumer ) ) {
 			return $consumer;
 		}

lib/class-wp-json-authentication.php

@@ -5,11 +5,11 @@
  * Version 0.1
  */
 
-include_once( dirname( __FILE__ ) . '/lib/class-wp-json-authentication.php' );
 include_once( dirname( __FILE__ ) . '/lib/class-wp-json-authentication-oauth1.php' );
 include_once( dirname( __FILE__ ) . '/lib/class-wp-rest-oauth1-ui.php' );
 
 include_once( dirname( __FILE__ ) . '/admin.php' );
+include_once( dirname( __FILE__ ) . '/client.php' );
 
 if ( defined( 'WP_CLI' ) && WP_CLI ) {
 	include_once( dirname( __FILE__ ) . '/lib/class-wp-rest-oauth1-cli.php' );