@tap-payments/apple-pay-button 1.2.4 → 1.2.6

package/build/hooks/useApplePay.js

@@ -61,6 +61,7 @@ import appService from '../api/app.service';
 import { ApplePayVersion, FALLBACK_MERCHANT_IDENTIFIER, Integration } from '../constants';
 import { setAxiosGlobalHeaders } from '../api/httpClient';
 import { getApplePayPaymentMethod, getApplePayRequest, validateCurrency, validateSupportedNetworks } from '../utils/config';
+import { shapeApplePayError } from '../utils';
 import { getMerchantCapaplities } from '../utils/defaultValues';
 import { useApplePayScript } from './useApplePayScript';
 export var useApplePay = function (_a) {
@@ -139,7 +140,7 @@ export var useApplePay = function (_a) {
                     return [3, 6];
                 case 4:
                     err_1 = _h.sent();
-                    onError && onError(err_1.errors || err_1);
+                    onError && onError(shapeApplePayError(err_1));
                     return [3, 6];
                 case 5:
                     setLoading(false);
@@ -155,8 +156,7 @@ export var useApplePay = function (_a) {
     }, [isScriptLoaded, initialize, metaData]);
     var onApplePayButtonClicked = function () { return __awaiter(void 0, void 0, void 0, function () {
         var ApplePaySession, paymentMethod_1, currency, cardBrands, request, session_1;
-        var _a;
-        return __generator(this, function (_b) {
+        return __generator(this, function (_a) {
             ApplePaySession = window.ApplePaySession;
             if (!ApplePaySession) {
                 setDisabled(true);
@@ -266,8 +266,6 @@ export var useApplePay = function (_a) {
                                 return [3, 8];
                             case 7:
                                 console.error('We only support AppleToken and TapToken for now');
-                                console.info('Completing payment with status: STATUS_FAILURE');
-                                session_1.completePayment({ status: ApplePaySession.STATUS_FAILURE });
                                 throw new Error('We only support AppleToken and TapToken for now');
                             case 8: return [3, 11];
                             case 9:
@@ -275,7 +273,8 @@ export var useApplePay = function (_a) {
                                 if (debug)
                                     console.error('error in onpaymentauthorized', error_2);
                                 session_1.completePayment({ status: ApplePaySession.STATUS_FAILURE });
-                                throw error_2;
+                                onError && onError(shapeApplePayError(error_2));
+                                return [3, 11];
                             case 10:
                                 setLoading(false);
                                 return [7];
@@ -367,21 +366,7 @@ export var useApplePay = function (_a) {
                 session_1.begin();
             }
             catch (e) {
-                if (!onError)
-                    return [2];
-                if (e.errors) {
-                    onError(e.errors);
-                    return [2];
-                }
-                if ((_a = e.response) === null || _a === void 0 ? void 0 : _a.data.errors) {
-                    onError(e.response.data.errors);
-                    return [2];
-                }
-                if (e.message) {
-                    onError([{ description: e.message, code: '400' }]);
-                    return [2];
-                }
-                onError(e);
+                onError && onError(shapeApplePayError(e));
             }
             return [2];
         });

package/build/utils/error.d.ts

@@ -0,0 +1 @@
+export declare const shapeApplePayError: (error: any) => any;

package/build/utils/error.js

@@ -0,0 +1,13 @@
+export var shapeApplePayError = function (error) {
+    var _a, _b;
+    if (error === null || error === void 0 ? void 0 : error.errors) {
+        return error.errors;
+    }
+    if ((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.errors) {
+        return error.response.data.errors;
+    }
+    if (error === null || error === void 0 ? void 0 : error.message) {
+        return [{ description: error.message, code: '400' }];
+    }
+    return error;
+};

package/build/utils/index.d.ts

@@ -1 +1,2 @@
 export * from './html';
+export * from './error';

package/build/utils/index.js

@@ -1 +1,2 @@
 export * from './html';
+export * from './error';

package/package.json

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