move is_connected to use background checks to use correct credentials

Author: DavidCramer

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-connect.php

@@ -79,6 +79,7 @@ class Connect implements Config, Setup, Notice {
 		'url'        => 'cloudinary_url',
 		'connect'    => 'cloudinary_connect',
 		'cache'      => 'cloudinary_settings_cache',
+		'status'     => 'cloudinary_status',
 	);
 
 	/**
@@ -94,6 +95,8 @@ class Connect implements Config, Setup, Notice {
 	public function __construct( Plugin $plugin ) {
 		$this->plugin = $plugin;
 		add_filter( 'pre_update_option_cloudinary_connect', array( $this, 'verify_connection' ) );
+		add_filter( 'cron_schedules', array( $this, 'get_status_schedule' ) );
+		add_action( 'cloudinary_status', array( $this, 'check_status' ) );
 	}
 
 	/**
@@ -206,11 +209,6 @@ public function is_connected() {
 			return false;
 		}
 
-		// Get the last test transient.
-		if ( get_transient( $signature ) ) {
-			return true;
-		}
-
 		$connect_data = get_option( self::META_KEYS['connect'], [] );
 		$current_url  = isset( $connect_data['cloudinary_url'] ) ? $connect_data['cloudinary_url'] : null;
 
@@ -221,21 +219,26 @@ public function is_connected() {
 		if ( md5( $current_url ) !== $signature ) {
 			return false;
 		}
-		$this->config_from_url( $current_url );
-		$api  = new Connect\Api( $this, $this->plugin->version );
-		$ping = $api->ping();
-		if ( is_wp_error( $ping ) ) {
-			$this->notices[] = array(
-				'message'     => ucwords( str_replace( '_', ' ', $ping->get_error_message() ) ),
-				'type'        => 'error',
-				'dismissible' => true,
-			);
+		
+		$status = get_option( self::META_KEYS['status'], null );
+		if ( is_wp_error( $status ) ) {
+			// Error, we stop here.
+			if ( ! isset( $this->notices['__status'] ) ) {
+				$error                     = ucwords( str_replace( '_', ' ', $status->get_error_message() ) );
+				$this->notices['__status'] = array(
+					'message'     => sprintf(
+					// translators: Placeholder refers the error from API.
+						__( 'Cloudinary Error: %s', 'cloudinary' ),
+						$error
+					),
+					'type'        => 'error',
+					'dismissible' => true,
+				);
+			}
 
 			return false;
 		}
 
-		// Set a 30 second transient to prevent continued pinging.
-		set_transient( $signature, true, 30 );
 
 		return true;
 	}
@@ -283,9 +286,7 @@ function ( $a ) {
 		}
 
 		$this->config_from_url( $url );
-
-		$test        = new Connect\Api( $this, $this->plugin->version );
-		$test_result = $test->ping();
+		$test_result = check_status();
 
 		if ( is_wp_error( $test_result ) ) {
 			$result['type']    = 'connection_error';
@@ -298,6 +299,29 @@ function ( $a ) {
 		return $result;
 	}
 
+	/**
+	 * Check the status of Cloudinary.
+	 *
+	 * @return array|\WP_Error
+	 */
+	public function check_status() {
+		$status = $this->test_ping();
+		update_option( self::META_KEYS['status'], $status );
+
+		return $status;
+	}
+
+	/**
+	 * Do a ping test on the API.
+	 *
+	 * @return array|\WP_Error
+	 */
+	public function test_ping() {
+		$test = new Connect\Api( $this, $this->plugin->version );
+
+		return $test->ping();
+	}
+
 	/**
 	 * Extracts the CNAME from a parsed connection URL.
 	 *
@@ -423,6 +447,23 @@ public function setup() {
 			$this->config_from_url( $config['cloudinary_url'] );
 			$this->api = new Connect\Api( $this, $this->plugin->version );
 			$this->usage_stats();
+			$this->setup_status_cron();
+		}
+	}
+
+	public function get_status_schedule( $schedules ) {
+		$schedules['every_minute'] = array(
+			'interval' => MINUTE_IN_SECONDS,
+			'display'  => __( 'Every Minute', 'cloudinary' ),
+		);
+
+		return $schedules;
+	}
+
+	protected function setup_status_cron() {
+		if ( false === wp_get_schedule( 'cloudinary_status' ) ) {
+			$now = current_time( 'timestamp' );
+			wp_schedule_event( $now + ( MINUTE_IN_SECONDS ), 'every_minute', 'cloudinary_status' );
 		}
 	}
 

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/connect/class-api.php

@@ -143,6 +143,10 @@ class Api {
 	public function __construct( $connect, $version ) {
 		$this->credentials = $connect->get_credentials();
 		$this->plugin_version = $version;
+		// Use CNAME.
+		if ( ! empty( $this->credentials['cname'] ) ) {
+			$this->asset_url = $this->credentials['cname'];
+		}
 	}
 
 	/**
@@ -163,10 +167,6 @@ public function url( $resource, $function = null, $endpoint = false ) {
 		} else {
 			$parts[] = $this->asset_url;
 		}
-		
-		if ( $cname = get_option( Connect::META_KEYS['cname'] ) ) {
-			$parts[0] = $cname;
-		}
 
 		if ( empty( $this->credentials['cname'] ) || $endpoint ) {
 			$parts[] = $this->credentials['cloud_name'];

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/connect-content.php

@@ -6,7 +6,7 @@
  */
 
 ?>
-<?php if ( ! empty( $this->plugin->config['connect'] ) ) : ?>
+<?php if ( $this->plugin->get_component( 'connect' )->is_connected() ) : ?>
 	<div class="settings-tab-section-card">
 		<div class="settings-tab-section-fields-dashboard-success">
 			<span class="dashicons dashicons-yes"></span> <strong><?php esc_html_e( 'Connected to Cloudinary', 'cloudinary' ); ?></strong>