feat(composables): Remove slice from apiInstance url (NTR)

shopware · Feb 9, 2023 · 50e74be · 50e74be
1 parent b6770ba
commit 50e74be
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/.changeset/dry-glasses-bake.md b/.changeset/dry-glasses-bake.md
@@ -0,0 +1,5 @@
+---
+"@shopware-pwa/composables-next": patch
+---
+
+Return full url for storefrontURL
diff --git a/packages/composables/src/useInternationalization.test.ts b/packages/composables/src/useInternationalization.test.ts
@@ -37,7 +37,7 @@ describe("useInternationalization", () => {
   });
 
   it("should return storefrontUrl", async () => {
-    const wrapper = shallowMount(Component, getMockProvide(url + "/"));
+    const wrapper = shallowMount(Component, getMockProvide(url));
     expect(wrapper.vm.getStorefrontUrl()).toBe(url);
   });
 

diff --git a/packages/composables/src/useInternationalization.ts b/packages/composables/src/useInternationalization.ts
@@ -20,10 +20,7 @@ export function useInternationalization(): UseInternationalizationReturn {
     /**
      * apiIntanceUrl - should be removed after resolving backend multi domains problems
      */
-    const apiIntanceUrl = apiInstance.config.endpoint
-      ? apiInstance.config.endpoint.slice(0, -1)
-      : undefined;
-    return apiIntanceUrl ?? window.location.origin ?? "";
+    return apiInstance.config.endpoint ?? window.location.origin ?? "";
   }
 
   return {

diff --git a/packages/composables/src/useNewsletter.test.ts b/packages/composables/src/useNewsletter.test.ts
@@ -29,7 +29,7 @@ const getMockProvide = (mockedUrl: string | undefined) => ({
 });
 
 describe("useNewsletter", () => {
-  const wrapper = shallowMount(Component, getMockProvide(url + "/"));
+  const wrapper = shallowMount(Component, getMockProvide(url));
   const email = "[email protected]";
   const newsletterMockData = {
     email: email,

diff --git a/packages/composables/src/useSyncWishlist.test.ts b/packages/composables/src/useSyncWishlist.test.ts
@@ -42,7 +42,7 @@ const getMockProvide = (mockedUrl: string | undefined) => ({
 });
 
 describe("useSyncWishlist", () => {
-  const wrapper = shallowMount(Component, getMockProvide(url + "/"));
+  const wrapper = shallowMount(Component, getMockProvide(url));
   const mockedResolve = { apiAlias: "mock", success: true };
   const mockedResponse = {
     products: {

diff --git a/packages/nuxt3-module/src/index.ts b/packages/nuxt3-module/src/index.ts
@@ -35,7 +35,7 @@ export default defineNuxtModule<ShopwareNuxtOptions>({
       options: {
         shopwareEndpoint:
           moduleConfig.shopwareEndpoint ??
-          "https://demo-frontends.shopware.store/",
+          "https://demo-frontends.shopware.store",
         shopwareAccessToken:
           moduleConfig.shopwareAccessToken ?? "SWSCBHFSNTVMAWNZDNFKSHLAYW",
         shopwareApiClient: {