fix review comment

adobecom · Aug 14, 2024 · 535afeb · 535afeb
1 parent a0f98fa
commit 535afeb
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 31 deletions.
diff --git a/libs/deps/commerce.js b/libs/deps/commerce.js
diff --git a/libs/deps/mas/commerce.js b/libs/deps/mas/commerce.js
diff --git a/libs/deps/mas/mas.js b/libs/deps/mas/mas.js
diff --git a/libs/features/mas/commerce/src/constants.js b/libs/features/mas/commerce/src/constants.js
@@ -19,6 +19,9 @@ export const PARAM_LANDSCAPE = 'commerce.landscape';
 export const PARAM_AOS_API_KEY = 'commerce.aosKey';
 export const PARAM_WCS_API_KEY = 'commerce.wcsKey';
 
+export const WCS_PROD_URL = 'https://www.adobe.com/web_commerce_artifact';
+export const WCS_STAGE_URL = 'https://www.stage.adobe.com/web_commerce_artifact_stage';
+
 export const STATE_FAILED = 'failed';
 export const STATE_PENDING = 'pending';
 export const STATE_RESOLVED = 'resolved';

diff --git a/libs/features/mas/commerce/src/settings.js b/libs/features/mas/commerce/src/settings.js
@@ -1,4 +1,4 @@
-import { PARAM_ENV, PARAM_LANDSCAPE, Landscape } from './constants.js';
+import { PARAM_ENV, PARAM_LANDSCAPE, Landscape, WCS_PROD_URL, WCS_STAGE_URL } from './constants.js';
 import { Defaults } from './defaults.js';
 import {
     CheckoutWorkflow,
@@ -133,16 +133,14 @@ function getSettings(config = {}) {
     // TODO: add alias names for meta, search and storage
     // See https://git.corp.adobe.com/wcms/tacocat.js/pull/348#discussion_r6557570
     const { commerce = {}, locale = undefined } = config;
-    const lowHostEnv = ['local', 'stage'].includes(config.env?.name);
     let env = Env.PRODUCTION;
-    let wcsURL = 'https://www.adobe.com/web_commerce_artifact';
-    if (lowHostEnv) {
-      wcsURL = 'https://www.stage.adobe.com/web_commerce_artifact';
-      const forceWcsStage = getParameter(PARAM_ENV, commerce, { metadata: false }) === 'stage';
-      if (forceWcsStage) {
-        env = Env.STAGE;
-        wcsURL = `${wcsURL}_stage`;
-      }
+    let wcsURL = WCS_PROD_URL;
+
+    const lowHostEnv = ['local', 'stage'].includes(config.env?.name);
+    const forceWcsStage = getParameter(PARAM_ENV, commerce, { metadata: false }) === 'stage';
+    if (lowHostEnv && forceWcsStage) {
+      env = Env.STAGE;
+      wcsURL = WCS_STAGE_URL;
     }
 
     const checkoutClientId =

diff --git a/libs/features/mas/commerce/test/settings.test.js b/libs/features/mas/commerce/test/settings.test.js
@@ -1,5 +1,5 @@
 import { Env } from '../src/external.js';
-import { Landscape } from '../src/constants.js';
+import { Landscape, WCS_PROD_URL, WCS_STAGE_URL } from '../src/constants.js';
 import { Defaults } from '../src/defaults.js';
 import { getSettings } from '../src/settings.js';
 
@@ -77,7 +77,7 @@ describe('getSettings', () => {
           locale: "en_US",
           priceLiteralsURL: undefined,
           priceLiteralsPromise: undefined,
-          wcsURL: 'https://www.stage.adobe.com/web_commerce_artifact'
+          wcsURL: WCS_STAGE_URL
       });
     });
 
@@ -113,55 +113,61 @@ describe('getSettings', () => {
             priceLiteralsPromise: undefined,
             quantity: [Defaults.quantity],
             wcsApiKey,
-            wcsURL: 'https://www.stage.adobe.com/web_commerce_artifact_stage',
+            wcsURL: WCS_STAGE_URL,
             landscape: Landscape.DRAFT,
         });
         window.sessionStorage.removeItem(PARAM_ENV);
     });
 
-    it('host env "local" -> WCS prod origin + stage akamai', () => {
+    it('host env "local" -> WCS prod origin + prod akamai', () => {
       const config = { commerce: {}, env: { name: 'local' }, };
       const settings = getSettings(config);
-      expect(settings.wcsURL).to.equal('https://www.stage.adobe.com/web_commerce_artifact');
+      expect(settings.wcsURL).to.equal(WCS_PROD_URL);
+      expect(settings.env).to.equal(Env.PRODUCTION);
     });
 
-    it('host env "stage" -> WCS prod origin + stage akamai', () => {
+    it('host env "stage" -> WCS prod origin + prod akamai', () => {
       const config = { commerce: {}, env: { name: 'stage' }, };
       const settings = getSettings(config);
-      expect(settings.wcsURL).to.equal('https://www.stage.adobe.com/web_commerce_artifact');
+      expect(settings.wcsURL).to.equal(WCS_PROD_URL);
+      expect(settings.env).to.equal(Env.PRODUCTION);
     });
 
     it('host env "prod" -> WCS prod origin + prod akamai', () => {
       const config = { commerce: {}, env: { name: 'prod' }, };
       const settings = getSettings(config);
-      expect(settings.wcsURL).to.equal('https://www.adobe.com/web_commerce_artifact');
+      expect(settings.wcsURL).to.equal(WCS_PROD_URL);
+      expect(settings.env).to.equal(Env.PRODUCTION);
     });
 
     it('host env "local" - override landscape and WCS origin (_stage)', () => {
         window.sessionStorage.setItem(PARAM_ENV, 'stage');
         window.sessionStorage.setItem(PARAM_LANDSCAPE, 'DRAFT');
         const config = { commerce: {}, env: { name: 'local' }, };
         const settings = getSettings(config);
-        expect(settings.wcsURL).to.equal('https://www.stage.adobe.com/web_commerce_artifact_stage');
+        expect(settings.wcsURL).to.equal(WCS_STAGE_URL);
         expect(settings.landscape).to.equal(Landscape.DRAFT);
+        expect(settings.env).to.equal(Env.STAGE);
     });
 
     it('host env "stage" - override landscape and WCS origin (_stage)', () => {
       window.sessionStorage.setItem(PARAM_ENV, 'stage');
       window.sessionStorage.setItem(PARAM_LANDSCAPE, 'DRAFT');
       const config = { commerce: {}, env: { name: 'stage' }, };
       const settings = getSettings(config);
-      expect(settings.wcsURL).to.equal('https://www.stage.adobe.com/web_commerce_artifact_stage');
+      expect(settings.wcsURL).to.equal(WCS_STAGE_URL);
       expect(settings.landscape).to.equal(Landscape.DRAFT);
+      expect(settings.env).to.equal(Env.STAGE);
     });
 
     it('if host env is "prod" - cant override landscape or WCS origin', () => {
         window.sessionStorage.setItem(PARAM_ENV, 'stage');
         window.sessionStorage.setItem(PARAM_LANDSCAPE, 'DRAFT');
         const config = { commerce: {}, env: { name: 'prod' }, };
         const settings = getSettings(config);
-        expect(settings.wcsURL).to.equal('https://www.adobe.com/web_commerce_artifact');
+        expect(settings.wcsURL).to.equal(WCS_PROD_URL);
         expect(settings.landscape).to.equal(Landscape.PUBLISHED);
+        expect(settings.env).to.equal(Env.PRODUCTION);
     });
 
     [