abmp-npm 2.0.34 → 2.0.36

package/.husky/pre-commit

@@ -1,6 +1,3 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 echo "Running ESLint check..."
 npm run lint
 

package/backend/README-member-contact-flows.md

@@ -0,0 +1,136 @@
+# Member–Contact Flows
+
+How Wix **Members** (login identity) and **CRM Contacts** (form/submission identity) stay in sync in ABMP.
+
+## Concepts
+
+| Concept                | Meaning                                                                                                    |
+| ---------------------- | ---------------------------------------------------------------------------------------------------------- |
+| **Single entity**      | Member and contact use the same Wix ID (`wixContactId === wixMemberId`). One person, one record.           |
+| **Separate contact**   | Member has a login email; contact has a different “form” email. Two Wix entities: one Member, one Contact. |
+| **Login email**        | `memberData.email` — used to sign in (Wix Member).                                                         |
+| **Contact form email** | `memberData.contactFormEmail` — email used on forms; can differ from login.                                |
+
+---
+
+## 1. Login / first-time flow: `createContactAndMemberIfNew`
+
+**Used when:** A user logs in or is created and we need to ensure they have both a Wix Member and (if needed) a CRM Contact.
+
+**File:** `members-data-methods.js` → `createContactAndMemberIfNew(memberData)`
+
+### Logic in short
+
+- If no **Wix Member** → create one (login identity).
+- If no **Wix Contact** and contact form email **differs** from login email → create a separate Contact.
+- If contact form email **equals** login email → no separate contact; we use the member ID as the contact ID (single entity).
+- Persist `wixMemberId` and `wixContactId` on the member record.
+
+### Flow diagram
+
+```mermaid
+flowchart TD
+    A[createContactAndMemberIfNew] --> B{Has wixMemberId?}
+    B -->|No| C[Create Wix Member]
+    B -->|Yes| D{Has wixContactId?}
+    C --> D
+    D -->|No| E{contactFormEmail !== email?}
+    D -->|Yes| K[Keep existing IDs]
+    E -->|Yes| F[Create Wix Contact]
+    E -->|No| G[Use member ID as contact ID]
+    F --> H[Resolve IDs]
+    G --> H
+    K --> H
+    H[newWixContactId = createdContact OR memberId] --> I[Set wixMemberId, wixContactId on member]
+    I --> J[updateMember + return]
+```
+
+### Parallel work
+
+```
+                    ┌─────────────────────────────────────┐
+                    │  createContactAndMemberIfNew         │
+                    └─────────────────────────────────────┘
+                                        │
+                    ┌───────────────────┴───────────────────┐
+                    │           Promise.all([              │
+                    │  runIf(needsWixMember, createMember),  │
+                    │  runIf(needsContact && differentEmail, │
+                    │        createContact)                 │
+                    │           ])                          │
+                    └───────────────────┬───────────────────┘
+                                        │
+          newWixContactId = createdWixContactId || newWixMemberId
+          (if no separate contact, member ID is the contact ID)
+                                        │
+                    ┌───────────────────┴───────────────────┐
+                    │  updateMember({ ...memberData,        │
+                    │    wixMemberId, wixContactId })      │
+                    └───────────────────────────────────────┘
+```
+
+### Outcome
+
+| Scenario                                | wixMemberId   | wixContactId                        |
+| --------------------------------------- | ------------- | ----------------------------------- |
+| New user, same email for login and form | New member ID | Same as wixMemberId (single entity) |
+| New user, form email ≠ login email      | New member ID | New contact ID (separate contact)   |
+| Existing user (already has both IDs)    | Unchanged     | Unchanged                           |
+
+---
+
+## 2. Update contact email flow: `updateContactEmail`
+
+**Used when:** User changes their contact/form email in the app and we need to update CRM and optionally the member record.
+
+**File:** `member-contact-orchestration.js` → `updateContactEmail(newContactEmail, existingMemberData)` (used by `updateMemberContactInfo`).
+
+### Logic in short
+
+- **Single entity** (`wixContactId === wixMemberId`):
+  - If new email **equals** login → no change.
+  - If new email **differs** → create a new Contact with the new email and point the member to it (we now have a separate contact).
+- **Separate contact** (different IDs):
+  - If new email **equals** login → delete the extra contact and set `wixContactId = wixMemberId` (collapse to single entity).
+  - If new email **differs** → update the existing contact’s email in CRM.
+
+### Flow diagram
+
+```mermaid
+flowchart TD
+    A[updateContactEmail] --> B{contactEmail === loginEmail?}
+    B -->|Yes| C{Single entity?}
+    B -->|No| D{Single entity?}
+    C -->|Yes| E[No-op: already in sync]
+    C -->|No| F[Delete contact\nSet wixContactId = wixMemberId]
+    D -->|Yes| G[Create new Contact with new email\nUpdate member wixContactId]
+    D -->|No| H[Update existing contact email in CRM]
+```
+
+### Decision table
+
+| Single entity? | New email vs login | Action                                                            |
+| -------------- | ------------------ | ----------------------------------------------------------------- |
+| Yes            | Same               | No-op                                                             |
+| Yes            | Different          | Create new Contact; set member’s `wixContactId` to new contact ID |
+| No             | Same               | Delete Contact; set member’s `wixContactId = wixMemberId`         |
+| No             | Different          | Update existing Contact’s email in CRM (no member change)         |
+
+### Where it’s used
+
+`updateContactEmail` is called from `updateMemberContactInfo` when the **contactFormEmail** field changes (e.g. profile or form update). So:
+
+- **Login flow** → `createContactAndMemberIfNew` (ensure member + contact exist and IDs stored).
+- **Profile/form email change** → `updateMemberContactInfo` → `updateContactEmail` (keep contact and member in sync).
+
+---
+
+## File roles
+
+| File                              | Role                                                                                                                                |
+| --------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
+| `contacts-methods.js`             | Contact CRUD only: create/update/delete contact in Wix CRM.                                                                         |
+| `member-contact-orchestration.js` | Orchestration: when to create/update/delete contact and when to update member’s `wixContactId`. Uses injected `updateMember`.       |
+| `members-data-methods.js`         | Member CRUD, `createContactAndMemberIfNew`; requires `updateMemberContactInfo` and calls `updateMember` once with its return value. |
+
+Dependency direction: **members-data** → **member-contact-orchestration** → **contacts** (no cycle).

package/backend/contacts-methods.js

@@ -4,32 +4,31 @@ const { auth } = require('@wix/essentials');
 const elevatedGetContact = auth.elevate(contacts.getContact);
 const elevatedUpdateContact = auth.elevate(contacts.updateContact);
 const elevatedCreateContact = auth.elevate(contacts.createContact);
+const elevatedDeleteContact = auth.elevate(contacts.deleteContact);
+
+const deleteSiteContact = contactId => elevatedDeleteContact(contactId);
 
 /**
  * Create a contact in Wix CRM
  * @param {Object} contactData - Contact data
- * @param {boolean} allowDuplicates - Allow duplicates if contact with same email already exists, will be true only when handling existing members, after that should be removed
  * @returns {Promise<Object>} - Contact data
  */
-async function createSiteContact(contactData, allowDuplicates = false) {
+async function createSiteContact(contactData) {
   console.log('[createSiteContact]contactData', JSON.stringify(contactData, null, 2));
-  if (!contactData || !(contactData.contactFormEmail || contactData.email)) {
+  if (!contactData || !contactData.contactFormEmail) {
     throw new Error('Contact data is required');
   }
-  const phones =
-    Array.isArray(contactData.phones) && contactData.phones.length > 0 ? contactData.phones : [];
   const contactInfo = {
     name: {
       first: contactData.firstName,
       last: contactData.lastName,
     },
     emails: {
-      items: [{ email: contactData.contactFormEmail || contactData.email, primary: true }],
+      items: [{ email: contactData.contactFormEmail, primary: true }],
     },
-    phones: { items: phones.map(phone => ({ phone })) },
   };
   console.log('[createSiteContact]contactInfo', JSON.stringify(contactInfo, null, 2));
-  const createContactResponse = await elevatedCreateContact(contactInfo, { allowDuplicates });
+  const createContactResponse = await elevatedCreateContact(contactInfo);
   console.log(
     '[createSiteContact]createContactResponse',
     JSON.stringify(createContactResponse, null, 2)
@@ -51,7 +50,6 @@ async function updateContactInfo(contactId, updateInfoCallback, operationName) {
     const contact = await elevatedGetContact(contactId);
     const currentInfo = contact.info;
     const updatedInfo = updateInfoCallback(currentInfo);
-
     await elevatedUpdateContact(contactId, updatedInfo, contact.revision);
   } catch (error) {
     console.error(`Error in ${operationName}:`, error);
@@ -59,105 +57,8 @@ async function updateContactInfo(contactId, updateInfoCallback, operationName) {
   }
 }
 
-/**
- * Updates contact email in Wix CRM
- * @param {string} contactId - The contact ID in Wix CRM
- * @param {string} newEmail - The new email address
- */
-async function updateContactEmail(contactId, newEmail) {
-  if (!newEmail) {
-    throw new Error('New email is required');
-  }
-
-  return await updateContactInfo(
-    contactId,
-    currentInfo => ({
-      ...currentInfo,
-      emails: {
-        items: [
-          {
-            email: newEmail,
-            primary: true,
-          },
-        ],
-      },
-    }),
-    'update contact email'
-  );
-}
-
-/**
- * Updates contact names in Wix CRM for both contact and member
- * @param {Object} params - Parameters object
- * @param {string} params.wixContactId - The contact ID in Wix CRM
- * @param {string} params.wixMemberId - The member ID in Wix CRM
- * @param {string} params.firstName - The new first name
- * @param {string} params.lastName - The new last name
- */
-async function updateContactNames({ wixContactId, firstName, lastName }) {
-  if (!firstName && !lastName) {
-    throw new Error('First name or last name is required');
-  }
-
-  const createNameUpdate = currentInfo => ({
-    ...currentInfo,
-    name: {
-      first: firstName || currentInfo?.name?.first || '',
-      last: lastName || currentInfo?.name?.last || '',
-    },
-  });
-
-  return await updateContactInfo(wixContactId, createNameUpdate, 'update contact names');
-}
-
-/**
- * Update fields if they have changed
- * @param {Array} existingValues - Current values for comparison
- * @param {Array} newValues - New values to compare against
- * @param {Function} updater - Function to call if values changed
- * @param {Function} argsBuilder - Function to build arguments for updater
- */
-const updateIfChanged = (existingValues, newValues, updater, argsBuilder) => {
-  const hasChanged = existingValues.some((val, idx) => val !== newValues[idx]);
-  if (!hasChanged) return null;
-  return updater(...argsBuilder(newValues));
-};
-
-/**
- * Updates member contact information in CRM if fields have changed
- * @param {Object} data - New member data
- * @param {Object} existingMemberData - Existing member data
- */
-const updateMemberContactInfo = async (data, existingMemberData) => {
-  const { wixContactId } = existingMemberData;
-  if (!wixContactId) {
-    throw new Error('Wix Contact ID is required');
-  }
-  const updateConfig = [
-    {
-      fields: ['contactFormEmail'],
-      updater: updateContactEmail,
-      args: ([email]) => [wixContactId, email],
-    },
-    {
-      fields: ['firstName', 'lastName'],
-      updater: updateContactNames,
-      args: ([firstName, lastName]) => [{ firstName, lastName, wixContactId }],
-    },
-  ];
-
-  const updatePromises = updateConfig
-    .map(({ fields, updater, args }) => {
-      const existingValues = fields.map(field => existingMemberData[field]);
-      const newValues = fields.map(field => data[field]);
-      return updateIfChanged(existingValues, newValues, updater, args);
-    })
-    .filter(Boolean);
-
-  await Promise.all(updatePromises);
-};
-
 module.exports = {
-  updateMemberContactInfo,
   createSiteContact,
+  updateContactInfo,
+  deleteSiteContact,
 };

package/backend/member-contact-orchestration.js

@@ -0,0 +1,106 @@
+/**
+ * Orchestrates syncing between Wix Members and CRM Contacts.
+ * Returns member data to save; caller does a single updateMember to avoid double-write.
+ */
+const { createSiteContact, updateContactInfo, deleteSiteContact } = require('./contacts-methods');
+
+/**
+ * Updates contact email in CRM. Returns member patch { wixContactId } when member record
+ * must change; otherwise null. Caller merges and saves once.
+ */
+async function updateContactEmail(newContactEmail, existingMemberData) {
+  if (!newContactEmail) {
+    throw new Error('New email is required');
+  }
+  if (!existingMemberData || existingMemberData.wixContactId == null) {
+    throw new Error('Existing member data with wixContactId is required');
+  }
+
+  const { wixContactId, wixMemberId, email: loginEmail } = existingMemberData;
+  const isSingleEntity = wixContactId === wixMemberId;
+  const contactEmailDiffersFromLogin = loginEmail !== newContactEmail;
+
+  if (!contactEmailDiffersFromLogin) {
+    if (isSingleEntity) {
+      return null;
+    }
+    await deleteSiteContact(wixContactId);
+    return { wixContactId: wixMemberId };
+  }
+
+  if (isSingleEntity) {
+    const newWixContactId = await createSiteContact({
+      firstName: existingMemberData.firstName,
+      lastName: existingMemberData.lastName,
+      contactFormEmail: newContactEmail,
+    });
+    return { wixContactId: newWixContactId };
+  }
+
+  await updateContactInfo(
+    wixContactId,
+    currentInfo => ({
+      ...currentInfo,
+      emails: {
+        items: [{ email: newContactEmail, primary: true }],
+      },
+    }),
+    'update contact email'
+  );
+  return null;
+}
+
+async function updateContactNames({ wixContactId, firstName, lastName }) {
+  if (!firstName && !lastName) {
+    throw new Error('First name or last name is required');
+  }
+  const createNameUpdate = currentInfo => ({
+    ...currentInfo,
+    name: {
+      first: firstName || currentInfo?.name?.first || '',
+      last: lastName || currentInfo?.name?.last || '',
+    },
+  });
+  return await updateContactInfo(wixContactId, createNameUpdate, 'update contact names');
+}
+
+/**
+ * Syncs contact with member (email, names). Contact CRUD only; returns member data to save.
+ * Caller must call updateMember once with the result.
+ */
+async function updateMemberContactInfo(data, existingMemberData) {
+  const { wixContactId } = existingMemberData;
+  if (!wixContactId) {
+    throw new Error('Wix Contact ID is required');
+  }
+  const updateConfig = [
+    {
+      fields: ['contactFormEmail'],
+      updater: updateContactEmail,
+      args: ([email]) => [email, existingMemberData],
+      returnsMemberPatch: true,
+    },
+    {
+      fields: ['firstName', 'lastName'],
+      updater: updateContactNames,
+      args: ([firstName, lastName]) => [{ firstName, lastName, wixContactId }],
+      returnsMemberPatch: false,
+    },
+  ];
+
+  const results = await Promise.all(
+    updateConfig.map(async ({ fields, updater, args, returnsMemberPatch }) => {
+      const existingValues = fields.map(field => existingMemberData[field]);
+      const newValues = fields.map(field => data[field]);
+      const hasChanged = existingValues.some((val, idx) => val !== newValues[idx]);
+      if (!hasChanged) return null;
+      const result = await updater(...args(newValues));
+      return returnsMemberPatch ? result : null;
+    })
+  );
+
+  const memberPatch = results.reduce((acc, patch) => (patch ? { ...acc, ...patch } : acc), {});
+  return { ...data, ...memberPatch };
+}
+
+module.exports = { updateMemberContactInfo };

package/backend/members-area-methods.js

@@ -7,6 +7,10 @@ function prepareMemberData(partner) {
   const options = {
     member: {
       loginEmail: partner.email,
+      contact: {
+        firstName: partner.firstName,
+        lastName: partner.lastName,
+      },
     },
   };
   return options;

package/backend/members-data-methods.js

@@ -2,9 +2,10 @@ const { COLLECTIONS } = require('../public/consts');
 const { isWixHostedImage } = require('../public/Utils/sharedUtils');
 
 const { MEMBERSHIPS_TYPES } = require('./consts');
-const { updateMemberContactInfo, createSiteContact } = require('./contacts-methods');
+const { createSiteContact } = require('./contacts-methods');
 const { MEMBER_ACTIONS } = require('./daily-pull/consts');
 const { wixData } = require('./elevated-modules');
+const { updateMemberContactInfo } = require('./member-contact-orchestration');
 const { createSiteMember, getCurrentMember } = require('./members-area-methods');
 const {
   chunkArray,
@@ -12,6 +13,7 @@ const {
   queryAllItems,
   generateGeoHash,
   searchAllItems,
+  runIf,
 } = require('./utils');
 
 /**
@@ -31,7 +33,10 @@ async function findMemberByWixDataId(memberId) {
   }
 }
 
-async function createContactAndMemberIfNew(memberData, allowDuplicates = true) {
+const hasDifferentEmails = memberData =>
+  memberData.contactFormEmail && memberData.contactFormEmail !== memberData.email;
+
+async function createContactAndMemberIfNew(memberData) {
   if (!memberData) {
     throw new Error('Member data is required');
   }
@@ -41,19 +46,25 @@ async function createContactAndMemberIfNew(memberData, allowDuplicates = true) {
       lastName: memberData.lastName,
       email: memberData.email,
       phones: memberData.phones,
-      contactFormEmail: memberData.contactFormEmail || memberData.email,
+      contactFormEmail: memberData.contactFormEmail,
     };
     const needsWixMember = !memberData.wixMemberId;
     const needsWixContact = !memberData.wixContactId;
+    const hasContactEmailDifferentFromLogin = hasDifferentEmails(memberData);
     console.log('needsWixMember', needsWixMember);
     console.log('needsWixContact', needsWixContact);
-    const [newWixMemberId, newWixContactId] = await Promise.all([
-      needsWixMember ? createSiteMember(toCreateMemberData) : Promise.resolve(null),
-      needsWixContact
-        ? createSiteContact(toCreateMemberData, allowDuplicates)
-        : Promise.resolve(null),
+    console.log('hasContactEmailDifferentFromLogin', hasContactEmailDifferentFromLogin);
+
+    const [newWixMemberId, createdWixContactId] = await Promise.all([
+      runIf(needsWixMember, () => createSiteMember(toCreateMemberData)),
+      runIf(needsWixContact && hasContactEmailDifferentFromLogin, () =>
+        createSiteContact(toCreateMemberData)
+      ),
     ]);
+    const memberContactId = newWixMemberId;
+    const newWixContactId = createdWixContactId || memberContactId;
     console.log('newWixMemberId', newWixMemberId);
+    console.log('memberContactId', memberContactId);
     console.log('newWixContactId', newWixContactId);
     let memberDataWithContactId = {
       ...memberData,
@@ -281,9 +292,8 @@ async function saveRegistrationData(data, id) {
       mergedData.locHash = generateGeoHash(data.addresses);
     }
 
-    await updateMemberContactInfo(mergedData, existingMemberData);
-
-    const saveData = await updateMember(mergedData);
+    const dataToSave = await updateMemberContactInfo(mergedData, existingMemberData);
+    const saveData = await updateMember(dataToSave);
     return {
       type: 'success',
       saveData,
@@ -480,15 +490,14 @@ const getQAUsers = async () => {
 /**
  * Ensures member has a contact - creates one if missing
  * @param {Object} memberData - Member data from DB
- * @param {boolean} [allowDuplicates=false] - If true, allows creating duplicate contacts (e.g. for SSO/QA login)
  * @returns {Promise<Object>} - Member data with contact and member IDs
  */
-async function ensureWixMemberAndContactExist(memberData, allowDuplicates = false) {
+async function ensureWixMemberAndContactExist(memberData) {
   if (!memberData) {
     throw new Error('Member data is required');
   }
   if (!memberData.wixContactId || !memberData.wixMemberId) {
-    const memberDataWithContactId = await createContactAndMemberIfNew(memberData, allowDuplicates);
+    const memberDataWithContactId = await createContactAndMemberIfNew(memberData);
     return memberDataWithContactId;
   }
   return memberData;
@@ -505,7 +514,7 @@ async function prepareMemberForSSOLogin(data) {
       throw new Error(`Member data not found for memberId ${memberId}`);
     }
     console.log('memberData', memberData);
-    return await ensureWixMemberAndContactExist(memberData, true);
+    return await ensureWixMemberAndContactExist(memberData);
   } catch (error) {
     console.error(`Error in prepareMemberForSSOLogin: ${error.message}`);
     throw error;
@@ -522,7 +531,7 @@ async function prepareMemberForQALogin(email) {
       throw new Error(`Member data not found for email ${email}`);
     }
     console.log('memberData', memberData);
-    return await ensureWixMemberAndContactExist(memberData, true);
+    return await ensureWixMemberAndContactExist(memberData);
   } catch (error) {
     const errMsg = `[prepareMemberForQALogin] QA Login failed with error: ${error.message} for email: ${email}`;
     console.error(errMsg);

package/backend/utils.js

@@ -199,6 +199,9 @@ function encodeXml(value) {
 function formatDateOnly(dateStr) {
   return new Date(dateStr).toISOString().slice(0, 10);
 }
+
+const runIf = (condition, asyncFn) => (condition ? asyncFn() : Promise.resolve(null));
+
 module.exports = {
   getSiteConfigs,
   retrieveAllItems,
@@ -218,4 +221,5 @@ module.exports = {
   getMoreAddressesToDisplay,
   isPAC_STAFF,
   searchAllItems,
+  runIf,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "2.0.34",
+  "version": "2.0.36",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",