@salla.sa/applepay 2.13.101 → 2.13.103

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salla.sa/applepay",
-  "version": "2.13.101",
+  "version": "2.13.103",
   "description": "Salla Apple Pay light",
   "main": "dist/app.js",
   "scripts": {
@@ -26,5 +26,5 @@
   "dependencies": {
     "axios": "^0.23.0"
   },
-  "gitHead": "e09dc44f0a3fe0aba76ab19a269377841da7bff4"
+  "gitHead": "2011314e946caa20b07530ab034a8956b9f3a648"
 }

package/src/index.js

@@ -1,5 +1,6 @@
 import Http from './http';
 import DetectOS from './DetectOS';
+import { mutateShipmentAddress } from './utils';
 
 window.Salla = window.Salla || {};
 window.Salla.Payments = window.Salla.Payments || {};
@@ -204,9 +205,12 @@ window.SallaApplePay = {
      *
      * @param event
      */
-    onPaymentAuthorized: (event) => {
+    onPaymentAuthorized: async (event) => {
         salla.logger.log('🍏 Pay: onPaymentAuthorized', event.payment);
 
+        // Update the payment address
+        await mutateShipmentAddress(SallaApplePay, event.payment.shippingContact, true);
+
         Salla.event.dispatch('payments::apple-pay.authorized.init', event);
         Http.post(SallaApplePay.detail.authorized.url.replace('{id}', SallaApplePay.id), {
             payment_method: 'apple_pay',
@@ -295,107 +299,8 @@ window.SallaApplePay = {
     onShippingContactSelected: async (event) => {
         salla.logger.log('🍏 Pay: onShippingContactSelected', event.shippingContact);
 
-        if (!SallaApplePay.detail.requiredShippingContactFields) {
-            return;
-        }
-
-        // Create New Address
-        return Http.post(SallaApplePay.detail.shippingContactSelected.url.replace('{id}', SallaApplePay.id),
-            {
-                'country': event.shippingContact.country,
-                'city': event.shippingContact.locality,
-                'local': event.shippingContact.subLocality,
-                'description': event.shippingContact.subAdministrativeArea,
-                'street': event.shippingContact.administrativeArea,
-                'country_code': event.shippingContact.countryCode,
-                'postal_code': event.shippingContact.postalCode
-            },
-            async ({data}) => {
-                if (typeof SallaApplePay.detail.shippingContactSelected.onSuccess === 'function') {
-                    SallaApplePay.detail.shippingContactSelected.onSuccess(data);
-                }
-
-                SallaApplePay.address_id = data.data.address_id;
-                SallaApplePay.shipping_methods = data.data.shipping_methods;
-
-                if (!SallaApplePay.shipping_methods || (SallaApplePay.shipping_methods && !SallaApplePay.shipping_methods.length)) {
-                    salla.logger.warn('🍏 Pay: We dont found any supported methods', data);
-
-                    return SallaApplePay.session.completeShippingContactSelection({
-                        status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
-                        errors: [
-                            new window.ApplePayError('addressUnserviceable')
-                        ]
-                    });
-                }
-
-                try {
-                    await SallaApplePay.selectApplePayShippingMethod(SallaApplePay.shipping_methods[0]['ship_id'], SallaApplePay.shipping_methods[0]['private_ship_id']);
-                } catch (error) {
-                    salla.logger.warn('Failed set the shipping details to api', error);
-
-                    return SallaApplePay.session.completeShippingContactSelection({
-                        status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
-                        errors: [
-                            new window.ApplePayError('addressUnserviceable')
-                        ]
-                    });
-                }
-
-                try {
-                    await SallaApplePay.recalculateTotal();
-                } catch (error) {
-                    salla.logger.warn('🍏 Pay: Failed recalculate total', error);
-
-                    return SallaApplePay.session.completeShippingContactSelection({
-                        status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
-                        errors: [
-                            new window.ApplePayError('addressUnserviceable')
-                        ]
-                    });
-                }
-
-                SallaApplePay.session.completeShippingContactSelection({
-                    newTotal: SallaApplePay.prepareTotal(),
-                    newLineItems: SallaApplePay.prepareLineItems(),
-                    newShippingMethods: SallaApplePay.mappingShippingMethods(SallaApplePay.shipping_methods)
-                });
-
-            }, ({response}) => {
-                salla.logger.warn('🍏 Pay: Failed add address via api', response);
-
-                if (typeof SallaApplePay.detail.shippingContactSelected.onFailed === 'function') {
-                    SallaApplePay.detail.shippingContactSelected.onFailed(response);
-                }
-
-                // parse 422 errors
-                let fields = response?.data?.error?.fields;
-
-                let errors = [];
-
-                if (fields?.country_code) {
-                    errors.push(new window.ApplePayError('shippingContactInvalid', 'countryCode', fields?.country_code[0]))
-                }
-
-                if (fields?.city) {
-                    errors.push(new window.ApplePayError('shippingContactInvalid', 'locality', fields?.city[0]))
-                }
-
-                if (fields?.country) {
-                    errors.push(new window.ApplePayError('shippingContactInvalid', 'country', fields?.country[0]))
-                }
-
-                if (errors.length === 0 && response?.data?.error?.message) {
-                    errors.push(new window.ApplePayError('shippingContactInvalid', 'locality', response?.data?.error?.message))
-                }
-
-                SallaApplePay.session.completeShippingContactSelection({
-                    newTotal: SallaApplePay.prepareTotal(),
-                    newLineItems: SallaApplePay.prepareLineItems(),
-                    status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
-                    errors: errors
-                });
-            });
+        // create address for shipping calculation
+        mutateShipmentAddress(SallaApplePay, event.shippingContact);
     },
 
     /**

package/src/utils.js

@@ -0,0 +1,137 @@
+import http from "./http";
+
+/**
+ * @typedef {Object} ApplePayPaymentContact
+ * @property {string} phoneNumber
+ * @property {string} emailAddress
+ * @property {string} givenName
+ * @property {string} familyName
+ * @property {string} [phoneticGivenName]
+ * @property {string} [phoneticFamilyName]
+ * @property {string[]} addressLines
+ * @property {string} [subLocality]
+ * @property {string} locality
+ * @property {string} postalCode
+ * @property {string} [subAdministrativeArea]
+ * @property {string} administrativeArea
+ * @property {string} country
+ * @property {string} countryCode
+ */
+
+
+/**
+ *
+ * @param {SallaApplePay} SallaApplePay
+ * @param {boolean} isAuthorized
+ * @param {ApplePayPaymentContact} shippingContact
+ *
+ */
+export function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthorized = false) {
+  console.log('mutateShipmentAddress called', shippingContact, isAuthorized);
+
+  if (!SallaApplePay.detail.requiredShippingContactFields) {
+    return;
+  }
+
+  return http.post(
+    SallaApplePay.detail.shippingContactSelected.url.replace('{id}', SallaApplePay.id),
+    {
+      'country': shippingContact.country,
+      'city': shippingContact.locality,
+      'local': shippingContact.subLocality,
+      'description': shippingContact.subAdministrativeArea,
+      'street': shippingContact.addressLines?.join(", ") || shippingContact.administrativeArea,
+      'country_code': shippingContact.countryCode,
+      'postal_code': shippingContact.postalCode,
+      'is_authorized': isAuthorized
+    },
+    async ({ data }) => {
+      if (isAuthorized) { return }
+      if (typeof SallaApplePay.detail.shippingContactSelected.onSuccess === 'function') {
+        SallaApplePay.detail.shippingContactSelected.onSuccess(data);
+      }
+
+      SallaApplePay.address_id = data.data.address_id;
+      SallaApplePay.shipping_methods = data.data.shipping_methods;
+
+      if (!SallaApplePay.shipping_methods || (SallaApplePay.shipping_methods && !SallaApplePay.shipping_methods.length)) {
+        salla.logger.warn('🍏 Pay: We dont found any supported methods', data);
+
+        return SallaApplePay.session.completeShippingContactSelection({
+          status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
+          errors: [
+            new window.ApplePayError('addressUnserviceable')
+          ]
+        });
+      }
+
+      try {
+        await SallaApplePay.selectApplePayShippingMethod(SallaApplePay.shipping_methods[0]['ship_id'], SallaApplePay.shipping_methods[0]['private_ship_id']);
+      } catch (error) {
+        salla.logger.warn('Failed set the shipping details to api', error);
+
+        return SallaApplePay.session.completeShippingContactSelection({
+          status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
+          errors: [
+            new window.ApplePayError('addressUnserviceable')
+          ]
+        });
+      }
+
+      try {
+        await SallaApplePay.recalculateTotal();
+      } catch (error) {
+        salla.logger.warn('🍏 Pay: Failed recalculate total', error);
+
+        return SallaApplePay.session.completeShippingContactSelection({
+          status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
+          errors: [
+            new window.ApplePayError('addressUnserviceable')
+          ]
+        });
+      }
+
+      SallaApplePay.session.completeShippingContactSelection({
+        newTotal: SallaApplePay.prepareTotal(),
+        newLineItems: SallaApplePay.prepareLineItems(),
+        newShippingMethods: SallaApplePay.mappingShippingMethods(SallaApplePay.shipping_methods)
+      });
+
+    },
+    ({ response }) => {
+      salla.logger.warn('🍏 Pay: Failed add address via api', response);
+
+      if (typeof SallaApplePay.detail.shippingContactSelected.onFailed === 'function') {
+        SallaApplePay.detail.shippingContactSelected.onFailed(response);
+      }
+
+      // parse 422 errors
+      let fields = response?.data?.error?.fields;
+
+      let errors = [];
+
+      if (fields?.country_code) {
+        errors.push(new window.ApplePayError('shippingContactInvalid', 'countryCode', fields?.country_code[0]))
+      }
+
+      if (fields?.city) {
+        errors.push(new window.ApplePayError('shippingContactInvalid', 'locality', fields?.city[0]))
+      }
+
+      if (fields?.country) {
+        errors.push(new window.ApplePayError('shippingContactInvalid', 'country', fields?.country[0]))
+      }
+
+      if (errors.length === 0 && response?.data?.error?.message) {
+        errors.push(new window.ApplePayError('shippingContactInvalid', 'locality', response?.data?.error?.message))
+      }
+
+      SallaApplePay.session.completeShippingContactSelection({
+        newTotal: SallaApplePay.prepareTotal(),
+        newLineItems: SallaApplePay.prepareLineItems(),
+        status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
+        errors: errors
+      });
+    }
+  );
+}