✨ The getUrl method now returns a secure url

Author: ruslansteiger

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to `laravel-cloudinary` will be documented in this file.
 
+## 0.3.0 - 2021-06-02
+
+- ⚠️ BREAKING CHANGE: Renamed environment variable
+  `CLOUDINARY_URL_SECURE` to `CLOUDINARY_SECURE_URL`
+- The `getUrl` method now returns a secure url
+
 ## 0.2.0 - 2021-06-01
 
 - Added additional configuration with folder and preset

README.md

@@ -34,7 +34,7 @@ configuration:
             'api_key' => env('CLOUDINARY_API_KEY'),
             'api_secret' => env('CLOUDINARY_API_SECRET'),
             'url' => [
-                'secure' => env('CLOUDINARY_URL_SECURE', true),
+                'secure' => (bool) env('CLOUDINARY_SECURE_URL', true),
             ],
         ],
 

config/flysystem-cloudinary.php

@@ -28,4 +28,17 @@
 
     'folder' => env('CLOUDINARY_FOLDER'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Cloudinary Secure URL
+    |--------------------------------------------------------------------------
+    |
+    | This value determines that the asset delivery is forced to use HTTPS
+    | URLs. If disabled all your assets will be delivered as HTTP URLs.
+    | Please do not use unsecure URLs in your production application.
+    |
+    */
+
+    'secure_url' => (bool) env('CLOUDINARY_SECURE_URL', true),
+
 ];

src/FlysystemCloudinaryAdapter.php

@@ -455,7 +455,14 @@ public function getUrl(string $path): string | false
 
         event(new FlysystemCloudinaryResponseLog($response));
 
-        ['url' => $url] = $response->getArrayCopy();
+        [
+            'url' => $url,
+            'secure_url' => $secure_url,
+        ] = $response->getArrayCopy();
+
+        if (config('flysystem-cloudinary.secure_url')) {
+            return $secure_url;
+        }
 
         return $url;
     }

tests/Feature/FlysystemCloudinaryAdapterTest.php

@@ -252,7 +252,7 @@ public function it_can_read_stream()
 
         $meta = $this->adapter->readStream($publicId);
 
-        $this->assertIsString($meta['stream']);
+        $this->assertIsResource($meta['stream']);
         $this->assertArrayNotHasKey('contents', $meta);
         $this->adapter->delete($publicId); // cleanup
     }
@@ -400,6 +400,7 @@ public function it_does_get_url()
 
         $url = $this->adapter->getUrl($publicId);
 
+        $this->assertStringStartsWith('https://', $url);
         $this->assertStringContainsString($publicId, $url);
         $this->adapter->delete($publicId); // cleanup
     }