fix: set a fallback where we define window.strapi.backendURL

strapi · Sep 12, 2023 · 4d92b11 · 4d92b11 · strapi-bot · Dec 5, 2023
1 parent 0bd5f29
commit 4d92b11
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/packages/core/admin/admin/src/index.js b/packages/core/admin/admin/src/index.js
@@ -8,7 +8,13 @@ import plugins from './plugins';
 import appReducers from './reducers';
 
 window.strapi = {
-  backendURL: process.env.STRAPI_ADMIN_BACKEND_URL,
+  /**
+   * This ENV variable is passed from the strapi instance, by default no url is set
+   * in the config and therefore the instance returns you an empty string so URLs are relative.
+   *
+   * To ensure that the backendURL is always set, we use the window.location.origin as a fallback.
+   */
+  backendURL: process.env.STRAPI_ADMIN_BACKEND_URL || window.location.origin,
   isEE: false,
   telemetryDisabled: process.env.STRAPI_TELEMETRY_DISABLED ?? false,
   features: {

diff --git a/packages/core/upload/admin/src/utils/appendSearchParamsToUrl.js b/packages/core/upload/admin/src/utils/appendSearchParamsToUrl.js
@@ -10,7 +10,7 @@ const appendSearchParamsToUrl = ({ url, params }) => {
     return url;
   }
 
-  const urlObj = new URL(url, window.strapi.backendURL ?? window.location.origin);
+  const urlObj = new URL(url, window.strapi.backendURL);
 
   Object.entries(params).forEach(([key, value]) => {
     if (value !== undefined) {

diff --git a/packages/core/upload/admin/src/utils/tests/appendSearchParamsToUrl.test.js b/packages/core/upload/admin/src/utils/tests/appendSearchParamsToUrl.test.js
@@ -102,18 +102,5 @@ describe('appendSearchParamsToUrl', () => {
         `"https://appending-search-params.com/uploads/image.jpg?param1=example1&param2=example2"`
       );
     });
-
-    test("if there's no window.strapi.backendURL, it uses window.location.origin", () => {
-      const oldBackendURL = window.strapi.backendURL;
-      window.strapi.backendURL = undefined;
-
-      expect(
-        appendSearchParamsToUrl({ url, params: { updatedAt: updateTime } })
-      ).toMatchInlineSnapshot(
-        `"http://localhost:1337/uploads/image.jpg?updatedAt=2023-07-19T03%3A00%3A00.000Z"`
-      );
-
-      window.strapi.backendURL = oldBackendURL;
-    });
   });
 });