abmp-npm 1.1.97 → 1.1.99

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 createContact(contactData, allowDuplicates = false) {
+async function createSiteContact(contactData, allowDuplicates = false) {
   if (!contactData || !(contactData.contactFormEmail || contactData.email)) {
     throw new Error('Contact data is required');
   }
@@ -22,10 +22,10 @@ async function createContact(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,
-  createContact,
+  createSiteContact,
 };

package/backend/dev-only-methods.js

@@ -1,3 +1,5 @@
+const { COLLECTIONS } = require('../public/consts');
+
 const { ensureUniqueUrlsInBatch } = require('./daily-pull/bulk-process-methods');
 const { wixData } = require('./elevated-modules');
 const { bulkSaveMembers } = require('./members-data-methods');
@@ -15,4 +17,14 @@ async function deduplicateURls(collectionName, duplicateUrlsList) {
   return await bulkSaveMembers(membersWithUniqueUrls, collectionName);
 }
 
-module.exports = { deduplicateURls };
+async function copyContactIdToWixMemberId() {
+  const query = wixData.query(COLLECTIONS.MEMBERS_DATA).isNotEmpty('contactId');
+  const members = await queryAllItems(query);
+  const updatedMembers = members.map(member => ({
+    ...member,
+    wixMemberId: member.contactId,
+  }));
+  return await bulkSaveMembers(updatedMembers, COLLECTIONS.MEMBERS_DATA);
+}
+
+module.exports = { deduplicateURls, copyContactIdToWixMemberId };

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 { getMemberByContactId, prepareMemberForSSOLogin } = require('../members-data-methods');
+const { getCMSMemberByWixMemberId, prepareMemberForSSOLogin } = require('../members-data-methods');
 const {
   formatDateToMonthYear,
   getAddressDisplayOptions,
@@ -37,12 +37,12 @@ async function validateMemberToken(memberIdInput) {
     }
 
     const [dbMember, siteConfigs] = await Promise.all([
-      getMemberByContactId(member._id),
+      getCMSMemberByWixMemberId(member._id),
       getSiteConfigs(),
     ]);
     const siteAssociation = siteConfigs[CONFIG_KEYS.SITE_ASSOCIATION];
     const membersExternalPortalUrl = siteConfigs[CONFIG_KEYS.MEMBERS_EXTERNAL_PORTAL_URL];
-    console.log('dbMember by contact id is:', dbMember);
+    console.log('dbMember by wix member id is:', dbMember);
     console.log('member._id', member._id);
 
     if (!dbMember?._id) {

package/backend/members-data-methods.js

@@ -1,7 +1,8 @@
 const { COLLECTIONS } = require('../public/consts');
+const { isWixHostedImage } = require('../public/Utils/sharedUtils');
 
 const { MEMBERSHIPS_TYPES } = require('./consts');
-const { updateMemberContactInfo, createContact } = require('./contacts-methods');
+const { updateMemberContactInfo, createSiteContact } = require('./contacts-methods');
 const { MEMBER_ACTIONS } = require('./daily-pull/consts');
 const { wixData } = require('./elevated-modules');
 const { createSiteMember, getCurrentMember } = require('./members-area-methods');
@@ -42,14 +43,16 @@ async function createContactAndMemberIfNew(memberData) {
       phones: memberData.phones,
       contactFormEmail: memberData.contactFormEmail || memberData.email,
     };
-    const [wixMemberId, wixContactId] = await Promise.all([
-      createSiteMember(toCreateMemberData),
-      createContact(toCreateMemberData),
+    const needsWixMember = !memberData.wixMemberId;
+    const needsWixContact = !memberData.wixContactId;
+    const [newWixMemberId, newWixContactId] = await Promise.all([
+      needsWixMember ? createSiteMember(toCreateMemberData) : Promise.resolve(null),
+      needsWixContact ? createSiteContact(toCreateMemberData) : Promise.resolve(null),
     ]);
     let memberDataWithContactId = {
       ...memberData,
-      wixMemberId,
-      wixContactId,
+      wixMemberId: newWixMemberId || memberData.wixMemberId,
+      wixContactId: newWixContactId || memberData.wixContactId,
     };
     const updatedResult = await updateMember(memberDataWithContactId);
     memberDataWithContactId = {
@@ -173,26 +176,26 @@ async function getMemberBySlug({
   }
 }
 
-async function getMemberByContactId(contactId) {
-  if (!contactId) {
-    throw new Error('Contact ID is required');
+async function getCMSMemberByWixMemberId(wixMemberId) {
+  if (!wixMemberId) {
+    throw new Error('Wix Member ID is required');
   }
   try {
     const members = await wixData
       .query(COLLECTIONS.MEMBERS_DATA)
-      .eq('contactId', contactId)
+      .eq('wixMemberId', wixMemberId)
       .limit(2)
       .find()
       .then(res => res.items);
     if (members.length > 1) {
       throw new Error(
-        `[getMemberByContactId] Multiple members found with contactId ${contactId} membersIds are : [${members.map(member => member.memberId).join(', ')}]`
+        `[getCMSMemberByWixMemberId] Multiple members found with wixMemberId ${wixMemberId} membersIds are : [${members.map(member => member.memberId).join(', ')}]`
       );
     }
     return members[0] || null;
   } catch (error) {
     throw new Error(
-      `[getMemberByContactId] Failed to retrieve member by contactId ${contactId} data: ${error.message}`
+      `[getCMSMemberByWixMemberId] Failed to retrieve member by wixMemberId ${wixMemberId} data: ${error.message}`
     );
   }
 }
@@ -328,9 +331,9 @@ async function getAllMembersWithExternalImages() {
 
     const allItems = await queryAllItems(membersQuery);
 
-    // Filter for external images (not starting with 'wix:')
+    // Filter for external images (not 'wix hosted images')
     const membersWithExternalImages = allItems.filter(
-      member => member.profileImage && !member.profileImage.startsWith('wix:')
+      member => member.profileImage && !isWixHostedImage(member.profileImage)
     );
 
     return membersWithExternalImages;
@@ -454,13 +457,13 @@ const getQAUsers = async () => {
 /**
  * Ensures member has a contact - creates one if missing
  * @param {Object} memberData - Member data from DB
- * @returns {Promise<Object>} - Member data with contactId
+ * @returns {Promise<Object>} - Member data with contact and member IDs
  */
-async function ensureMemberHasContact(memberData) {
+async function ensureWixMemberAndContactExist(memberData) {
   if (!memberData) {
     throw new Error('Member data is required');
   }
-  if (!memberData.contactId) {
+  if (!memberData.wixContactId || !memberData.wixMemberId) {
     const memberDataWithContactId = await createContactAndMemberIfNew(memberData);
     return memberDataWithContactId;
   }
@@ -478,7 +481,7 @@ async function prepareMemberForSSOLogin(data) {
       throw new Error(`Member data not found for memberId ${memberId}`);
     }
     console.log('memberData', memberData);
-    return await ensureMemberHasContact(memberData);
+    return await ensureWixMemberAndContactExist(memberData);
   } catch (error) {
     console.error('Error in prepareMemberForSSOLogin', error.message);
     throw error;
@@ -495,7 +498,7 @@ async function prepareMemberForQALogin(email) {
       throw new Error(`Member data not found for email ${email}`);
     }
     console.log('memberData', memberData);
-    return await ensureMemberHasContact(memberData);
+    return await ensureWixMemberAndContactExist(memberData);
   } catch (error) {
     console.error('Error in prepareMemberForQALogin', error.message);
     throw error;
@@ -517,11 +520,11 @@ async function trackButtonClick({ pageName, buttonName }) {
     return null;
   }
 
-  const dbMember = await getMemberByContactId(wixMember._id);
+  const dbMember = await getCMSMemberByWixMemberId(wixMember._id);
 
   if (!dbMember) {
     console.warn(
-      `[trackButtonClick]: Member not found in MembersDataLatest for contactId: ${wixMember._id}`
+      `[trackButtonClick]: Member not found in MembersDataLatest for wixMemberId: ${wixMember._id}`
     );
     return null;
   }
@@ -547,14 +550,20 @@ async function trackButtonClick({ pageName, buttonName }) {
   }
 }
 
+async function getAllMembersWithWixMemberId() {
+  const membersQuery = wixData.query(COLLECTIONS.MEMBERS_DATA).isNotEmpty('wixMemberId');
+  return await queryAllItems(membersQuery);
+}
+
 module.exports = {
   findMemberByWixDataId,
   createContactAndMemberIfNew,
+  getAllMembersWithWixMemberId,
   saveRegistrationData,
   bulkSaveMembers,
   findMemberById,
   getMemberBySlug,
-  getMemberByContactId,
+  getCMSMemberByWixMemberId,
   getAllEmptyAboutYouMembers,
   updateMember,
   getAllMembersWithExternalImages,

package/backend/routers/methods.js

@@ -1,4 +1,5 @@
 const { PAGES_PATHS } = require('../../public/consts');
+const { isWixHostedImage } = require('../../public/Utils/sharedUtils');
 //const { fetchAllItemsInParallel } = require('../cms-data-methods'); unused at host site
 const { CONFIG_KEYS } = require('../consts');
 const { getSiteConfigs } = require('../utils');
@@ -27,7 +28,11 @@ const createRoutersHandlers = wixRouterMethods => {
       const defaultProfileImage = siteConfigs[CONFIG_KEYS.DEFAULT_PROFILE_IMAGE];
       const profileData = await getMemberProfileData(slug, siteAssociation);
       if (profileData && profileData.showWixUrl) {
-        const ogImage = profileData.profileImage || profileData.logoImage || siteLogoUrl;
+        const profileImage =
+          profileData.profileImage?.trim() && isWixHostedImage(profileData.profileImage)
+            ? profileData.profileImage
+            : defaultProfileImage;
+        const ogImage = profileImage || profileData.logoImage || siteLogoUrl;
         const seoTitle = generateSEOTitle({
           fullName: profileData.fullName,
           areasOfPractices: profileData.areasOfPractices,

package/backend/tasks/consts.js

@@ -16,6 +16,8 @@ const TASKS_NAMES = {
   migrateUrlsChunk: 'migrateUrlsChunk',
   scheduleGenerateMissingUrls: 'scheduleGenerateMissingUrls',
   generateUrlsChunk: 'generateUrlsChunk',
+  scheduleCreateContactsFromMembers: 'scheduleCreateContactsFromMembers',
+  createContactsFromMembers: 'createContactsFromMembers',
 };
 
 module.exports = {

package/backend/tasks/tasks-configs.js

@@ -16,6 +16,8 @@ const {
   migrateContactFormEmails,
   scheduleEmailSync,
   syncMemberLoginEmails,
+  scheduleCreateContactsFromMembers,
+  createContactsFromMembers,
 } = require('./tasks-process-methods');
 const {
   scheduleMigrateExistingUrls,
@@ -153,6 +155,20 @@ const TASKS = {
     shouldSkipCheck: () => false,
     estimatedDurationSec: 80,
   },
+  [TASKS_NAMES.scheduleCreateContactsFromMembers]: {
+    name: TASKS_NAMES.scheduleCreateContactsFromMembers,
+    getIdentifier: () => 'SHOULD_NEVER_SKIP',
+    process: scheduleCreateContactsFromMembers,
+    shouldSkipCheck: () => false,
+    estimatedDurationSec: 80,
+  },
+  [TASKS_NAMES.createContactsFromMembers]: {
+    name: TASKS_NAMES.createContactsFromMembers,
+    getIdentifier: task => task.data,
+    process: createContactsFromMembers,
+    shouldSkipCheck: () => false,
+    estimatedDurationSec: 80,
+  },
 };
 
 module.exports = { TASKS };

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

@@ -5,6 +5,7 @@ const aws4 = require('aws4');
 const axios = require('axios');
 
 const { PAGES_PATHS } = require('../../public/consts');
+const { isWixHostedImage } = require('../../public/Utils/sharedUtils');
 const { findMemberByWixDataId, updateMember } = require('../members-data-methods');
 const { getSecret, getSiteBaseUrl, encodeXml, formatDateOnly } = require('../utils');
 
@@ -140,11 +141,7 @@ async function updateMemberProfileImage(memberId) {
     const member = await findMemberByWixDataId(memberId);
     const trimmedProfileImage = member.profileImage.trim();
     // Check if member has an external profile image URL
-    if (
-      !trimmedProfileImage ||
-      trimmedProfileImage.startsWith('wix:') ||
-      trimmedProfileImage.startsWith('https://static.wixstatic.com')
-    ) {
+    if (!trimmedProfileImage || isWixHostedImage(trimmedProfileImage)) {
       console.log(`Member ${memberId} already has Wix-hosted image or no image`);
       return { success: true, message: 'No update needed' };
     }

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

@@ -13,6 +13,8 @@ const {
   bulkSaveMembers,
   getAllUpdatedLoginEmails,
   getMembersByIds,
+  createContactAndMemberIfNew,
+  getAllMembersWithWixMemberId,
 } = require('../members-data-methods');
 const {
   getCompleteStateList,
@@ -530,6 +532,46 @@ const syncMemberLoginEmails = async data => {
     throw new Error(errorMessage);
   }
 };
+/**
+ * Schedules tasks to create contacts from members
+ * dev-only task, run only once by the developers
+ */
+const scheduleCreateContactsFromMembers = async () => {
+  const members = await getAllMembersWithWixMemberId();
+  console.log(
+    `Starting to schedule create contacts from members tasks for ${members.length} members in chunks of 500 members`
+  );
+  const membersChunks = chunkArray(members, 500);
+  for (let chunkIndex = 0; chunkIndex < membersChunks.length; chunkIndex++) {
+    const chunk = membersChunks[chunkIndex];
+    const toScheduleTask = {
+      name: TASKS_NAMES.createContactsFromMembers,
+      data: { chunk, chunkIndex },
+    };
+    await taskManager().schedule(toScheduleTask);
+    console.log(`Scheduled task for chunk ${chunkIndex} with ${chunk.length} members`);
+  }
+  console.log(`Successfully scheduled ${membersChunks.length} tasks for ${members.length} members`);
+};
+
+/**
+ * Creates contacts from members
+ * dev-only task, run only once by the developers
+ */
+const createContactsFromMembers = async data => {
+  const { chunk, chunkIndex } = data;
+  console.log(`Creating contacts from ${chunk.length} members in chunk ${chunkIndex}`);
+  const createPromises = chunk.map(member => createContactAndMemberIfNew(member));
+  const createResults = await Promise.all(createPromises);
+  console.log(
+    `Created ${createResults.length} contacts from ${chunk.length} members in chunk ${chunkIndex}`
+  );
+  const saveResult = await bulkSaveMembers(createResults);
+  console.log(
+    `Successfully saved ${saveResult.totalSaved} contacts from ${chunk.length} members in chunk ${chunkIndex}`
+  );
+  return saveResult;
+};
 
 module.exports = {
   scheduleTaskForEmptyAboutYouMembers,
@@ -542,4 +584,6 @@ module.exports = {
   migrateContactFormEmails,
   scheduleEmailSync,
   syncMemberLoginEmails,
+  scheduleCreateContactsFromMembers, // run only once by the developers
+  createContactsFromMembers,
 };

package/package.json

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

package/pages/Home.js

@@ -9,6 +9,7 @@ const {
   getMainAddress,
   formatPracticeAreasForDisplay,
   checkAddressIsVisible,
+  isWixHostedImage,
 } = require('../public/Utils/sharedUtils.js');
 
 let filter = JSON.parse(JSON.stringify(DEFAULT_FILTER));
@@ -187,7 +188,7 @@ const homePageOnReady = async ({
         : [];
 
       // 2) Profile image
-      if (itemData.profileImage) {
+      if (itemData.profileImage?.trim() && isWixHostedImage(itemData.profileImage)) {
         $item('#profileImage').src = itemData.profileImage;
       }
 

package/pages/Profile.js

@@ -2,7 +2,11 @@ const { location: wixLocation } = require('@wix/site-location');
 const { window: wixWindow } = require('@wix/site-window');
 
 const { LIGHTBOX_NAMES } = require('../public/consts');
-const { generateId, formatPracticeAreasForDisplay } = require('../public/Utils/sharedUtils');
+const {
+  generateId,
+  formatPracticeAreasForDisplay,
+  isWixHostedImage,
+} = require('../public/Utils/sharedUtils');
 
 const TESTIMONIALS_PER_PAGE_CONFIG = {
   DESKTOP: 4,
@@ -117,7 +121,7 @@ async function profileOnReady({ $w: _$w }) {
       _$w('#logoImage').delete();
     }
 
-    if (profileData.profileImage) {
+    if (profileData.profileImage && isWixHostedImage(profileData.profileImage)) {
       _$w('#profileImage').src = profileData.profileImage;
     } else {
       _$w('#profileImage').src = profileData.defaultProfileImage;

package/pages/personalDetails.js

@@ -9,7 +9,7 @@ const {
   LIGHTBOX_NAMES,
 } = require('../public/consts');
 const { handleOnCustomValidation, isNotValidUrl } = require('../public/Utils/personalDetailsUtils');
-const { generateId } = require('../public/Utils/sharedUtils');
+const { generateId, isWixHostedImage } = require('../public/Utils/sharedUtils');
 
 const MAX_PHONES_COUNT = 10;
 const MAX_ADDRESSES_COUNT = 10;
@@ -793,8 +793,14 @@ async function personalDetailsOnReady({
           : null
         : itemMemberObj[key];
 
-      if (imageValue) {
-        _$w(imageSelector).src = imageValue;
+      if (imageValue && imageValue?.trim()) {
+        // Only set profile image if it's Wix-hosted; other images will always be wix url
+        const isProfileImage = imageSelector === '#profileImage';
+        const shouldSetImage = !isProfileImage || isWixHostedImage(imageValue);
+
+        if (shouldSetImage) {
+          _$w(imageSelector).src = imageValue;
+        }
         _$w(nameSelector).text = formatFileName(extractFileName(imageValue));
         _$w(containerSelector).expand();
         uploadedImages[key === 'bannerImages' ? 'bannerImage' : key] = imageValue;

package/public/Utils/sharedUtils.js

@@ -158,6 +158,13 @@ function generateId() {
   return `${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
 }
 
+function isWixHostedImage(imageUrl) {
+  return (
+    imageUrl?.trim() &&
+    (imageUrl?.startsWith('wix:') || imageUrl?.startsWith('https://static.wixstatic.com'))
+  );
+}
+
 module.exports = {
   checkAddressIsVisible,
   formatPracticeAreasForDisplay,
@@ -169,4 +176,5 @@ module.exports = {
   toRadians,
   generateId,
   formatAddress,
+  isWixHostedImage,
 };