abmp-npm 1.1.95 → 1.1.97

package/backend/contacts-methods.js

@@ -11,7 +11,7 @@ const elevatedCreateContact = auth.elevate(contacts.createContact);
  * @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 createContact(contactData, allowDuplicates = false) {
   if (!contactData || !(contactData.contactFormEmail || contactData.email)) {
     throw new Error('Contact data is required');
   }
@@ -22,10 +22,10 @@ async function createSiteContact(contactData, allowDuplicates = false) {
       first: contactData.firstName,
       last: contactData.lastName,
     },
-    emails: {
-      items: [{ email: contactData.contactFormEmail || contactData.email, primary: true }],
-    },
-    phones: { items: phones.map(phone => ({ phone })) },
+    emails: [
+      { items: [{ email: contactData.contactFormEmail || contactData.email, primary: true }] },
+    ],
+    phones: [{ items: phones.map(phone => ({ phone })) }],
   };
   const createContactResponse = await elevatedCreateContact(contactInfo, { allowDuplicates });
   return createContactResponse.contact._id;
@@ -157,5 +157,5 @@ const updateMemberContactInfo = async (data, existingMemberData) => {
 
 module.exports = {
   updateMemberContactInfo,
-  createSiteContact,
+  createContact,
 };

package/backend/login/sso-methods.js

@@ -5,7 +5,7 @@ const { decode } = require('jwt-js-decode');
 const { CONFIG_KEYS, SSO_TOKEN_AUTH_API_URL } = require('../consts');
 const { MEMBER_ACTIONS } = require('../daily-pull/consts');
 const { getCurrentMember } = require('../members-area-methods');
-const { getCMSMemberByWixMemberId, prepareMemberForSSOLogin } = require('../members-data-methods');
+const { getMemberByContactId, prepareMemberForSSOLogin } = require('../members-data-methods');
 const {
   formatDateToMonthYear,
   getAddressDisplayOptions,
@@ -37,12 +37,12 @@ async function validateMemberToken(memberIdInput) {
     }
 
     const [dbMember, siteConfigs] = await Promise.all([
-      getCMSMemberByWixMemberId(member._id),
+      getMemberByContactId(member._id),
       getSiteConfigs(),
     ]);
     const siteAssociation = siteConfigs[CONFIG_KEYS.SITE_ASSOCIATION];
     const membersExternalPortalUrl = siteConfigs[CONFIG_KEYS.MEMBERS_EXTERNAL_PORTAL_URL];
-    console.log('dbMember by wix member id is:', dbMember);
+    console.log('dbMember by contact id is:', dbMember);
     console.log('member._id', member._id);
 
     if (!dbMember?._id) {

package/backend/members-data-methods.js

@@ -1,7 +1,7 @@
 const { COLLECTIONS } = require('../public/consts');
 
 const { MEMBERSHIPS_TYPES } = require('./consts');
-const { updateMemberContactInfo, createSiteContact } = require('./contacts-methods');
+const { updateMemberContactInfo, createContact } = require('./contacts-methods');
 const { MEMBER_ACTIONS } = require('./daily-pull/consts');
 const { wixData } = require('./elevated-modules');
 const { createSiteMember, getCurrentMember } = require('./members-area-methods');
@@ -42,17 +42,14 @@ async function createContactAndMemberIfNew(memberData) {
       phones: memberData.phones,
       contactFormEmail: memberData.contactFormEmail || memberData.email,
     };
-    const needsWixMember = !memberData.wixMemberId;
-    const needsWixContact = !memberData.wixContactId;
-    const createPromises = [
-      needsWixMember && createSiteMember(toCreateMemberData),
-      needsWixContact && createSiteContact(toCreateMemberData),
-    ].filter(Boolean);
-    const [newWixMemberId, newWixContactId] = await Promise.all(createPromises);
+    const [wixMemberId, wixContactId] = await Promise.all([
+      createSiteMember(toCreateMemberData),
+      createContact(toCreateMemberData),
+    ]);
     let memberDataWithContactId = {
       ...memberData,
-      wixMemberId: newWixMemberId || memberData.wixMemberId,
-      wixContactId: newWixContactId || memberData.wixContactId,
+      wixMemberId,
+      wixContactId,
     };
     const updatedResult = await updateMember(memberDataWithContactId);
     memberDataWithContactId = {
@@ -176,26 +173,26 @@ async function getMemberBySlug({
   }
 }
 
-async function getCMSMemberByWixMemberId(wixMemberId) {
-  if (!wixMemberId) {
-    throw new Error('Wix Member ID is required');
+async function getMemberByContactId(contactId) {
+  if (!contactId) {
+    throw new Error('Contact ID is required');
   }
   try {
     const members = await wixData
       .query(COLLECTIONS.MEMBERS_DATA)
-      .eq('wixMemberId', wixMemberId)
+      .eq('contactId', contactId)
       .limit(2)
       .find()
       .then(res => res.items);
     if (members.length > 1) {
       throw new Error(
-        `[getCMSMemberByWixMemberId] Multiple members found with wixMemberId ${wixMemberId} membersIds are : [${members.map(member => member.memberId).join(', ')}]`
+        `[getMemberByContactId] Multiple members found with contactId ${contactId} membersIds are : [${members.map(member => member.memberId).join(', ')}]`
       );
     }
     return members[0] || null;
   } catch (error) {
     throw new Error(
-      `[getCMSMemberByWixMemberId] Failed to retrieve member by wixMemberId ${wixMemberId} data: ${error.message}`
+      `[getMemberByContactId] Failed to retrieve member by contactId ${contactId} data: ${error.message}`
     );
   }
 }
@@ -459,11 +456,11 @@ const getQAUsers = async () => {
  * @param {Object} memberData - Member data from DB
  * @returns {Promise<Object>} - Member data with contactId
  */
-async function ensureWixMemberAndContactExist(memberData) {
+async function ensureMemberHasContact(memberData) {
   if (!memberData) {
     throw new Error('Member data is required');
   }
-  if (!memberData.wixContactId || !memberData.wixMemberId) {
+  if (!memberData.contactId) {
     const memberDataWithContactId = await createContactAndMemberIfNew(memberData);
     return memberDataWithContactId;
   }
@@ -481,7 +478,7 @@ async function prepareMemberForSSOLogin(data) {
       throw new Error(`Member data not found for memberId ${memberId}`);
     }
     console.log('memberData', memberData);
-    return await ensureWixMemberAndContactExist(memberData);
+    return await ensureMemberHasContact(memberData);
   } catch (error) {
     console.error('Error in prepareMemberForSSOLogin', error.message);
     throw error;
@@ -498,7 +495,7 @@ async function prepareMemberForQALogin(email) {
       throw new Error(`Member data not found for email ${email}`);
     }
     console.log('memberData', memberData);
-    return await ensureWixMemberAndContactExist(memberData);
+    return await ensureMemberHasContact(memberData);
   } catch (error) {
     console.error('Error in prepareMemberForQALogin', error.message);
     throw error;
@@ -520,7 +517,7 @@ async function trackButtonClick({ pageName, buttonName }) {
     return null;
   }
 
-  const dbMember = await getCMSMemberByWixMemberId(wixMember._id);
+  const dbMember = await getMemberByContactId(wixMember._id);
 
   if (!dbMember) {
     console.warn(
@@ -557,7 +554,7 @@ module.exports = {
   bulkSaveMembers,
   findMemberById,
   getMemberBySlug,
-  getCMSMemberByWixMemberId,
+  getMemberByContactId,
   getAllEmptyAboutYouMembers,
   updateMember,
   getAllMembersWithExternalImages,

package/backend/tasks/tasks-helpers-methods.js

@@ -138,20 +138,27 @@ async function updateMemberRichContent(memberId) {
 async function updateMemberProfileImage(memberId) {
   try {
     const member = await findMemberByWixDataId(memberId);
-
+    const trimmedProfileImage = member.profileImage.trim();
     // Check if member has an external profile image URL
-    if (!member.profileImage || member.profileImage.startsWith('wix:')) {
+    if (
+      !trimmedProfileImage ||
+      trimmedProfileImage.startsWith('wix:') ||
+      trimmedProfileImage.startsWith('https://static.wixstatic.com')
+    ) {
       console.log(`Member ${memberId} already has Wix-hosted image or no image`);
       return { success: true, message: 'No update needed' };
     }
 
     // Validate image URL format before attempting download
-    if (!isValidImageUrl(member.profileImage)) {
-      console.log(`Member ${memberId} has invalid image URL format: ${member.profileImage}`);
+    if (!isValidImageUrl(trimmedProfileImage)) {
+      console.log(`Member ${memberId} has invalid image URL format: ${trimmedProfileImage}`);
       return { success: true, message: 'Invalid image URL format - skipped' };
     }
 
-    const response = await axios.get(member.profileImage, {
+    // Encode URL to handle spaces and special characters in the path
+    const encodedImageUrl = encodeURI(trimmedProfileImage);
+
+    const response = await axios.get(encodedImageUrl, {
       responseType: 'arraybuffer',
       headers: {
         'User-Agent':

package/package.json

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