Merge pull request #268 from namithj/V0.6-Prep

Change the API URL and add more debugging options

Author: namithj

includes/class-admin-settings.php

@@ -415,10 +415,14 @@ public function register_settings() {
 				'description' => esc_html__( 'Your new API Host.', 'aspireupdate' ),
 				'options'     => [
 					[
-						'value'           => 'api.aspirecloud.org',
-						'label'           => 'AspireCloud (api.aspirecloud.org)',
+						'value'           => 'api.aspirecloud.net',
+						'label'           => sprintf(
+							/* translators: 1: The name of the API Service */
+							__( 'AspireCloud (%1$s)', 'aspireupdate' ),
+							'api.aspirecloud.net'
+						),
 						'require-api-key' => 'false',
-						'api-key-url'     => 'api.aspirecloud.org/v1/apitoken',
+						'api-key-url'     => 'api.aspirecloud.net/v1/apitoken',
 					],
 					[
 						'value'           => 'other',

includes/class-api-rewrite.php

@@ -32,19 +32,27 @@ class API_Rewrite {
 	 */
 	private $disable_ssl;
 
+	/**
+	 * API Key.
+	 *
+	 * @var string
+	 */
+	private $api_key;
+
 	/**
 	 * The Constructor.
 	 *
 	 * @param string  $redirected_host The host to redirect to.
 	 * @param boolean $disable_ssl Disable SSL.
 	 */
-	public function __construct( $redirected_host, $disable_ssl ) {
+	public function __construct( $redirected_host, $disable_ssl, $api_key ) {
 		if ( 'debug' === $redirected_host ) {
 			$this->redirected_host = $this->default_host;
 		} else {
 			$this->redirected_host = strtolower( $redirected_host );
 		}
 		$this->disable_ssl = $disable_ssl;
+		$this->api_key     = $api_key;
 		add_filter( 'pre_http_request', [ $this, 'pre_http_request' ], 10, 3 );
 	}
 
@@ -65,17 +73,30 @@ public function pre_http_request( $response, $parsed_args, $url ) {
 			( '' !== $this->redirected_host )
 		) {
 			if ( false !== strpos( $url, $this->default_host ) ) {
-				Debug::log_string( 'Default API Found: ' . $url );
-				Debug::log_request( $parsed_args );
+				Debug::log_string( __( 'Default API Found: ', 'aspireupdate' ) . $url );
 
 				if ( $this->default_host !== $this->redirected_host ) {
 					if ( $this->disable_ssl ) {
-						Debug::log_string( 'SSL Verification Disabled' );
+						Debug::log_string( __( 'SSL Verification Disabled', 'aspireupdate' ) );
 						$parsed_args['sslverify'] = false;
 					}
 
+					if ( '' !== $this->api_key ) {
+						Debug::log_string( __( 'API Key Authorization header added.', 'aspireupdate' ) );
+						$parsed_args['headers']['Authorization'] = 'Bearer ' . $this->api_key;
+					}
+
 					$updated_url = str_replace( $this->default_host, $this->redirected_host, $url );
-					Debug::log_string( 'API Rerouted to: ' . $updated_url );
+
+					/**
+					 * Adding cache buster parameter for AC beta test.  Will remove this after Beta.
+					 */
+					Debug::log_string( __( 'Cache Buster Added to URL', 'aspireupdate' ) );
+					$updated_url = add_query_arg( 'cache_buster', time(), $updated_url );
+
+					Debug::log_string( __( 'API Rerouted to: ', 'aspireupdate' ) . $updated_url );
+
+					Debug::log_request( $parsed_args );
 
 					/**
 					 * Temporarily Unhook Filter to prevent recursion.

includes/class-controller.php

@@ -43,10 +43,11 @@ private function api_rewrite() {
 		if ( isset( $api_host ) && ( '' !== $api_host ) ) {
 			$enable_debug = $admin_settings->get_setting( 'enable_debug', false );
 			$disable_ssl  = $admin_settings->get_setting( 'disable_ssl_verification', false );
+			$api_key      = $admin_settings->get_setting( 'api_key', '' );
 			if ( $enable_debug && $disable_ssl ) {
-				new API_Rewrite( $api_host, true );
+				new API_Rewrite( $api_host, true, $api_key );
 			} else {
-				new API_Rewrite( $api_host, false );
+				new API_Rewrite( $api_host, false, $api_key );
 			}
 		}
 	}