From 91cfea0bffe197dd5013725f8ec650e200fea21f Mon Sep 17 00:00:00 2001
From: Ovie Okeh <kevinokeh@gmail.com>
Date: Tue, 28 Feb 2023 09:47:29 +0100
Subject: [PATCH 1/2] fix image url with cloud providers

---
 .../CKEditor/plugins/StrapiUploadAdapter.js   | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/admin/src/components/Input/CKEditor/plugins/StrapiUploadAdapter.js b/admin/src/components/Input/CKEditor/plugins/StrapiUploadAdapter.js
index fd7e486..b5178ad 100644
--- a/admin/src/components/Input/CKEditor/plugins/StrapiUploadAdapter.js
+++ b/admin/src/components/Input/CKEditor/plugins/StrapiUploadAdapter.js
@@ -24,7 +24,6 @@ export default class StrapiUploadAdapter extends Plugin {
    * @inheritDoc
    */
   init() {
-    
     // backendUrl
     // uploadUrl
     // headers
@@ -140,21 +139,27 @@ class Adapter {
         );
       }
 
-      
       const { backendUrl, responsive } = this.options || {};
-      
-      if (response[0].formats && responsive) {
-        const { name, url, alternativeText, formats } = response[0];
-        let urls = { default: backendUrl + url };
-        let keys = Object.keys(formats).sort((a, b) => formats[a].width - formats[b].width);
+      const { name, url, alternativeText, formats } = response[0];
+
+      // If using a cloud provider, url will be a full URL.
+      const defaultUrl = url.includes("https")
+        ? response[0].url
+        : backendUrl + response[0].url;
+
+      if (formats && responsive) {
+        let urls = { default: defaultUrl };
+        let keys = Object.keys(formats).sort(
+          (a, b) => formats[a].width - formats[b].width
+        );
         keys.map((k) => (urls[formats[k].width] = backendUrl + formats[k].url));
         resolve({ alt: alternativeText || name, urls: urls });
       } else {
         resolve(
-          response[0].url
+          url
             ? {
-                alt: response[0].alternativeText || response[0].name,
-                urls: { default: backendUrl + response[0].url },
+                alt: alternativeText || name,
+                urls: { default: defaultUrl },
               }
             : null
         );

From 25a87a2b933e1c5c3d1b75d02cb072fe9a8e5082 Mon Sep 17 00:00:00 2001
From: Ovie Okeh <kevinokeh@gmail.com>
Date: Tue, 28 Feb 2023 14:54:13 +0100
Subject: [PATCH 2/2] use response provider value for strapi image url upload

---
 .../Input/CKEditor/plugins/StrapiUploadAdapter.js         | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/Input/CKEditor/plugins/StrapiUploadAdapter.js b/admin/src/components/Input/CKEditor/plugins/StrapiUploadAdapter.js
index b5178ad..fbc1a43 100644
--- a/admin/src/components/Input/CKEditor/plugins/StrapiUploadAdapter.js
+++ b/admin/src/components/Input/CKEditor/plugins/StrapiUploadAdapter.js
@@ -140,12 +140,8 @@ class Adapter {
       }
 
       const { backendUrl, responsive } = this.options || {};
-      const { name, url, alternativeText, formats } = response[0];
-
-      // If using a cloud provider, url will be a full URL.
-      const defaultUrl = url.includes("https")
-        ? response[0].url
-        : backendUrl + response[0].url;
+      const { name, url, alternativeText, formats, provider } = response[0];
+      const defaultUrl = provider !== "local" ? url : backendUrl + url;
 
       if (formats && responsive) {
         let urls = { default: defaultUrl };