@tap-payments/apple-pay-button 0.0.85-development → 0.0.86-development

package/build/@types/ApplePayButtonProps.d.ts

@@ -115,6 +115,12 @@ export interface ApplePayButtonProps {
         application: string;
     };
 }
+export interface MerchantValidationRequestData {
+    validationUrl: string;
+    origin: string;
+    merchantId: string;
+    merchantName: string;
+}
 export interface MerchantResponse {
     id: string;
     name: string;

package/build/api.d.ts

@@ -1,4 +1,4 @@
-import { MerchantResponse, CheckoutProfileRequest, ChargeRequestBody, AuthorizeRequestBody } from './@types';
+import { CheckoutProfileRequest, ChargeRequestBody, AuthorizeRequestBody, MerchantValidationRequestData } from './@types';
 export declare const setAxiosGlobalHeaders: (headers: Record<string, string>) => void;
 export declare const getAxiosGlobalHeaders: () => {
     [x: string]: import("axios").AxiosHeaderValue | undefined;
@@ -20,7 +20,7 @@ declare class APPService {
         merchant: any;
         payment_options: any;
     }>;
-    appleSession(merchant: Pick<MerchantResponse, 'name' | 'id'>, validationURL: string, merchantRegisteredDomain: string, merchantIdentifier: string): Promise<any>;
+    appleSession(body: MerchantValidationRequestData): Promise<any>;
     tapTokenization(applePaymentData: Record<string, string>): Promise<any>;
     createCharge(request: ChargeRequestBody): Promise<any>;
     createAuthorize(request: AuthorizeRequestBody): Promise<any>;

package/build/api.js

@@ -149,20 +149,12 @@ var APPService = (function () {
         enumerable: false,
         configurable: true,
         writable: true,
-        value: function (merchant, validationURL, merchantRegisteredDomain, merchantIdentifier) {
+        value: function (body) {
             return __awaiter(this, void 0, void 0, function () {
-                var body, data;
+                var data;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0:
-                            body = {
-                                validationUrl: validationURL,
-                                origin: merchantRegisteredDomain,
-                                merchantIdentifier: merchantIdentifier,
-                                merchantId: merchant.id,
-                                merchantName: merchant.name
-                            };
-                            return [4, axiosInstance.post('/validatemerchant', body)];
+                        case 0: return [4, axiosInstance.post('/validatemerchant', body)];
                         case 1:
                             data = (_a.sent()).data;
                             if (data.errors)

package/build/hooks/useApplePay.js

@@ -103,6 +103,17 @@ export var useApplePay = function (_a) {
             return null;
         return getApplePayPaymentMethod(profileData.payment_options.payment_methods || []);
     }, [profileData]);
+    var merchantValidationRequestData = useMemo(function () {
+        if (!profileData)
+            return null;
+        return {
+            merchantId: merchant.id || (profileData === null || profileData === void 0 ? void 0 : profileData.merchant.id),
+            merchantName: profileData.merchant.name,
+            validationUrl: '',
+            origin: (isWebViewIntegration ? applePayPaymentMethodOptions === null || applePayPaymentMethodOptions === void 0 ? void 0 : applePayPaymentMethodOptions.identifier : merchant.identifier || merchant.id) ||
+                profileData.merchant.id
+        };
+    }, [merchant, profileData === null || profileData === void 0 ? void 0 : profileData.merchant, isWebViewIntegration, applePayPaymentMethodOptions === null || applePayPaymentMethodOptions === void 0 ? void 0 : applePayPaymentMethodOptions.identifier]);
     var initialize = function (metaData) { return __awaiter(void 0, void 0, void 0, function () {
         var headers_1, rest, applePayPreparedData_1, data, applePayPreparedData, err_1;
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
@@ -234,8 +245,10 @@ export var useApplePay = function (_a) {
                                 if (debug) {
                                     console.info("creating merchant session for merchantData: ".concat(JSON.stringify(profileData.merchant), " and validationURL: ").concat(event.validationURL, " and merchant.domain: ").concat(window.location.hostname));
                                 }
-                                return [4, appService.appleSession(__assign(__assign({}, profileData.merchant), { id: merchant.id || profileData.merchant.id }), event.validationURL, window.location.hostname, (isWebViewIntegration ? applePayPaymentMethodOptions === null || applePayPaymentMethodOptions === void 0 ? void 0 : applePayPaymentMethodOptions.identifier : merchant.identifier || merchant.id) ||
-                                        profileData.merchant.id)];
+                                if (!merchantValidationRequestData) {
+                                    throw new Error('Merchant Validation Request Data is not prepared!');
+                                }
+                                return [4, appService.appleSession(__assign(__assign({}, merchantValidationRequestData), { validationUrl: event.validationURL }))];
                             case 2:
                                 merchantSession = _a.sent();
                                 if (debug)
@@ -407,12 +420,19 @@ export var useApplePay = function (_a) {
     var handleClick = useCallback(function () {
         var _a, _b;
         if (isIframeIntegration) {
-            (_a = buttonProps.onClick) === null || _a === void 0 ? void 0 : _a.call(buttonProps, __assign(__assign({}, applePayRequestConfiguration), { applePayRequestData: applePayRequestData }));
+            (_a = buttonProps.onClick) === null || _a === void 0 ? void 0 : _a.call(buttonProps, __assign(__assign({}, applePayRequestConfiguration), { merchantValidationRequestData: merchantValidationRequestData, applePayRequestData: applePayRequestData }));
             return;
         }
         onApplePayButtonClicked();
         (_b = buttonProps.onClick) === null || _b === void 0 ? void 0 : _b.call(buttonProps);
-    }, [applePayRequestConfiguration, applePayRequestData, buttonProps, isIframeIntegration, onApplePayButtonClicked]);
+    }, [
+        applePayRequestConfiguration,
+        applePayRequestData,
+        buttonProps,
+        isIframeIntegration,
+        onApplePayButtonClicked,
+        merchantValidationRequestData
+    ]);
     useEffect(function () {
         initialize(metaData);
     }, []);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/apple-pay-button",
-	"version": "0.0.85-development",
+	"version": "0.0.86-development",
 	"description": "Apple Pay Button React Component",
 	"main": "build/index.js",
 	"module": "build/index.js",