@jetshop/core 5.13.0 → 5.13.10-0

package/boot/server/persistedQueries/__tests__/getPersistedQueriesForRequest.test.js

@@ -1,201 +1,201 @@
-import { getPersistedQueriesForRequest } from '../getPersistedQueriesForRequest';
-import aQuery from './mockQuery.gql';
-import nock from 'nock';
-import { ApolloError } from 'apollo-client';
-import { ChannelHandler } from '../../../../ChannelHandler/ChannelHandler';
-
-beforeAll(() => {
-  jest.useFakeTimers();
-  nock.disableNetConnect();
-});
-afterAll(() => {
-  jest.useRealTimers();
-  nock.enableNetConnect();
-});
-afterEach(() => {
-  jest.restoreAllMocks();
-  jest.clearAllTimers();
-  nock.enableNetConnect();
-});
-
-const apolloConfig = {
-  shopid: '...',
-  graphQLURI: 'http://localhost/graphql',
-  token: '...',
-  enableGateway: false,
-  persistedQueries: [{ query: aQuery }]
-};
-
-const defaultChannel = {
-  id: 1,
-  language: { name: 'English' },
-  currency: { name: 'Dollarydoos' },
-  country: {
-    id: 1234,
-    code: 'UK'
-  }
-};
-
-function mockResponse(resp, { statusCode = 200, errors } = {}) {
-  const data = {
-    errors,
-    data: resp && {
-      [resp.name]: resp.values.map((val) =>
-        Object.assign({ __typename: resp.name }, val)
-      )
-    }
-  };
-
-  const res = jest.fn(() => data);
-  nock('http://localhost').post('/graphql').reply(statusCode, res);
-  return res;
-}
-
-describe('getPersistedQueriesForRequest', () => {
-  let opts;
-
-  beforeEach(() => {
-    const channelHandler = new ChannelHandler({
-      selectedChannel: defaultChannel
-    });
-
-    opts = {
-      apolloConfig,
-      channelHandler,
-      authHandler: {
-        getAuthHeaders: () => {},
-        loadAuthToken: () => {},
-        authToken: ''
-      },
-      previewHandler: {
-        getPreviewHeaders: () => {},
-        preview: false
-      }
-    };
-  });
-  afterEach(() => {
-    opts = {};
-  });
-
-  test('creates an object keyed by the channel', async () => {
-    const clients = {};
-
-    mockResponse({
-      name: 'dogs',
-      values: [{ id: 1, name: 'Roger' }]
-    });
-
-    const newChannel = {
-      id: 2,
-      language: { name: 'Deutsch' },
-      currency: { name: 'Deutschmarks' },
-      country: {
-        id: 1923,
-        code: 'DE'
-      }
-    };
-
-    // First request comes in at channel 2…
-    opts.channelHandler.setSelectedChannel(newChannel);
-    getPersistedQueriesForRequest(clients, {
-      ...opts
-    });
-
-    // It's added to the clients object
-    expect(Object.keys(clients).length).toBe(1);
-    expect(Object.keys(clients)).toEqual(
-      expect.arrayContaining(['2_Deutsch_Deutschmarks'])
-    );
-
-    mockResponse({
-      name: 'dogs',
-      values: [{ id: 1, name: 'Roger' }]
-    });
-
-    // Another request comes in on channel 1…
-    opts.channelHandler.setSelectedChannel(defaultChannel);
-    getPersistedQueriesForRequest(clients, opts);
-
-    // Now both are kept in memory
-    expect(Object.keys(clients).length).toBe(2);
-    expect(Object.keys(clients)).toEqual(
-      expect.arrayContaining([
-        '2_Deutsch_Deutschmarks',
-        '1_English_Dollarydoos'
-      ])
-    );
-  });
-  test('requests on the same channel do not create new cache entries', async () => {
-    const clients = {};
-
-    mockResponse({
-      name: 'dogs',
-      values: [{ id: 1, name: 'Roger' }]
-    });
-
-    // A request comes in on channel 1…
-    getPersistedQueriesForRequest(clients, opts);
-
-    // And then another!
-    getPersistedQueriesForRequest(clients, opts);
-
-    // Only one entry in the cache tho
-    const keys = Object.keys(clients);
-    expect(keys.length).toBe(1);
-    expect(keys).toEqual(expect.arrayContaining(['1_English_Dollarydoos']));
-  });
-  test('propagates errors', async () => {
-    const clients = {};
-
-    mockResponse(null, {
-      errors: [
-        {
-          message: 'Something went wrong',
-          extensions: { code: 'an error occurred' }
-        }
-      ]
-    });
-
-    // A request comes in on channel 1…
-
-    try {
-      await getPersistedQueriesForRequest(clients, opts).extractCache();
-    } catch (err) {
-      expect(err).toBeInstanceOf(ApolloError);
-      expect(err.message).toBe(`GraphQL error: Something went wrong`);
-    }
-    expect.assertions(2);
-  });
-  it('response updates cache', async () => {
-    const clients = {};
-    mockResponse({
-      name: 'dogs',
-      values: [{ id: 1, name: 'Roger' }]
-    });
-
-    // A request comes in on channel 1…
-    getPersistedQueriesForRequest(clients, opts);
-
-    const firstCache = await clients['1_English_Dollarydoos'].extractCache();
-
-    expect(firstCache['dogs:1']).toEqual(
-      expect.objectContaining({ name: 'Roger' })
-    );
-
-    const mock = mockResponse({
-      name: 'dogs',
-      values: [{ id: 1, name: 'Updated name' }]
-    });
-
-    // The timer ticks over, firing off another request which should have the
-    // updated return value
-    jest.advanceTimersByTime(30000);
-    expect(mock).toHaveBeenCalled();
-
-    const updatedCache = await clients['1_English_Dollarydoos'].extractCache();
-
-    expect(updatedCache['dogs:1']).toEqual(
-      expect.objectContaining({ name: 'Updated name' })
-    );
-  });
-});
+import { getPersistedQueriesForRequest } from '../getPersistedQueriesForRequest';
+import aQuery from './mockQuery.gql';
+import nock from 'nock';
+import { ApolloError } from 'apollo-client';
+import { ChannelHandler } from '../../../../ChannelHandler/ChannelHandler';
+
+beforeAll(() => {
+  jest.useFakeTimers();
+  nock.disableNetConnect();
+});
+afterAll(() => {
+  jest.useRealTimers();
+  nock.enableNetConnect();
+});
+afterEach(() => {
+  jest.restoreAllMocks();
+  jest.clearAllTimers();
+  nock.enableNetConnect();
+});
+
+const apolloConfig = {
+  shopid: '...',
+  graphQLURI: 'http://localhost/graphql',
+  token: '...',
+  enableGateway: false,
+  persistedQueries: [{ query: aQuery }]
+};
+
+const defaultChannel = {
+  id: 1,
+  language: { name: 'English' },
+  currency: { name: 'Dollarydoos' },
+  country: {
+    id: 1234,
+    code: 'UK'
+  }
+};
+
+function mockResponse(resp, { statusCode = 200, errors } = {}) {
+  const data = {
+    errors,
+    data: resp && {
+      [resp.name]: resp.values.map((val) =>
+        Object.assign({ __typename: resp.name }, val)
+      )
+    }
+  };
+
+  const res = jest.fn(() => data);
+  nock('http://localhost').post('/graphql').reply(statusCode, res);
+  return res;
+}
+
+describe('getPersistedQueriesForRequest', () => {
+  let opts;
+
+  beforeEach(() => {
+    const channelHandler = new ChannelHandler({
+      selectedChannel: defaultChannel
+    });
+
+    opts = {
+      apolloConfig,
+      channelHandler,
+      authHandler: {
+        getAuthHeaders: () => {},
+        loadAuthToken: () => {},
+        authToken: ''
+      },
+      previewHandler: {
+        getPreviewHeaders: () => {},
+        preview: false
+      }
+    };
+  });
+  afterEach(() => {
+    opts = {};
+  });
+
+  test('creates an object keyed by the channel', async () => {
+    const clients = {};
+
+    mockResponse({
+      name: 'dogs',
+      values: [{ id: 1, name: 'Roger' }]
+    });
+
+    const newChannel = {
+      id: 2,
+      language: { name: 'Deutsch' },
+      currency: { name: 'Deutschmarks' },
+      country: {
+        id: 1923,
+        code: 'DE'
+      }
+    };
+
+    // First request comes in at channel 2…
+    opts.channelHandler.setSelectedChannel(newChannel);
+    getPersistedQueriesForRequest(clients, {
+      ...opts
+    });
+
+    // It's added to the clients object
+    expect(Object.keys(clients).length).toBe(1);
+    expect(Object.keys(clients)).toEqual(
+      expect.arrayContaining(['2_Deutsch_Deutschmarks'])
+    );
+
+    mockResponse({
+      name: 'dogs',
+      values: [{ id: 1, name: 'Roger' }]
+    });
+
+    // Another request comes in on channel 1…
+    opts.channelHandler.setSelectedChannel(defaultChannel);
+    getPersistedQueriesForRequest(clients, opts);
+
+    // Now both are kept in memory
+    expect(Object.keys(clients).length).toBe(2);
+    expect(Object.keys(clients)).toEqual(
+      expect.arrayContaining([
+        '2_Deutsch_Deutschmarks',
+        '1_English_Dollarydoos'
+      ])
+    );
+  });
+  test('requests on the same channel do not create new cache entries', async () => {
+    const clients = {};
+
+    mockResponse({
+      name: 'dogs',
+      values: [{ id: 1, name: 'Roger' }]
+    });
+
+    // A request comes in on channel 1…
+    getPersistedQueriesForRequest(clients, opts);
+
+    // And then another!
+    getPersistedQueriesForRequest(clients, opts);
+
+    // Only one entry in the cache tho
+    const keys = Object.keys(clients);
+    expect(keys.length).toBe(1);
+    expect(keys).toEqual(expect.arrayContaining(['1_English_Dollarydoos']));
+  });
+  test('propagates errors', async () => {
+    const clients = {};
+
+    mockResponse(null, {
+      errors: [
+        {
+          message: 'Something went wrong',
+          extensions: { code: 'an error occurred' }
+        }
+      ]
+    });
+
+    // A request comes in on channel 1…
+
+    try {
+      await getPersistedQueriesForRequest(clients, opts).extractCache();
+    } catch (err) {
+      expect(err).toBeInstanceOf(ApolloError);
+      expect(err.message).toBe(`GraphQL error: Something went wrong`);
+    }
+    expect.assertions(2);
+  });
+  it('response updates cache', async () => {
+    const clients = {};
+    mockResponse({
+      name: 'dogs',
+      values: [{ id: 1, name: 'Roger' }]
+    });
+
+    // A request comes in on channel 1…
+    getPersistedQueriesForRequest(clients, opts);
+
+    const firstCache = await clients['1_English_Dollarydoos'].extractCache();
+
+    expect(firstCache['dogs:1']).toEqual(
+      expect.objectContaining({ name: 'Roger' })
+    );
+
+    const mock = mockResponse({
+      name: 'dogs',
+      values: [{ id: 1, name: 'Updated name' }]
+    });
+
+    // The timer ticks over, firing off another request which should have the
+    // updated return value
+    jest.advanceTimersByTime(30000);
+    expect(mock).toHaveBeenCalled();
+
+    const updatedCache = await clients['1_English_Dollarydoos'].extractCache();
+
+    expect(updatedCache['dogs:1']).toEqual(
+      expect.objectContaining({ name: 'Updated name' })
+    );
+  });
+});

package/boot/server/persistedQueries/__tests__/mockQuery.gql

@@ -1,6 +1,6 @@
-query Doggos {
-  dogs {
-    id
-    name
-  }
-}
+query Doggos {
+  dogs {
+    id
+    name
+  }
+}

package/boot/server/persistedQueries/getPersistedQueriesForRequest.d.ts

@@ -1,3 +1,3 @@
-import { CreateClientOpts } from '../../apollo';
-import { PersistedClient } from './PersistedClient';
-export declare function getPersistedQueriesForRequest(persistedQueryClients: any, opts: CreateClientOpts): PersistedClient;
+import { CreateClientOpts } from '../../apollo';
+import { PersistedClient } from './PersistedClient';
+export declare function getPersistedQueriesForRequest(persistedQueryClients: any, opts: CreateClientOpts): PersistedClient;

package/boot/server/persistedQueries/getPersistedQueriesForRequest.js

@@ -1,27 +1,27 @@
-import { PersistedClient } from './PersistedClient';
-export function getPersistedQueriesForRequest(persistedQueryClients, opts) {
-    const { apolloConfig, authHandler, previewHandler, channelHandler } = opts;
-    const queriesToPersist = apolloConfig.persistedQueries || [];
-    // When auth is enabled or we are in a preview route, we don't want to cache
-    if (!!(authHandler === null || authHandler === void 0 ? void 0 : authHandler.authToken) || (previewHandler === null || previewHandler === void 0 ? void 0 : previewHandler.preview))
-        return null;
-    // If there are no persisted queries in the config, we have nothing to cache
-    if (queriesToPersist.length === 0)
-        return null;
-    let client;
-    const channel = channelHandler.getSelectedChannel();
-    if (channel.requiresAuth)
-        return null;
-    // Create a key unique to this selected channel, lang, currency
-    const key = `${channel.id}_${channel.language.name}_${channel.currency.name}`;
-    const headers = channelHandler.getChannelHeaders();
-    if (key in persistedQueryClients) {
-        client = persistedQueryClients[key];
-    }
-    else {
-        const newClient = new PersistedClient(Object.assign(Object.assign({}, opts), { headers }));
-        client = persistedQueryClients[key] = newClient;
-    }
-    return client;
-}
+import { PersistedClient } from './PersistedClient';
+export function getPersistedQueriesForRequest(persistedQueryClients, opts) {
+    const { apolloConfig, authHandler, previewHandler, channelHandler } = opts;
+    const queriesToPersist = apolloConfig.persistedQueries || [];
+    // When auth is enabled or we are in a preview route, we don't want to cache
+    if (!!(authHandler === null || authHandler === void 0 ? void 0 : authHandler.authToken) || (previewHandler === null || previewHandler === void 0 ? void 0 : previewHandler.preview))
+        return null;
+    // If there are no persisted queries in the config, we have nothing to cache
+    if (queriesToPersist.length === 0)
+        return null;
+    let client;
+    const channel = channelHandler.getSelectedChannel();
+    if (channel.requiresAuth)
+        return null;
+    // Create a key unique to this selected channel, lang, currency
+    const key = `${channel.id}_${channel.language.name}_${channel.currency.name}`;
+    const headers = channelHandler.getChannelHeaders();
+    if (key in persistedQueryClients) {
+        client = persistedQueryClients[key];
+    }
+    else {
+        const newClient = new PersistedClient(Object.assign(Object.assign({}, opts), { headers }));
+        client = persistedQueryClients[key] = newClient;
+    }
+    return client;
+}
 //# sourceMappingURL=getPersistedQueriesForRequest.js.map

package/boot/server/saleSource.test.js

@@ -1,39 +1,39 @@
-import { salesSourceMiddleware } from './salesSource';
-import { Cookies } from 'react-cookie';
-
-describe('Sales source test', () => {
-  it('Will set the sales source cookie', () => {
-    const cookies = new Cookies();
-    salesSourceMiddleware({
-      queryObject: {
-        SalesSource: 'test'
-      },
-      cookies
-    });
-    expect(cookies.get('SalesSource')).toBe('test');
-  });
-
-  it('Will remove the sales source cookie', () => {
-    const cookies = new Cookies();
-    cookies.set('SalesSource', 'test');
-    expect(cookies.get('SalesSource')).toBe('test');
-    salesSourceMiddleware({
-      queryObject: {
-        SalesSource: 'remove'
-      },
-      cookies
-    });
-    expect(cookies.get('SalesSource')).toBeFalsy();
-  });
-
-  it('Will set the cookie regardless of case', () => {
-    const cookies = new Cookies();
-    salesSourceMiddleware({
-      queryObject: {
-        salEsSoUrCe: 'test'
-      },
-      cookies
-    });
-    expect(cookies.get('SalesSource')).toBe('test');
-  });
-});
+import { salesSourceMiddleware } from './salesSource';
+import { Cookies } from 'react-cookie';
+
+describe('Sales source test', () => {
+  it('Will set the sales source cookie', () => {
+    const cookies = new Cookies();
+    salesSourceMiddleware({
+      queryObject: {
+        SalesSource: 'test'
+      },
+      cookies
+    });
+    expect(cookies.get('SalesSource')).toBe('test');
+  });
+
+  it('Will remove the sales source cookie', () => {
+    const cookies = new Cookies();
+    cookies.set('SalesSource', 'test');
+    expect(cookies.get('SalesSource')).toBe('test');
+    salesSourceMiddleware({
+      queryObject: {
+        SalesSource: 'remove'
+      },
+      cookies
+    });
+    expect(cookies.get('SalesSource')).toBeFalsy();
+  });
+
+  it('Will set the cookie regardless of case', () => {
+    const cookies = new Cookies();
+    salesSourceMiddleware({
+      queryObject: {
+        salEsSoUrCe: 'test'
+      },
+      cookies
+    });
+    expect(cookies.get('SalesSource')).toBe('test');
+  });
+});

package/boot/server/salesSource.d.ts

@@ -1,8 +1,8 @@
-import { Cookies } from 'react-cookie';
-declare function salesSourceMiddleware({ queryObject, cookies }: {
-    queryObject: {
-        [key: string]: string;
-    };
-    cookies: Cookies;
-}): void;
-export { salesSourceMiddleware };
+import { Cookies } from 'react-cookie';
+declare function salesSourceMiddleware({ queryObject, cookies }: {
+    queryObject: {
+        [key: string]: string;
+    };
+    cookies: Cookies;
+}): void;
+export { salesSourceMiddleware };

package/boot/server/salesSource.js

@@ -1,16 +1,16 @@
-function salesSourceMiddleware({ queryObject, cookies }) {
-    const caseInsensitiveSalesSourceKey = Object.keys(queryObject).find(key => key.toLowerCase() === 'salessource');
-    const salesSourceParam = queryObject[caseInsensitiveSalesSourceKey];
-    if (salesSourceParam === 'remove') {
-        cookies.remove('SalesSource');
-    }
-    else {
-        const expires = new Date();
-        expires.setFullYear(new Date().getFullYear() + 10);
-        cookies.set('SalesSource', salesSourceParam, {
-            expires
-        });
-    }
-}
-export { salesSourceMiddleware };
+function salesSourceMiddleware({ queryObject, cookies }) {
+    const caseInsensitiveSalesSourceKey = Object.keys(queryObject).find(key => key.toLowerCase() === 'salessource');
+    const salesSourceParam = queryObject[caseInsensitiveSalesSourceKey];
+    if (salesSourceParam === 'remove') {
+        cookies.remove('SalesSource');
+    }
+    else {
+        const expires = new Date();
+        expires.setFullYear(new Date().getFullYear() + 10);
+        cookies.set('SalesSource', salesSourceParam, {
+            expires
+        });
+    }
+}
+export { salesSourceMiddleware };
 //# sourceMappingURL=salesSource.js.map