feat(payment): PAYPAL-4937 updates related to new requirements

bc-nick · bc-nick · commit 060d1b0cdc36 · 2025-02-27T19:36:54.000+01:00
diff --git a/packages/core/src/cart/cart-action-creator.ts b/packages/core/src/cart/cart-action-creator.ts
@@ -6,7 +6,6 @@ import { RequestOptions } from '@bigcommerce/checkout-sdk/payment-integration-ap
 import { InternalCheckoutSelectors } from '../checkout';
 import { cachableAction } from '../common/data-store';
 import ActionOptions from '../common/data-store/action-options';
-import { MissingDataError, MissingDataErrorType } from '../common/error/errors';
 
 import { CartActionType, LoadCartAction } from './cart-actions';
 import CartRequestSender from './cart-request-sender';
@@ -22,22 +21,12 @@ export default class CartActionCreator {
         return (store) => {
             return Observable.create((observer: Observer<LoadCartAction>) => {
                 const state = store.getState();
-                const jwtToken = state.config.getStorefrontJwtToken();
-
-                if (!jwtToken) {
-                    throw new MissingDataError(MissingDataErrorType.MissingPaymentToken);
-                }
+                const host = state.config.getHost();
 
                 observer.next(createAction(CartActionType.LoadCartRequested, undefined));
 
                 this._cartRequestSender
-                    .loadCard(cartId, {
-                        headers: {
-                            Authorization: `Bearer ${jwtToken}`,
-                            'Content-Type': 'application/json',
-                        },
-                        ...options,
-                    })
+                    .loadCard(cartId, host, options)
                     .then((response) => {
                         observer.next(
                             createAction(CartActionType.LoadCartSucceeded, response.body),
diff --git a/packages/core/src/cart/cart-request-sender.ts b/packages/core/src/cart/cart-request-sender.ts
@@ -6,29 +6,18 @@ import { ContentType, RequestOptions, SDK_VERSION_HEADERS } from '../common/http
 
 import { LineItemMap } from './index';
 
-interface LoadCartRequestOptions extends RequestOptions {
-    body?: { query: string };
-    headers: { Authorization: string; [key: string]: string };
-}
-
 interface LoadCartResponse {
-    data: {
-        site: {
-            cart: {
-                amount: {
-                    currencyCode: string;
-                };
-                entityId: string;
-                lineItems: {
-                    physicalItems: Array<{
-                        name: string;
-                        entityId: string;
-                        quantity: string;
-                        productEntityId: string;
-                    }>;
-                };
-            };
-        };
+    amount: {
+        currencyCode: string;
+    };
+    entityId: string;
+    lineItems: {
+        physicalItems: Array<{
+            name: string;
+            entityId: string;
+            quantity: string;
+            productEntityId: string;
+        }>;
     };
 }
 
@@ -48,113 +37,27 @@ export default class CartRequestSender {
         return this._requestSender.post(url, { body, headers, timeout });
     }
 
-    loadCard(cartId: string, options: LoadCartRequestOptions): Promise<Response<Cart>> {
-        const url = `/graphql`;
-
-        const graphQLQuery = `
-        query {
-            site {
-                cart(entityId: "${cartId}") {
-                  currencyCode
-                  entityId
-                  id
-                  isTaxIncluded
-                  discounts {
-                    entityId
-                    discountedAmount {
-                      currencyCode
-                      value
-                    }
-                  }
-                  discountedAmount {
-                    currencyCode
-                    value
-                  }
-                  baseAmount {
-                    currencyCode
-                    value
-                  }
-                  amount {
-                    currencyCode
-                    value
-                  }
-                  lineItems {
-                    physicalItems {
-                      brand
-                      couponAmount {
-                        value
-                      }
-                      discountedAmount {
-                        value
-                      }
-                      discounts {
-                        discountedAmount {
-                          value
-                        }
-                        entityId
-                      }
-                      extendedListPrice {
-                        value
-                      }
-                      extendedSalePrice {
-                        value
-                      }
-                      giftWrapping {
-                        amount {
-                          value
-                        }
-                        message
-                        name
-                      }
-                      isShippingRequired
-                      isTaxable
-                      listPrice {
-                        value
-                      }
-                      name
-                      originalPrice {
-                        value
-                      }
-                      entityId
-                      quantity
-                      salePrice {
-                        value
-                      }
-                      sku
-                      url
-                    }
-                  }
-                }
-              }
-        }`;
+    loadCard(cartId: string, host?: string, options?: RequestOptions): Promise<Response<Cart>> {
+        const path = 'cart-information';
+        const url = host ? `${host}/${path}` : `/${path}`;
 
-        const requestOptions: LoadCartRequestOptions = {
+        const requestOptions: RequestOptions = {
             ...options,
-            headers: {
-                ...options.headers,
-                'Content-Type': 'application/json',
-            },
-            body: {
-                query: graphQLQuery,
+            params: {
+                cartId,
             },
         };
 
         return this._requestSender
-            .post<LoadCartResponse>(url, {
+            .get<LoadCartResponse>(url, {
                 ...requestOptions,
             })
             .then(this.transformToCartResponse);
     }
 
     private transformToCartResponse(response: Response<LoadCartResponse>): Response<Cart> {
         const {
-            body: {
-                data: {
-                    site: {
-                        cart: { amount, entityId, lineItems },
-                    },
-                },
-            },
+            body: { amount, entityId, lineItems },
         } = response;
 
         const mappedLineItems: LineItemMap = {
diff --git a/packages/core/src/checkout-buttons/create-headless-checkout-wallet-initializer.ts b/packages/core/src/checkout-buttons/create-headless-checkout-wallet-initializer.ts
@@ -14,14 +14,12 @@ import HeadlessCheckoutWalletStrategyActionCreator from './headless-checkout-wal
 export default function createHeadlessCheckoutWalletInitializer(
     options?: HeadlessCheckoutWalletInitializerOptions,
 ): HeadlessCheckoutWalletInitializer {
-    const { host, locale = 'en', storefrontJwtToken, siteLink } = options ?? {};
+    const { host, locale = 'en' } = options ?? {};
 
     const config: ConfigState = {
         meta: {
             host,
             locale,
-            storefrontJwtToken,
-            siteLink,
         },
         errors: {},
         statuses: {},
diff --git a/packages/core/src/checkout-buttons/headless-checkout-wallet-initializer-options.ts b/packages/core/src/checkout-buttons/headless-checkout-wallet-initializer-options.ts
@@ -1,6 +1,4 @@
 export default interface HeadlessCheckoutWalletInitializerOptions {
     host?: string;
     locale?: string;
-    storefrontJwtToken?: string;
-    siteLink?: string;
 }
diff --git a/packages/core/src/checkout-buttons/headless-checkout-wallet-initializer.ts b/packages/core/src/checkout-buttons/headless-checkout-wallet-initializer.ts
@@ -5,8 +5,8 @@ import { isElementId, setUniqueElementId } from '../common/dom';
 
 import { CheckoutButtonInitializeOptions, CheckoutButtonOptions } from './checkout-button-options';
 import CheckoutButtonSelectors from './checkout-button-selectors';
-import HeadlessCheckoutWalletStrategyActionCreator from './headless-checkout-wallet-strategy-action-creator';
 import createCheckoutButtonSelectors from './create-checkout-button-selectors';
+import HeadlessCheckoutWalletStrategyActionCreator from './headless-checkout-wallet-strategy-action-creator';
 
 @bind
 export default class HeadlessCheckoutWalletInitializer {
diff --git a/packages/core/src/config/config-selector.ts b/packages/core/src/config/config-selector.ts
@@ -18,8 +18,6 @@ export default interface ConfigSelector {
     getHost(): string | undefined;
     getLocale(): string | undefined;
     getVariantIdentificationToken(): string | undefined;
-    getStorefrontJwtToken(): string | undefined;
-    getSiteLink(): string | undefined;
     getLoadError(): Error | undefined;
     isLoading(): boolean;
 }
@@ -102,16 +100,6 @@ export function createConfigSelectorFactory(): ConfigSelectorFactory {
         (data) => () => data,
     );
 
-    const getStorefrontJwtToken = createSelector(
-        (state: ConfigState) => state.meta && state.meta.storefrontJwtToken,
-        (data) => () => data,
-    );
-
-    const getSiteLink = createSelector(
-        (state: ConfigState) => state.meta && state.meta.siteLink,
-        (data) => () => data,
-    );
-
     const getLoadError = createSelector(
         (state: ConfigState) => state.errors.loadError,
         (error) => () => error,
@@ -134,8 +122,6 @@ export function createConfigSelectorFactory(): ConfigSelectorFactory {
                 getHost: getHost(state),
                 getLocale: getLocale(state),
                 getVariantIdentificationToken: getVariantIdentificationToken(state),
-                getStorefrontJwtToken: getStorefrontJwtToken(state),
-                getSiteLink: getSiteLink(state),
                 getLoadError: getLoadError(state),
                 isLoading: isLoading(state),
             };
diff --git a/packages/core/src/config/config-state.ts b/packages/core/src/config/config-state.ts
@@ -12,8 +12,6 @@ export interface ConfigMetaState {
     variantIdentificationToken?: string;
     host?: string;
     locale?: string;
-    storefrontJwtToken?: string;
-    siteLink?: string;
 }
 
 export interface ConfigErrorsState {
diff --git a/packages/core/src/payment-integration/create-payment-integration-selectors.ts b/packages/core/src/payment-integration/create-payment-integration-selectors.ts
@@ -14,8 +14,6 @@ export default function createPaymentIntegrationSelectors({
         getStoreConfig,
         getStoreConfigOrThrow,
         getConfig,
-        getStorefrontJwtToken,
-        getSiteLink,
     },
     consignments: { getConsignments, getConsignmentsOrThrow },
     countries: { getCountries },
@@ -82,8 +80,6 @@ export default function createPaymentIntegrationSelectors({
         getPaymentStatusOrThrow,
         getPaymentRedirectUrl,
         getPaymentRedirectUrlOrThrow,
-        getStorefrontJwtToken,
-        getSiteLink,
         getPaymentMethod: clone(getPaymentMethod),
         getPaymentMethodOrThrow: clone(getPaymentMethodOrThrow),
         getPaymentMethodsMeta: clone(getPaymentMethodsMeta),
diff --git a/packages/core/src/payment/payment-method-action-creator.ts b/packages/core/src/payment/payment-method-action-creator.ts
@@ -4,7 +4,6 @@ import { Observable, Observer } from 'rxjs';
 
 import { InternalCheckoutSelectors } from '../checkout';
 import { ActionOptions, cachableAction } from '../common/data-store';
-import { MissingDataError, MissingDataErrorType } from '../common/error/errors';
 import { RequestOptions } from '../common/http-request';
 
 import {
@@ -169,11 +168,7 @@ export default class PaymentMethodActionCreator {
         return (store) =>
             Observable.create((observer: Observer<LoadPaymentMethodAction>) => {
                 const state = store.getState();
-                const jwtToken = state.config.getStorefrontJwtToken();
-
-                if (!jwtToken) {
-                    throw new MissingDataError(MissingDataErrorType.MissingPaymentToken);
-                }
+                const host = state.config.getHost();
 
                 observer.next(
                     createAction(PaymentMethodActionType.LoadPaymentMethodRequested, undefined, {
@@ -182,13 +177,7 @@ export default class PaymentMethodActionCreator {
                 );
 
                 this._requestSender
-                    .loadPaymentWalletWithInitializationData(methodId, {
-                        headers: {
-                            Authorization: `Bearer ${jwtToken}`,
-                            'Content-Type': 'application/json',
-                        },
-                        ...options,
-                    })
+                    .loadPaymentWalletWithInitializationData(methodId, host, options)
                     .then((response) => {
                         observer.next(
                             createAction(
diff --git a/packages/core/src/payment/payment-method-request-sender.ts b/packages/core/src/payment/payment-method-request-sender.ts
@@ -20,11 +20,6 @@ const paymentMethodConfig: Record<string, HeadlessPaymentMethodType> = {
     paypalcommercecredit: HeadlessPaymentMethodType.PAYPALCOMMERCECREDIT,
 };
 
-interface LoadPaymentWalletWithInitializationDataRequestOptions extends RequestOptions {
-    body?: { query: string };
-    headers: { Authorization: string; [key: string]: string };
-}
-
 interface LoadPaymentMethodResponse<T = any> {
     data: {
         site: {
@@ -78,31 +73,17 @@ export default class PaymentMethodRequestSender {
 
     loadPaymentWalletWithInitializationData(
         methodId: string,
-        options: LoadPaymentWalletWithInitializationDataRequestOptions,
+        host?: string,
+        { timeout }: RequestOptions = {},
     ): Promise<Response<PaymentMethod>> {
-        const url = `/graphql`;
-
-        const entityId = this.getPaymentEntityId(methodId);
-
-        const graphQLQuery = `
-            query {
-                site {
-                    paymentWalletWithInitializationData(filter: {paymentWalletEntityId: "${entityId}"}) {
-                        clientToken
-                        initializationData
-                    }
-                }
-            }
-        `;
-
-        const requestOptions: LoadPaymentWalletWithInitializationDataRequestOptions = {
-            headers: {
-                ...options.headers,
-                'Content-Type': 'application/json',
-            },
+        const path = 'get-initialization-data';
+        const url = host ? `${host}/${path}` : `/${path}`;
+
+        const requestOptions = {
             body: {
-                query: graphQLQuery,
+                entityId: this.getPaymentEntityId(methodId),
             },
+            timeout,
         };
 
         return this._requestSender
diff --git a/packages/payment-integration-api/src/payment-integration-selectors.ts b/packages/payment-integration-api/src/payment-integration-selectors.ts
@@ -83,10 +83,6 @@ export default interface PaymentIntegrationSelectors {
 
     getConfig(): Config | undefined;
 
-    getStorefrontJwtToken(): string | undefined;
-
-    getSiteLink(): string | undefined;
-
     getInstrumentsMeta(): InstrumentMeta | undefined;
 
     getOrderMeta(): OrderMetaState | undefined;
diff --git a/packages/payment-integrations-test-utils/src/test-utils/payment-integration-service.mock.ts b/packages/payment-integrations-test-utils/src/test-utils/payment-integration-service.mock.ts
@@ -59,8 +59,6 @@ const state = {
     getPaymentRedirectUrl: jest.fn(),
     getPaymentRedirectUrlOrThrow: jest.fn(),
     isPaymentDataRequired: jest.fn(),
-    getStorefrontJwtToken: jest.fn(),
-    getSiteLink: jest.fn(),
 };
 
 const createBuyNowCart = jest.fn(() => Promise.resolve(getCart()));
diff --git a/packages/paypal-commerce-integration/src/create-paypal-commerce-integration-service.ts b/packages/paypal-commerce-integration/src/create-paypal-commerce-integration-service.ts
diff --git a/packages/paypal-commerce-integration/src/paypal-commerce-credit/paypal-commerce-credit-headless-wallet-strategy.ts b/packages/paypal-commerce-integration/src/paypal-commerce-credit/paypal-commerce-credit-headless-wallet-strategy.ts
diff --git a/packages/paypal-commerce-integration/src/paypal-commerce-integration-service.ts b/packages/paypal-commerce-integration/src/paypal-commerce-integration-service.ts
diff --git a/packages/paypal-commerce-integration/src/paypal-commerce-request-sender.ts b/packages/paypal-commerce-integration/src/paypal-commerce-request-sender.ts
diff --git a/packages/paypal-commerce-integration/src/paypal-commerce-types.ts b/packages/paypal-commerce-integration/src/paypal-commerce-types.ts
diff --git a/packages/paypal-commerce-integration/src/paypal-commerce/paypal-commerce-headless-wallet-strategy.ts b/packages/paypal-commerce-integration/src/paypal-commerce/paypal-commerce-headless-wallet-strategy.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`export default interface HeadlessCheckoutWalletInitializerOptions {`
`2`	`2`	`host?: string;`
`3`	`3`	`locale?: string;`
`4`		`- storefrontJwtToken?: string;`
`5`		`- siteLink?: string;`
`6`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ export interface ConfigMetaState {`
`12`	`12`	`variantIdentificationToken?: string;`
`13`	`13`	`host?: string;`
`14`	`14`	`locale?: string;`
`15`		`- storefrontJwtToken?: string;`
`16`		`- siteLink?: string;`
`17`	`15`	`}`
`18`	`16`
`19`	`17`	`export interface ConfigErrorsState {`