Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MWPW-152283: add acom wcs endpoint #12

Merged
merged 2 commits into from
Jun 24, 2024
Merged

MWPW-152283: add acom wcs endpoint #12

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d229755
MWPW-152283: add acom wcs endpoint
3ch023 Jun 24, 2024
c22c3d6
address pr comments
3ch023 Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions commerce/src/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export const Defaults = Object.freeze({
entitlement: false,
extraOptions: {},
modal: false,
upgrade: false,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please don't mix things up

promotionCode: '',
quantity: 1,
wcsApiKey: 'wcms-commerce-ims-ro-user-milo',
Expand Down
1 change: 1 addition & 0 deletions commerce/src/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,7 @@ declare global {
wcsBufferDelay: number;
wcsBufferLimit: number;
wcsEnv: Environment;
domainSwitch: boolean;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we really need to introduce a new parameter with a confusing name:domainSwitch ?
I would like to avoid having to support temporarily introduced parameters for ever.
Can we just switch to this new domain?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is just to verify options request will be gone.
I will remove it in the following PR when actually implementing the switch

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yesil we need both domains to work so we can compare stuff from same domain

}
}
}
Expand Down
4 changes: 4 additions & 0 deletions commerce/src/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ function getSettings(config = {}) {
Defaults.entitlement
);
const modal = toBoolean(getParameter('modal', commerce), Defaults.modal);
const upgrade = toBoolean(getParameter('upgrade', commerce), Defaults.upgrade);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please don't mix things up

const forceTaxExclusive = toBoolean(
getParameter('forceTaxExclusive', commerce),
Defaults.forceTaxExclusive
Expand All @@ -204,6 +205,7 @@ function getSettings(config = {}) {
getParameter('wcsBufferLimit', commerce),
Defaults.wcsBufferLimit
);
const domainSwitch = toBoolean(getParameter('domain.switch', commerce), false);

return {
...getLocaleSettings({ locale }),
Expand All @@ -217,6 +219,7 @@ function getSettings(config = {}) {
entitlement,
extraOptions: Defaults.extraOptions,
modal,
upgrade,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please don't mix things up

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okie, will revert

env,
forceTaxExclusive,
priceLiteralsURL: commerce.priceLiteralsURL,
Expand All @@ -228,6 +231,7 @@ function getSettings(config = {}) {
wcsBufferLimit,
wcsEnv: env === Env.STAGE ? WcsEnv.STAGE : WcsEnv.PRODUCTION,
landscape,
domainSwitch,
};
}

Expand Down
7 changes: 4 additions & 3 deletions commerce/src/wcs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { Log } from './log.js';
const WcsBaseUrl = {
[Env.PRODUCTION]: 'https://wcs.adobe.com',
[Env.STAGE]: 'https://wcs.stage.adobe.com',
['STAGE_ACOM']: 'https://www.stage.adobe.com',
};

/**
Expand All @@ -32,12 +33,12 @@ const WcsBaseUrl = {
*/
export function Wcs({ settings }) {
const log = Log.module('wcs');
const { env, wcsApiKey: apiKey } = settings;

const { env, domainSwitch, wcsApiKey: apiKey } = settings;
const baseUrl = domainSwitch ? WcsBaseUrl['STAGE_ACOM'] : WcsBaseUrl[env];
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is problematic in case you are domainSwitch on and env production, no? i guess we won't have both normally, but still looks weird

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i added acom prod too

// Create @pandora Wcs client.
const fetchOptions = {
apiKey,
baseUrl: WcsBaseUrl[env],
baseUrl,
fetch: window.fetch.bind(window),
};
const getWcsOffers = webCommerceArtifact(fetchOptions);
Expand Down