release: fixes

* Improve offloading mechanism 
* Fix offloaded attachments from other sources getting replaced when post is saved even if there is no associated attachment
* Improve error handling

Author: selul

assets/src/dashboard/parts/connect/index.js

@@ -139,7 +139,7 @@ const ConnectLayout = () => {
 				}
 				if ( 'success' !== response.code )  {
 					setErrors({
-						'error_register': optimoleDashboardApp.strings.error_register
+						'error_register': response.message
 					});
 				}
 			}

composer.json

@@ -55,7 +55,7 @@
   "require": {
     "php": ">=7.4",
     "codeinwp/themeisle-sdk": "^3.3",
-    "codeinwp/optimole-sdk": "^1.0",
+    "codeinwp/optimole-sdk": "^1.1",
     "enshrined/svg-sanitize": "^0.18.0"
   }
 }

composer.lock

@@ -15,12 +15,6 @@ final class Optml_Api {
 	 * @var string Api root.
 	 */
 	private $api_root = 'https://dashboard.optimole.com/api/';
-	/**
-	 * Optimole upload api root url.
-	 *
-	 * @var string Api root.
-	 */
-	private $upload_api_root = 'https://generateurls-prod.i.optimole.com/upload';
 	/**
 	 * Optimole onboard api root url.
 	 *
@@ -48,9 +42,6 @@ public function __construct() {
 		if ( defined( 'OPTIML_API_ROOT' ) ) {
 			$this->api_root = constant( 'OPTIML_API_ROOT' );
 		}
-		if ( defined( 'OPTIML_UPLOAD_API_ROOT' ) ) {
-			$this->upload_api_root = constant( 'OPTIML_UPLOAD_API_ROOT' );
-		}
 		if ( defined( 'OPTIML_ONBOARD_API_ROOT' ) ) {
 			$this->onboard_api_root = constant( 'OPTIML_ONBOARD_API_ROOT' );
 		}
@@ -258,19 +249,6 @@ private function build_args( $method, $url, $headers, $params ) {
 		return $args;
 	}
 
-	/**
-	 * Upload image to our servers using the generated signed url.
-	 *
-	 * @param string $upload_url The signed to url to upload the image to.
-	 * @param string $content_type Image mime type, it must match the actual mime type of the image.
-	 * @param string $image Image data from file_get_contents.
-	 * @return mixed
-	 */
-	public function upload_image( $upload_url, $content_type, $image ) {
-		$args = $this->build_args( 'PUT', '', ['content-type' => $content_type], $image );
-		return wp_remote_request( $upload_url, $args );
-	}
-
 	/**
 	 * Check if the optimized url is available.
 	 *
@@ -287,47 +265,6 @@ public function check_optimized_url( $url ) {
 		return true;
 	}
 
-	/**
-	 * Get options for the signed urls api call.
-	 *
-	 * @param string $original_url Image original url.
-	 * @param string $delete Whether to delete a bucket object or not(ie. generate signed upload url).
-	 * @param string $table_id Remote id used on our servers.
-	 * @param string $update_table False or success.
-	 * @param string $get_url Whether to return a get url or not.
-	 * @param string $width Original image width.
-	 * @param string $height Original image height.
-	 * @param int    $file_size Original file size.
-	 * @return array|WP_Error
-	 */
-	public function call_upload_api( $original_url = '', $delete = 'false', $table_id = '', $update_table = 'false', $get_url = 'false', $width = 'auto', $height = 'auto', $file_size = 0 ) {
-		$body = [
-			'secret' => Optml_Config::$secret,
-			'userKey' => Optml_Config::$key,
-			'originalUrl' => $original_url,
-			'deleteUrl' => $delete,
-			'id' => $table_id,
-			'updateDynamo' => $update_table,
-			'getUrl' => $get_url,
-			'width' => $width,
-			'height' => $height,
-			'originalFileSize' => $file_size,
-		];
-		$body = wp_json_encode( $body );
-
-		$options = [
-			'body'        => $body,
-			'headers'     => [
-				'Content-Type' => 'application/json',
-			],
-			'timeout'     => 60,
-			'blocking'    => true,
-			'sslverify'   => false,
-			'data_format' => 'body',
-		];
-		return wp_remote_post( $this->upload_api_root, $options );
-	}
-
 	/**
 	 * Send a list of images to upload.
 	 *

inc/api.php

@@ -127,6 +127,23 @@ public static function init( $service_settings = [] ) {
 			self::$service_url = constant( 'OPTML_CUSTOM_DOMAIN' );
 		}
 
-		Optimole::init( self::$key, [ 'domain' => parse_url( self::$service_url, PHP_URL_HOST ) ] );
+		$options = [ 'domain' => parse_url( self::$service_url, PHP_URL_HOST ) ];
+
+		if ( defined( 'OPTIML_API_ROOT' ) ) {
+			$options['dashboard_api_url'] = OPTIML_API_ROOT;
+		}
+
+		if ( defined( 'OPTIML_UPLOAD_API_ROOT' ) ) {
+			$options['upload_api_url'] = OPTIML_UPLOAD_API_ROOT;
+		}
+
+		if ( isset( $service_settings['cdn_key'], $service_settings['cdn_secret'] ) ) {
+			$options['upload_api_credentials'] = [
+				'userKey' => $service_settings['cdn_key'],
+				'secret' => $service_settings['cdn_secret'],
+			];
+		}
+
+		Optimole::init( self::$key, $options );
 	}
 }