@salla.sa/applepay 3.0.0-alpha.0 → 3.0.0

package/src/utils.js

@@ -26,10 +26,55 @@ import http from "./http";
  * @param {ApplePayPaymentContact} shippingContact
  *
  */
-export function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthorized = false) {
-  console.log('mutateShipmentAddress called', shippingContact, isAuthorized);
+export async function mutateShippingContact(SallaApplePay, shippingContact, isAuthorized = false) {
+  salla.logger.log('🍏 Pay: mutateShippingContact called', shippingContact, isAuthorized);
 
-  if (!SallaApplePay.detail.requiredShippingContactFields) {
+  if (!SallaApplePay.detail.requiredShippingContactFields || SallaApplePay.detail.requiredShippingContactFields.length == 0) {
+    return;
+  }
+
+  if (isAuthorized) {
+    if (isGuestCheckout()) {
+
+      if (
+        !shippingContact.emailAddress ||
+        !shippingContact.givenName ||
+        !shippingContact.familyName ||
+        !shippingContact.phoneNumber
+      ) {
+  
+        salla.logger.warn('🍏 Pay: Guest contact fields are required', shippingContact);
+  
+        const errors = [];
+        if (!shippingContact.emailAddress) {
+          errors.push(new window.ApplePayError('shippingContactInvalid', 'emailAddress', 'Email address is required'));
+        }
+
+        if (!shippingContact.phoneNumber) {
+          errors.push(new window.ApplePayError('shippingContactInvalid', 'phoneNumber', 'Phone number is required'));
+        }
+
+        if (!shippingContact.givenName || !shippingContact.familyName) {
+          errors.push(new window.ApplePayError('shippingContactInvalid', 'name', 'Name is required'));
+        }
+
+        SallaApplePay.session.completePayment({
+          status: SallaApplePay.session.STATUS_INVALID_SHIPPING_CONTACT,
+          errors: errors
+        });
+
+        return;
+      }
+
+      await updateGuestContact(SallaApplePay, shippingContact);
+
+    }
+
+    // if authorized and not guest checkout, do nothing address already added
+    return;
+  }
+
+  if (!SallaApplePay.detail.requiredShippingContactFields.includes('postalAddress')) {
     return;
   }
 
@@ -38,15 +83,13 @@ export function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthoriz
     {
       'country': shippingContact.country,
       'city': shippingContact.locality,
-      'local': shippingContact.subLocality,
+      'local': shippingContact.subLocality || shippingContact.administrativeArea || shippingContact.locality,
       '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);
       }
@@ -57,25 +100,29 @@ export function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthoriz
       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({
+        SallaApplePay.session.completeShippingContactSelection({
           status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
           errors: [
             new window.ApplePayError('addressUnserviceable')
           ]
         });
+
+        return
       }
 
       try {
-        await SallaApplePay.selectApplePayShippingMethod(SallaApplePay.shipping_methods[0]['ship_id'], SallaApplePay.shipping_methods[0]['private_ship_id']);
+        await SallaApplePay.selectApplePayShippingMethod(SallaApplePay.shipping_methods[0]);
       } catch (error) {
         salla.logger.warn('Failed set the shipping details to api', error);
 
-        return SallaApplePay.session.completeShippingContactSelection({
+        SallaApplePay.session.completeShippingContactSelection({
           status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
           errors: [
             new window.ApplePayError('addressUnserviceable')
           ]
         });
+
+        return;
       }
 
       try {
@@ -83,20 +130,25 @@ export function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthoriz
       } catch (error) {
         salla.logger.warn('🍏 Pay: Failed recalculate total', error);
 
-        return SallaApplePay.session.completeShippingContactSelection({
+        SallaApplePay.session.completeShippingContactSelection({
           status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
           errors: [
             new window.ApplePayError('addressUnserviceable')
           ]
         });
+
+        return;
       }
 
-      SallaApplePay.session.completeShippingContactSelection({
+      const updatedShippingContactSelection = {
         newTotal: SallaApplePay.prepareTotal(),
         newLineItems: SallaApplePay.prepareLineItems(),
         newShippingMethods: SallaApplePay.mappingShippingMethods(SallaApplePay.shipping_methods)
-      });
+      };
 
+      salla.logger.log('🍏 Pay: completeShippingContactSelection', updatedShippingContactSelection);
+
+      SallaApplePay.session.completeShippingContactSelection(updatedShippingContactSelection);
     },
     ({ response }) => {
       salla.logger.warn('🍏 Pay: Failed add address via api', response);
@@ -108,19 +160,11 @@ export function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthoriz
       // 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]))
-      }
+      let errors = getApplePayErrors({
+        countryCode: fields?.country_code && fields.country_code.length > 0 ? fields.country_code[0] : null,
+        locality: fields?.city && fields.city.length > 0 ? fields.city[0] : null,
+        country: fields?.country && fields.country.length > 0 ? fields.country[0] : null,
+      });
 
       if (errors.length === 0 && response?.data?.error?.message) {
         errors.push(new window.ApplePayError('shippingContactInvalid', 'locality', response?.data?.error?.message))
@@ -135,3 +179,53 @@ export function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthoriz
     }
   );
 }
+
+function isGuestCheckout() {
+  return salla.config.isGuest() && salla.config.get('store.features').includes('guest-checkout');
+}
+
+/**
+ * Update guest contact
+ *
+ * @param {SallaApplePay} SallaApplePay
+ * @param {ApplePayPaymentContact} shippingContact
+ *
+ */
+async function updateGuestContact(SallaApplePay, shippingContact) {
+  salla.logger.log('🍏 Pay: Updating guest contact', shippingContact);
+
+  return new Promise((resolve, reject) => {
+    http.post(
+      SallaApplePay.detail.guestContactSelected.url.replace('{id}', SallaApplePay.id),
+      {
+        'email': shippingContact.emailAddress || null,
+        'first_name': shippingContact.givenName || null,
+        'last_name': shippingContact.familyName || null,
+        'phone_number': shippingContact.phoneNumber || null,
+        'country_code': shippingContact.countryCode || null,
+      },
+      async ({ data }) => {
+        if (typeof SallaApplePay.detail.guestContactSelected?.onSuccess === 'function') {
+          SallaApplePay.detail.guestContactSelected.onSuccess(data);
+        }
+        resolve(data);
+      },
+      ({ response }) => {
+        salla.logger.warn('🍏 Pay: Failed to update guest contact via api', response);
+
+        if (typeof SallaApplePay.detail.guestContactSelected?.onFailed === 'function') {
+          SallaApplePay.detail.guestContactSelected.onFailed(response);
+        }
+
+        // Reject the promise so it can be caught in onPaymentAuthorized
+        reject({ response });
+      }
+    );
+  });
+}
+
+function getApplePayErrors(fields) {
+  return Object.entries(fields)
+    .filter(([field, messages]) => messages && messages.length > 0)
+    .map(([field, messages]) => new window.ApplePayError('shippingContactInvalid', field, messages[0]));
+}