feat(payment): PAYPAL-4937 updates after review

packages/core/src/common/http-request/responses.mock.ts

@@ -3,7 +3,7 @@ import { Response } from '@bigcommerce/request-sender';
 import { ErrorResponseBody } from '@bigcommerce/checkout-sdk/payment-integration-api';
 
 import { HeadlessPaymentMethodResponse, PaymentResponse } from '../../payment';
-import HeadlessPaymentMethod from '../../payment/headless-payment-method';
+import { HeadlessPaymentMethod } from '../../payment/headless-payment';
 
 export function getResponse<T>(
     body: T,

packages/core/src/payment/headless-payment-methods.mock.ts

@@ -1,4 +1,4 @@
-import HeadlessPaymentMethod from './headless-payment-method';
+import { HeadlessPaymentMethod } from './headless-payment';
 
 export const initializationData = {
     merchantId: '100000',

packages/core/src/payment/headless-payment-request-options.ts → packages/core/src/payment/headless-payment/headless-payment-request-options.ts

@@ -1,4 +1,4 @@
-import { RequestOptions } from '../common/http-request';
+import { RequestOptions } from '../../common/http-request';
 
 export default interface HeadlessPaymentRequestOptions extends RequestOptions {
     body?: { query: string };

packages/core/src/payment/headless-payment/index.ts

@@ -0,0 +1,6 @@
+export { default as HeadlessPaymentMethod } from './headless-payment-method';
+export { default as HeadlessPaymentMethodConfig } from './headless-payment-method-config';
+export { default as HeadlessPaymentRequestOptions } from './headless-payment-request-options';
+
+export { HeadlessPaymentMethodType } from './headless-payment-method-type';
+export { HeadlessPaymentMethodResponse } from './headless-payment-method-response';

packages/core/src/payment/index.ts

@@ -6,7 +6,6 @@ export {
 export * from './payment-method-actions';
 export * from './payment-method-types';
 export * from './payment-status-types';
-export * from './headless-payment-method-type';
 
 export {
     default as PaymentAdditionalAction,
@@ -19,6 +18,12 @@ export { default as isHostedInstrumentLike } from './is-hosted-intrument-like';
 export { default as isNonceLike } from './is-nonce-like';
 export { default as isVaultedInstrument } from './is-vaulted-instrument';
 export { default as PaymentActionCreator } from './payment-action-creator';
+export {
+    HeadlessPaymentMethod,
+    HeadlessPaymentMethodConfig,
+    HeadlessPaymentRequestOptions,
+    HeadlessPaymentMethodResponse,
+} from './headless-payment';
 export {
     default as Payment,
     CreditCardInstrument,
@@ -38,15 +43,12 @@ export {
     WithMollieIssuerInstrument,
 } from './payment';
 export { default as PaymentMethod } from './payment-method';
-export { default as HeadlessPaymentMethod } from './headless-payment-method';
 export { default as PaymentMethodMeta } from './payment-method-meta';
 export { default as PaymentMethodConfig } from './payment-method-config';
-export { default as HeadlessPaymentMethodConfig } from './headless-payment-method-config';
 export { default as InitializationStrategy } from './payment-method-initialization-strategy';
 export { default as PaymentMethodActionCreator } from './payment-method-action-creator';
 export { default as paymentMethodReducer } from './payment-method-reducer';
 export { default as PaymentMethodRequestSender } from './payment-method-request-sender';
-export { default as HeadlessPaymentRequestOptions } from './headless-payment-request-options';
 export {
     default as PaymentMethodSelector,
     PaymentMethodSelectorFactory,
@@ -59,7 +61,6 @@ export { default as PaymentRequestSender } from './payment-request-sender';
 export { default as PaymentRequestTransformer } from './payment-request-transformer';
 export { default as PaymentResponse } from './payment-response';
 export { default as PaymentResponseBody } from './payment-response-body';
-export { HeadlessPaymentMethodResponse } from './headless-payment-method-response';
 export {
     default as PaymentSelector,
     PaymentSelectorFactory,

packages/core/src/payment/payment-method-request-sender.spec.ts

@@ -8,7 +8,7 @@ import {
 import { ContentType, INTERNAL_USE_ONLY, SDK_VERSION_HEADERS } from '../common/http-request';
 import { getHeadlessPaymentResponse, getResponse } from '../common/http-request/responses.mock';
 
-import { HeadlessPaymentMethodResponse } from './headless-payment-method-response';
+import { HeadlessPaymentMethodResponse } from './headless-payment';
 import { getHeadlessPaymentMethod, initializationData } from './headless-payment-methods.mock';
 import PaymentMethod from './payment-method';
 import PaymentMethodRequestSender from './payment-method-request-sender';

packages/core/src/payment/payment-method-request-sender.ts

@@ -7,10 +7,12 @@ import {
     SDK_VERSION_HEADERS,
 } from '../common/http-request';
 
-import HeadlessPaymentMethodConfig from './headless-payment-method-config';
-import { HeadlessPaymentMethodResponse } from './headless-payment-method-response';
-import { HeadlessPaymentMethodType } from './headless-payment-method-type';
-import HeadlessPaymentRequestOptions from './headless-payment-request-options';
+import {
+    HeadlessPaymentMethodConfig,
+    HeadlessPaymentMethodResponse,
+    HeadlessPaymentMethodType,
+    HeadlessPaymentRequestOptions,
+} from './headless-payment';
 import PaymentMethod from './payment-method';
 
 export default class PaymentMethodRequestSender {
@@ -56,8 +58,6 @@ export default class PaymentMethodRequestSender {
         methodId: string,
         options: HeadlessPaymentRequestOptions,
     ): Promise<Response<PaymentMethod>> {
-        const url = `/graphql`;
-
         const entityId = this.getPaymentEntityId(methodId);
 
         const graphQLQuery = `
@@ -82,7 +82,7 @@ export default class PaymentMethodRequestSender {
         };
 
         return this._requestSender
-            .post<HeadlessPaymentMethodResponse>(url, requestOptions)
+            .post<HeadlessPaymentMethodResponse>('/graphql', requestOptions)
             .then((response) => this.transformToPaymentMethodResponse(response, methodId));
     }