@ordergroove/offers 2.49.0 → 2.49.1-alpha-PR-1517-4.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.49.0",
+  "version": "2.49.1-alpha-PR-1517-4.76+5e3f5ef73",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -50,5 +50,5 @@
     "@ordergroove/offers-templates": "^0.10.4",
     "@types/lodash.memoize": "^4.1.9"
   },
-  "gitHead": "7b58b4c90e38ed68f42a40be308ecea2b6589d9e"
+  "gitHead": "5e3f5ef73dcd7f5843a3db07236c1cf37cfa2140"
 }

package/src/init-shopify-tests.js

@@ -2,6 +2,6 @@ import { STATIC_HOST } from './core/constants';
 
 const mainJs = document.createElement('script');
 mainJs.setAttribute('id', `mock-main-js`);
-mainJs.setAttribute('src', `http://${STATIC_HOST}`);
+mainJs.setAttribute('src', `http://${STATIC_HOST}/test-merchant/main.js`);
 mainJs.dataset.shopifySellingPlans = true;
 document.head.appendChild(mainJs);

package/src/shopify/__tests__/shopifyBootstrap.spec.js

@@ -0,0 +1,110 @@
+import fetchMock from 'fetch-mock';
+import { authorizeShopifyCustomer } from '../shopifyBootstrap';
+import { AUTHORIZE, UNAUTHORIZED, STATIC_HOST } from '../../core/constants';
+
+// init-shopify-tests.js inserts this script before any test runs
+const mainJsScript = document.querySelector(`script[src^="http://${STATIC_HOST}"]`);
+
+const MERCHANT_ID = 'test-merchant';
+const AUTH_ENDPOINT = '/apps/subscriptions/auth/';
+
+describe('authorizeShopifyCustomer', () => {
+  let store;
+
+  beforeEach(() => {
+    store = { dispatch: jasmine.createSpy('dispatch') };
+  });
+
+  afterEach(() => {
+    delete mainJsScript.dataset.customer;
+    // expire the og_auth cookie; just setting to empty string will be ignored
+    document.cookie = 'og_auth=; expires=Thu, 01 Jan 1970 00:00:01 GMT; path=/';
+    fetchMock.clearHistory();
+    fetchMock.removeRoutes().unmockGlobal();
+  });
+
+  it('fetches OG signature, sets og_auth cookie, and dispatches AUTHORIZE when encoded customer is on main.js script', async () => {
+    // The Shopify integration encodes customer data as btoa("id|timestamp|signature|email")
+    // on the data-customer attribute of the main.js script tag.
+    const shopifyCustomerId = 'shopify-cust-42';
+    const shopifyTimestamp = '1700000000';
+    const shopifySignature = 'shopify-raw-sig';
+
+    mainJsScript.dataset.customer = btoa(
+      `${shopifyCustomerId}|${shopifyTimestamp}|${shopifySignature}|test@example.com`
+    );
+
+    // OG's auth endpoint returns a signed customer ID embedded between marker strings.
+    const ogCustomerId = 'og-cust-99';
+    const ogTimestamp = 1700000099;
+    const ogSignature = 'og-server-sig';
+
+    fetchMock.route(
+      `${AUTH_ENDPOINT}?customer=${shopifyCustomerId}&customer_signature=${shopifySignature}&customer_timestamp=${shopifyTimestamp}`,
+      `<main>
+        og_auth_begin
+        {
+          "customerId": "${ogCustomerId}",
+          "timestamp": ${ogTimestamp},
+          "signature": "${ogSignature}"
+        }
+        og_auth_end
+</main>`,
+      { method: 'GET' }
+    );
+    fetchMock.mockGlobal();
+
+    await authorizeShopifyCustomer({ store });
+
+    const binarySignature = btoa(ogSignature);
+
+    expect(document.cookie).toContain(`og_auth=${ogCustomerId}|${ogTimestamp}|${binarySignature}`);
+
+    expect(store.dispatch).toHaveBeenCalledWith({
+      type: AUTHORIZE,
+      payload: {
+        public_id: MERCHANT_ID,
+        sig_field: ogCustomerId,
+        ts: ogTimestamp,
+        sig: binarySignature
+      }
+    });
+  });
+
+  it('reuses existing og_auth cookie and dispatches AUTHORIZE without fetching', async () => {
+    mainJsScript.dataset.customer = btoa('shopify-cust-42|1700000000|shopify-raw-sig|test@example.com');
+
+    const cachedCustomerId = 'cached-cust';
+    const cachedTimestamp = 1699999999;
+    const cachedSig = btoa('cached-server-sig');
+    document.cookie = `og_auth=${cachedCustomerId}|${cachedTimestamp}|${cachedSig}; path=/`;
+
+    fetchMock.mockGlobal(); // no routes — any fetch call would throw
+
+    await authorizeShopifyCustomer({ store });
+
+    expect(fetchMock.callHistory.called()).toBe(false);
+    expect(store.dispatch).toHaveBeenCalledWith({
+      type: AUTHORIZE,
+      payload: {
+        public_id: MERCHANT_ID,
+        sig_field: cachedCustomerId,
+        ts: cachedTimestamp,
+        sig: cachedSig
+      }
+    });
+  });
+
+  it('clears og_auth cookie and does not dispatch when no customer is present', async () => {
+    document.cookie = 'og_auth=existing-value; path=/';
+    expect(document.cookie).toContain('og_auth=existing-value');
+
+    await authorizeShopifyCustomer({ store });
+
+    expect(document.cookie).not.toContain('og_auth=');
+    expect(store.dispatch).toHaveBeenCalledWith({
+      type: UNAUTHORIZED,
+      payload: jasmine.any(String)
+    });
+  });
+});

package/src/shopify/shopifyBootstrap.ts

@@ -1,4 +1,4 @@
-import { authorize } from '../core/actions';
+import { authorize, unauthorized } from '../core/actions';
 import { clearCookie, getCookieValue, getMainJs, resolveEnvAndMerchant } from '../core/utils';
 
 const SHOPIFY_OG_AUTH_ENDPOINT = '/apps/subscriptions/auth/';
@@ -93,6 +93,8 @@ export async function authorizeShopifyCustomer({ store }) {
     }
   } else {
     clearCookie('og_auth');
+    // after clearing the cookie, we need to make sure the store clears its own auth state
+    store.dispatch(unauthorized('No customer found'));
   }
 }
 /**
@@ -138,7 +140,7 @@ export async function getOrCreateAuthCookie(customer: OgShopifyConfigCustomer) {
   const ogToday = new Date();
   const binarySignature = btoa(signature);
   ogToday.setTime(ogToday.getTime() + 2 * 60 * 60 * 1000);
-  const value = `${customerId}|${timestamp}|${binarySignature};expires=${ogToday.toUTCString()}`;
-  document.cookie = `og_auth=${value};secure;path=/`;
+  const value = `${customerId}|${timestamp}|${binarySignature}`;
+  document.cookie = `og_auth=${value};expires=${ogToday.toUTCString()};secure;path=/`;
   return value;
 }