fix: get api host from middleware url

packages/core/core/__tests__/utils/nuxt/proxyUtils.spec.ts

@@ -0,0 +1,82 @@
+import * as utils from '../../../src/utils/nuxt/_proxyUtils';
+
+describe('[CORE - utils] _proxyUtils', () => {
+  it('returns proxy for defined api', () => {
+    const givenApi = {
+      getProduct: jest.fn()
+    };
+
+    const client = {
+      post: jest.fn(() => ({ then: jest.fn() }))
+    };
+
+    const proxiedApi = utils.createProxiedApi({ givenApi, client, tag: 'ct' });
+
+    proxiedApi.getProduct({ product: 1 });
+    proxiedApi.getCategory({ category: 1 });
+
+    expect(givenApi.getProduct).toBeCalled();
+    expect(client.post).toBeCalledWith('/ct/getCategory', [{ category: 1 }]);
+  });
+
+  it('reads cookies from incoming request', () => {
+    expect(utils.getCookies(null)).toEqual('');
+    expect(utils.getCookies({} as any)).toEqual('');
+    expect(utils.getCookies({ req: { headers: {} } } as any)).toEqual('');
+    expect(utils.getCookies({ req: { headers: { cookie: { someCookie: 1 } } } } as any)).toEqual({ someCookie: 1 });
+  });
+
+  it('it combines config with the current one', () => {
+    jest.spyOn(utils, 'getCookies').mockReturnValue('');
+
+    expect(utils.getIntegrationConfig(
+      {
+        $config: {
+          middlewareUrl: 'some-url'
+        }
+      } as any,
+      { someGivenOption: 1 }
+    )).toEqual({
+      axios: {
+        baseURL: 'some-url',
+        headers: {}
+      },
+      someGivenOption: 1
+    });
+  });
+
+  it('it combines config with the current one and adds a cookie', () => {
+    jest.spyOn(utils, 'getCookies').mockReturnValue('xxx');
+
+    expect(utils.getIntegrationConfig(
+      {
+        $config: {
+          middlewareUrl: 'some-url'
+        }
+      } as any,
+      {}
+    )).toEqual({
+      axios: {
+        baseURL: 'some-url',
+        headers: {
+          cookie: 'xxx'
+        }
+      }
+    });
+  });
+
+  it('it throws error when no middlewareUrl is passed in config', () => {
+    jest.spyOn(utils, 'getCookies').mockReturnValue('');
+
+    expect(() => {
+      utils.getIntegrationConfig(
+        {
+          $config: {
+            middlewareUrl: ''
+          }
+        } as any,
+        {}
+      );
+    }).toThrowError();
+  });
+});

packages/core/core/src/utils/nuxt/_proxyUtils.ts

@@ -1,4 +1,3 @@
-import { IncomingMessage } from 'http';
 import { Context as NuxtContext } from '@nuxt/types';
 import merge from 'lodash-es/merge';
 import { ApiClientMethod } from './../../types';
@@ -9,16 +8,6 @@ interface CreateProxiedApiParams {
   tag: string;
 }
 
-export const getBaseUrl = (req: IncomingMessage, basePath: string | undefined = '/'): string => {
-  if (!req) return `${basePath}api/`;
-  const { headers } = req;
-  const isHttps = require('is-https')(req);
-  const scheme = isHttps ? 'https' : 'http';
-  const host = headers['x-forwarded-host'] || headers.host;
-
-  return `${scheme}://${host}${basePath}api/`;
-};
-
 export const createProxiedApi = ({ givenApi, client, tag }: CreateProxiedApiParams) => new Proxy(givenApi, {
   get: (target, prop, receiver) => {
 
@@ -37,9 +26,15 @@ export const getCookies = (context: NuxtContext) => context?.req?.headers?.cooki
 
 export const getIntegrationConfig = (context: NuxtContext, configuration: any) => {
   const cookie = getCookies(context);
+  const { middlewareUrl } = context.$config;
+
+  if (!middlewareUrl) {
+    throw new Error('Missing configuration option: middlewareUrl');
+  }
+
   const initialConfig = merge({
     axios: {
-      baseURL: getBaseUrl(context?.req, context?.base),
+      baseURL: middlewareUrl,
       headers: {
         ...(cookie ? { cookie } : {})
       }

packages/core/core/src/utils/nuxt/index.ts

@@ -25,12 +25,6 @@ export const integrationPlugin = (pluginFn: NuxtPlugin) => (nuxtCtx: NuxtContext
   const configure = (tag, configuration) => {
     const injectInContext = createAddIntegrationToCtx({ tag, nuxtCtx, inject });
     const config = getIntegrationConfig(nuxtCtx, configuration);
-    const { middlewareUrl, ssrMiddlewareUrl } = (nuxtCtx as any).$config;
-
-    if (middlewareUrl) {
-      config.axios.baseURL = process.server ? ssrMiddlewareUrl || middlewareUrl : middlewareUrl;
-    }
-
     const client = axios.create(config.axios);
     const api = createProxiedApi({ givenApi: configuration.api || {}, client, tag });
 

packages/core/docs/changelog/6680.js

@@ -0,0 +1,10 @@
+module.exports = {
+  description: 'get api host from middleware url',
+  link: 'https://github.com/vuestorefront/vue-storefront/pull/6680',
+  isBreaking: true,
+  breakingChanges: [
+    'middlewareUrl has to be configured for nuxt. Please follow instruction in migration guide for version 2.5.7.'
+  ],
+  author: 'Dawid Ziobro',
+  linkToGitHubAccount: 'https://github.com/dawid-ziobro'
+};

packages/core/docs/getting-started/configuration.md

@@ -16,6 +16,21 @@ You can learn more about this file and available configuration options on the [N
 
 The `middleware.config.js` file is as essential as `nuxt.confis.js`, but much simpler and likely smaller. It configures the Server Middleware used for communication with e-commerce platforms and contains sensitive credentials, custom endpoints, queries, etc.
 
+What is common for every integration is setting `middlewareUrl`. This is required and have to point to middleware. Usually it is your application domain.
+
+Example:
+
+```javascript
+// nuxt.config.js
+export default {
+  publicRuntimeConfig: {
+    middlewareUrl: 'https://yourdomain.com/api/'
+  }
+}
+```
+
+For development just use `http://localhost:3000/api`.
+
 You can learn more about Server Middleware and available configuration options on the [Server Middleware](/architecture/server-middleware.html) page.
 
 ## Optional configuration files

packages/core/docs/reference/migrate/2.5.7/overview.md

@@ -0,0 +1,45 @@
+# Migrating projects to 2.5.7
+
+## Extend `nuxt.config.js`
+
+In this release we've removed generating `baseUrl` for api calls, based on request headers.
+Now it has to be configured and proper `middlewareUrl` needs to be passed.
+
+To do it, just extend `nuxt.config.js` and add `middlewareUrl`.
+This field is now required, before it was optional.
+
+```javascript
+// nuxt.config.js
+export default {
+  publicRuntimeConfig: {
+    middlewareUrl: 'https://yourdomain.com/api/'
+  }
+}
+```
+
+:::warning
+Make sure to pass whole url with protocol and/or port and suffix it with `/api/`.
+:::
+
+For development, you can just use `http://localhost:3000/api/`.
+
+If you don't want to hardcode url in config file, you can use environmental variables.
+
+Example:
+
+```javascript
+// nuxt.config.js
+export default {
+  publicRuntimeConfig: {
+    middlewareUrl: process.env.API_BASE_URL
+  }
+}
+```
+
+And then add entry in `.env` file or use any other method for passing environmental variables that suits your needs.
+
+Example:
+```
+// .env
+API_BASE_URL=https://yourdomain.com/api/
+```

packages/core/docs/reference/migrate/index.md

@@ -1,5 +1,8 @@
 # Migration guides
 
+## 2.5.7
+- [Overview](./2.5.7/overview.md)
+
 ## 2.5.0
 - [Overview](./2.5.0/overview.md)