From 0a924d30df5f35cfc37d851e89597d26c05555cf Mon Sep 17 00:00:00 2001
From: pini-girit <pini@girit.biz>
Date: Mon, 11 Jan 2021 16:44:12 +0200
Subject: [PATCH 1/3] v1.14.5: Updated CSP whitelist

---
 composer.json             |  2 +-
 etc/csp_whitelist.xml     | 18 ++++++++++++------
 etc/module.xml            |  2 +-
 marketplace.composer.json |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 7637dce..2a716b1 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "cloudinary/cloudinary-magento2",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.14.4",
+    "version": "1.14.5",
     "license": "MIT",
     "require": {
         "cloudinary/cloudinary_php": "*"
diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
index d282ecb..3eeed4f 100644
--- a/etc/csp_whitelist.xml
+++ b/etc/csp_whitelist.xml
@@ -3,35 +3,41 @@
     <policies>
         <policy id="script-src">
             <values>
-                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">cloudinary.com</value>
+                <value id="cloudinary_wildcard" type="host">*.cloudinary.com</value>
                 <value id="cloudinary_cloudflare_cdnjs" type="host">cdnjs.cloudflare.com</value>
             </values>
         </policy>
         <policy id="frame-src">
             <values>
-                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">cloudinary.com</value>
+                <value id="cloudinary_wildcard" type="host">*.cloudinary.com</value>
                 <value id="cloudinary_cloudflare_cdnjs" type="host">cdnjs.cloudflare.com</value>
             </values>
         </policy>
         <policy id="connect-src">
             <values>
-                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">cloudinary.com</value>
+                <value id="cloudinary_wildcard" type="host">*.cloudinary.com</value>
             </values>
         </policy>
         <policy id="form-action">
             <values>
-                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">cloudinary.com</value>
+                <value id="cloudinary_wildcard" type="host">*.cloudinary.com</value>
             </values>
         </policy>
         <policy id="img-src">
             <values>
-                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">cloudinary.com</value>
+                <value id="cloudinary_wildcard" type="host">*.cloudinary.com</value>
                 <value id="data" type="host">data:</value>
             </values>
         </policy>
         <policy id="style-src">
             <values>
-                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">cloudinary.com</value>
+                <value id="cloudinary_wildcard" type="host">*.cloudinary.com</value>
             </values>
         </policy>
     </policies>
diff --git a/etc/module.xml b/etc/module.xml
index 5056d8c..d3cfaba 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Cloudinary_Cloudinary" setup_version="1.14.4">
+  <module name="Cloudinary_Cloudinary" setup_version="1.14.5">
       <sequence>
           <module name="Magento_ProductVideo"/>
           <module name="Magento_PageBuilder"/>
diff --git a/marketplace.composer.json b/marketplace.composer.json
index 14fe476..1b29796 100644
--- a/marketplace.composer.json
+++ b/marketplace.composer.json
@@ -2,7 +2,7 @@
     "name": "cloudinary/cloudinary",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.14.4",
+    "version": "1.14.5",
     "license": "MIT",
     "require": {
         "cloudinary/cloudinary_php": "*"

From cbf85529440705a927f4d57ec266feac819fc064 Mon Sep 17 00:00:00 2001
From: pini-girit <pini@girit.biz>
Date: Wed, 20 Jan 2021 14:36:08 +0200
Subject: [PATCH 2/3] v1.14.5: Fixed ImageHelper plugin

---
 Plugin/ImageHelper.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Plugin/ImageHelper.php b/Plugin/ImageHelper.php
index e28fd14..65ab978 100644
--- a/Plugin/ImageHelper.php
+++ b/Plugin/ImageHelper.php
@@ -138,10 +138,6 @@ public function aroundGetUrl(CatalogImageHelper $helper, \Closure $originalMetho
             return $originalMethod();
         }
 
-        if ($imageBlock->getImageUrl() === 'no_selection') {
-            return $imageBlock;
-        }
-
         $imagePath = $this->imageFile ?: $this->product->getData($helper->getType());
 
         $image = $this->imageFactory->build(sprintf('catalog/product%s', $imagePath), $originalMethod);

From 0f66d7e5be76faed1b0918166b1880ae5133bf77 Mon Sep 17 00:00:00 2001
From: pini-girit <pini@girit.biz>
Date: Thu, 11 Feb 2021 17:13:38 +0200
Subject: [PATCH 3/3] v1.14.6: Fixed cloudinary_php SKD version

---
 composer.json             | 4 ++--
 etc/module.xml            | 2 +-
 marketplace.composer.json | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 2a716b1..f830054 100644
--- a/composer.json
+++ b/composer.json
@@ -2,10 +2,10 @@
     "name": "cloudinary/cloudinary-magento2",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.14.5",
+    "version": "1.14.6",
     "license": "MIT",
     "require": {
-        "cloudinary/cloudinary_php": "*"
+        "cloudinary/cloudinary_php": "^1.20.0"
     },
     "autoload": {
         "files": [
diff --git a/etc/module.xml b/etc/module.xml
index d3cfaba..65a86f7 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Cloudinary_Cloudinary" setup_version="1.14.5">
+  <module name="Cloudinary_Cloudinary" setup_version="1.14.6">
       <sequence>
           <module name="Magento_ProductVideo"/>
           <module name="Magento_PageBuilder"/>
diff --git a/marketplace.composer.json b/marketplace.composer.json
index 1b29796..183cbe4 100644
--- a/marketplace.composer.json
+++ b/marketplace.composer.json
@@ -2,7 +2,7 @@
     "name": "cloudinary/cloudinary",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.14.5",
+    "version": "1.14.6",
     "license": "MIT",
     "require": {
         "cloudinary/cloudinary_php": "*"