Fix offloading logic

Author: selul

README.md

@@ -35,6 +35,7 @@ The second argument of the `init` method is optional. It allows you to pass opti
  * `base_domain`: The base domain to connect to Optimole's API. Default is `i.optimole.com`.
  * `cache_buster`: A string value that will be appended to the URL of the optimized assets to bust Optimole's cache.
  * `dashboard_api_url`: The URL of the dashboard API. Default is `https://dashboard.optimole.com/api`.
+ * `dashboard_api_key`: The API key to use for the dashboard API.
  * `upload_api_credentials`: An array with the credentials to use for the upload API. The array should contain the keys `userKey` and `secret`. The default is empty and the SDK will use the API key provided in the `init` method to fetch them from the dashboard API.
  * `upload_api_url`: The URL of the upload API. Default is `https://generateurls-prod.i.optimole.com/upload`.
 

src/Offload/Manager.php

@@ -31,11 +31,6 @@ class Manager
      */
     private ClientInterface $httpClient;
 
-    /**
-     * The Optimole API key.
-     */
-    private string $key;
-
     /**
      * The manager options.
      */
@@ -44,7 +39,7 @@ class Manager
     /**
      * Constructor.
      */
-    public function __construct(ClientInterface $httpClient, string $key, array $options = [])
+    public function __construct(ClientInterface $httpClient, array $options = [])
     {
         if (empty($options['dashboard_api_url'])) {
             throw new InvalidArgumentException('Missing "dashboard_api_url" option');
@@ -53,7 +48,6 @@ public function __construct(ClientInterface $httpClient, string $key, array $opt
         }
 
         $this->httpClient = $httpClient;
-        $this->key = $key;
         $this->options = array_merge([
             'upload_api_credentials' => [],
         ], $options);
@@ -114,7 +108,7 @@ public function getUsage(): OffloadUsage
     /**
      * Update the metadata of the image with the given ID.
      */
-    public function updateImageMetadata(string $imageId, int $fileSize = 0, $height = 'auto', $width = 'auto'): void
+    public function updateImageMetadata(string $imageId, int $fileSize = 0, $height = 'auto', $width = 'auto', $originalUrl = ''): void
     {
         if ('auto' !== $height && !is_int($height)) {
             throw new InvalidArgumentException('Image height must be "auto" or an integer.');
@@ -127,6 +121,7 @@ public function updateImageMetadata(string $imageId, int $fileSize = 0, $height
             'originalFileSize' => $fileSize,
             'height' => is_int($height) ? max(0, $height) : $height,
             'width' => is_int($width) ? max(0, $width) : $width,
+            'originalUrl' => $originalUrl,
             'updateDynamo' => 'success',
         ]);
     }
@@ -179,7 +174,7 @@ public function uploadImage(string $filename, string $imageUrl): string
         }
 
         try {
-            $this->httpClient->sendRequest('put', $uploadUrl, $image, [
+            $this->httpClient->sendRequest('PUT', $uploadUrl, $image, [
                 'Content-Type' => $fileMimeType,
             ]);
         } catch (BadResponseException $exception) {
@@ -188,7 +183,7 @@ public function uploadImage(string $filename, string $imageUrl): string
 
         $imagesize = getimagesize($filename);
 
-        $this->updateImageMetadata($imageId, filesize($filename) ?: 0, $imagesize && !empty($imagesize[1]) ? $imagesize[1] : 'auto', $imagesize && !empty($imagesize[0]) ? $imagesize[0] : 'auto');
+        $this->updateImageMetadata($imageId, filesize($filename) ?: 0, $imagesize && !empty($imagesize[1]) ? $imagesize[1] : 'auto', $imagesize && !empty($imagesize[0]) ? $imagesize[0] : 'auto', $imageUrl);
 
         return $imageId;
     }
@@ -237,8 +232,8 @@ private function getUploadApiCredentialsFromDashboardApi(): array
      */
     private function requestToDashboardApi(): array
     {
-        return $this->httpClient->sendRequest('post', sprintf('%s/optml/v2/account/details', $this->options['dashboard_api_url']), null, [
-            'Authorization' => sprintf('Bearer %s', $this->key),
+        return $this->httpClient->sendRequest('POST', sprintf('%s/optml/v2/account/details', $this->options['dashboard_api_url']), null, [
+            'Authorization' => sprintf('Bearer %s', $this->options['dashboard_api_key']),
             'Content-Type' => 'application/json',
         ]);
     }
@@ -252,7 +247,7 @@ private function requestToUploadApi(array $body): array
             $this->options['upload_api_credentials'] = $this->getUploadApiCredentialsFromDashboardApi();
         }
 
-        return $this->httpClient->sendRequest('post', $this->options['upload_api_url'], array_merge($this->options['upload_api_credentials'], $body), [
+        return $this->httpClient->sendRequest('POST', $this->options['upload_api_url'], array_merge($this->options['upload_api_credentials'], $body), [
             'Content-Type' => 'application/json',
         ]);
     }

src/Optimole.php

@@ -33,7 +33,7 @@ final class Optimole
     /**
      * The Optimole SDK version.
      */
-    public const VERSION = '1.2.0';
+    public const VERSION = '1.2.1';
 
     /**
      * The Optimole dashboard API URL.
@@ -94,6 +94,7 @@ public static function init(string $key, array $options = []): void
         $options = array_merge([
             'base_domain' => 'i.optimole.com',
             'cache_buster' => '',
+            'dashboard_api_key' => '',
             'dashboard_api_url' => self::DASHBOARD_API_URL,
             'upload_api_url' => self::UPLOAD_API_URL,
         ], $options);
@@ -130,7 +131,7 @@ private function createImage(string $imageUrl, string $cacheBuster = ''): Image
      */
     private function createOffload(array $options = []): Manager
     {
-        return new Manager($this->getHttpClient(), $this->key, array_merge($this->options, $options));
+        return new Manager($this->getHttpClient(), array_merge($this->options, $options));
     }
 
     /**