abmp-npm 1.10.21 → 1.10.22

package/backend/contacts-methods.js

@@ -3,7 +3,33 @@ const { auth } = require('@wix/essentials');
 
 const elevatedGetContact = auth.elevate(contacts.getContact);
 const elevatedUpdateContact = auth.elevate(contacts.updateContact);
+const elevatedCreateContact = auth.elevate(contacts.createContact);
 
+/**
+ * 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 createContact(contactData, allowDuplicates = false) {
+  if (!contactData || !(contactData.contactFormEmail || contactData.email)) {
+    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 }] },
+    ],
+    phones: [{ items: phones.map(phone => ({ phone })) }],
+  };
+  const createContactResponse = await elevatedCreateContact(contactInfo, { allowDuplicates });
+  return createContactResponse.contact._id;
+}
 /**
  * Generic contact update helper function
  * @param {string} contactId - The contact ID in Wix CRM
@@ -55,27 +81,33 @@ async function updateContactEmail(contactId, newEmail) {
 }
 
 /**
- * Updates contact names in Wix CRM
- * @param {string} contactId - The contact ID in Wix CRM
- * @param {string} firstName - The new first name
- * @param {string} lastName - The new last name
+ * 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(contactId, firstName, lastName) {
+async function updateMemberAndContactNames({ wixContactId, wixMemberId, firstName, lastName }) {
+  //TODO: rethink if we should keep all info just in contact, meaning no need to update the member
   if (!firstName && !lastName) {
     throw new Error('At least one name field is required');
   }
 
-  return await updateContactInfo(
-    contactId,
-    currentInfo => ({
-      ...currentInfo,
-      name: {
-        first: firstName || currentInfo?.name?.first || '',
-        last: lastName || currentInfo?.name?.last || '',
-      },
-    }),
-    'update contact names'
-  );
+  const createNameUpdate = currentInfo => ({
+    ...currentInfo,
+    name: {
+      first: firstName || currentInfo?.name?.first || '',
+      last: lastName || currentInfo?.name?.last || '',
+    },
+  });
+
+  const updatePromises = [
+    wixContactId && updateContactInfo(wixContactId, createNameUpdate, 'update contact names'),
+    wixMemberId && updateContactInfo(wixMemberId, createNameUpdate, 'update member names'),
+  ].filter(Boolean);
+
+  return await Promise.all(updatePromises);
 }
 
 /**
@@ -97,18 +129,18 @@ const updateIfChanged = (existingValues, newValues, updater, argsBuilder) => {
  * @param {Object} existingMemberData - Existing member data
  */
 const updateMemberContactInfo = async (data, existingMemberData) => {
-  const { contactId } = existingMemberData;
+  const { wixContactId, wixMemberId } = existingMemberData;
 
   const updateConfig = [
     {
       fields: ['contactFormEmail'],
       updater: updateContactEmail,
-      args: ([email]) => [contactId, email],
+      args: ([email]) => [wixContactId, email],
     },
     {
       fields: ['firstName', 'lastName'],
-      updater: updateContactNames,
-      args: ([firstName, lastName]) => [contactId, firstName, lastName],
+      updater: updateMemberAndContactNames,
+      args: ([firstName, lastName]) => [{ firstName, lastName, wixContactId, wixMemberId }],
     },
   ];
 
@@ -125,4 +157,5 @@ const updateMemberContactInfo = async (data, existingMemberData) => {
 
 module.exports = {
   updateMemberContactInfo,
+  createContact,
 };

package/backend/daily-pull/bulk-process-methods.js

@@ -168,7 +168,7 @@ const bulkProcessAndSaveMemberData = async ({
     const toChangeWixMembersEmails = [];
     const toSaveMembersData = uniqueUrlsMembersData.map(member => {
       const { isLoginEmailChanged, isNewToDb: _isNewToDb, ...restMemberData } = member;
-      if (member.contactId && isLoginEmailChanged) {
+      if (member.wixMemberId && isLoginEmailChanged) {
         toChangeWixMembersEmails.push(member);
       }
       return restMemberData; //we don't want to store the isLoginEmailChanged in the database, it's just a flag to know if we need to change the login email in Members area

package/backend/daily-pull/sync-to-cms-methods.js

@@ -9,10 +9,9 @@ const { bulkProcessAndSaveMemberData } = require('./bulk-process-methods');
 const { SITES_WITH_INTERESTS_TO_MIGRATE } = require('./consts');
 const { isUpdatedMember, isSiteAssociatedMember } = require('./utils');
 
-async function syncMembersDataPerAction(taskData) {
-  const { action, backupDate } = taskData;
+async function syncMembersDataPerAction(action) {
   try {
-    const firstPageResponse = await fetchPACMembers({ page: 1, action, backupDate });
+    const firstPageResponse = await fetchPACMembers(1, action);
 
     if (
       !firstPageResponse ||
@@ -49,7 +48,6 @@ async function syncMembersDataPerAction(taskData) {
       data: {
         pageNumber,
         action,
-        ...(backupDate ? { backupDate } : {}),
       },
       type: 'scheduled',
     }));
@@ -76,11 +74,11 @@ async function syncMembersDataPerAction(taskData) {
  * @returns {Promise<Object>} - Page synchronization result
  */
 async function synchronizeSinglePage(taskObject) {
-  const { pageNumber, action, backupDate } = taskObject.data;
+  const { pageNumber, action } = taskObject.data;
   try {
     const [siteAssociation, memberDataResponse] = await Promise.all([
       getSiteConfigs(CONFIG_KEYS.SITE_ASSOCIATION),
-      fetchPACMembers({ page: pageNumber, action, backupDate }),
+      fetchPACMembers(pageNumber, action),
     ]);
     const addInterests = SITES_WITH_INTERESTS_TO_MIGRATE.includes(siteAssociation);
     if (

package/backend/forms-methods.js

@@ -16,7 +16,7 @@ const contactSubmission = async (data, memberDataId) => {
     console.log('Member contact form is not enabled for user, skipping contact submission!');
     return;
   }
-  let memberContactId = memberData.contactId;
+  let memberContactId = memberData.wixContactId;
   if (!memberContactId) {
     /**
      * Create a member contact here since some members may have never logged in
@@ -27,7 +27,7 @@ const contactSubmission = async (data, memberDataId) => {
      */
     console.info('Member contact id not found for user, creating new contact!');
     const member = await createContactAndMemberIfNew(memberData);
-    memberContactId = member.contactId;
+    memberContactId = member.wixContactId;
   }
   console.log('memberContactId', memberContactId);
   const emailTriggered = await triggerAutomation(automationEmailTriggerId, {
@@ -40,7 +40,7 @@ const contactSubmission = async (data, memberDataId) => {
   data = {
     ...data,
     phone: Number(data.phone),
-    memberContactId: memberContactId,
+    memberContactId,
     memberEmail: memberData.contactFormEmail,
   };
   await wixData.insert(COLLECTIONS.CONTACT_US_SUBMISSIONS, data);

package/backend/jobs.js

@@ -13,18 +13,12 @@ async function runScheduledTasks() {
   }
 }
 
-/**
- * Schedule a daily pull task for the given backup date
- * @param {string} backupDate - Optional. The date of the backup to pull in format YYYY-MM-DD
- * @returns {Promise<void>}
- */
-async function scheduleDailyPullTask(backupDate = null) {
+async function scheduleDailyPullTask() {
   try {
     console.log('scheduleDailyPullTask started!');
-    console.log(`backupDate: ${backupDate}`);
     return await taskManager().schedule({
       name: TASKS_NAMES.ScheduleDailyMembersDataSync,
-      data: backupDate ? { backupDate } : {}, // keeping it like this so it would be easier to understand which task was backed up which is not while looking into CMS.
+      data: {},
       type: 'scheduled',
     });
   } catch (error) {

package/backend/login/qa-login-methods.js

@@ -1,4 +1,4 @@
-const { getMemberByEmail, getQAUsers } = require('../members-data-methods');
+const { prepareMemberForQALogin, getQAUsers } = require('../members-data-methods');
 const { getSecret } = require('../utils');
 
 const validateQAUser = async userEmail => {
@@ -20,27 +20,23 @@ const validateQAUser = async userEmail => {
  */
 const loginQAMember = async ({ userEmail, secret }, generateSessionToken) => {
   try {
-    const userValidation = await validateQAUser(userEmail);
+    const [userValidation, qaSecret] = await Promise.all([
+      validateQAUser(userEmail),
+      getSecret('ABMP_QA_SECRET'),
+    ]);
     if (userValidation.error) {
       return { success: false, error: userValidation.error };
     }
-
-    const qaSecret = await getSecret('ABMP_QA_SECRET');
     if (secret !== qaSecret) {
       return { success: false, error: 'Invalid secret' };
     }
 
-    const token = await generateSessionToken(userValidation.email, qaSecret);
-
-    const result = await getMemberCMSId(userEmail);
-    if (!result.success) {
-      return { success: false, error: result.error };
-    }
-
+    const memberData = await prepareMemberForQALogin(userValidation.email);
+    const token = await generateSessionToken(memberData.email, qaSecret);
     return {
       success: true,
       token,
-      memberCMSId: result.memberCMSId,
+      memberCMSId: memberData._id,
     };
   } catch (error) {
     console.error('QA login error:', error);
@@ -48,25 +44,6 @@ const loginQAMember = async ({ userEmail, secret }, generateSessionToken) => {
   }
 };
 
-async function getMemberCMSId(userEmail) {
-  try {
-    const userValidation = await validateQAUser(userEmail);
-    if (userValidation.error) {
-      return { success: false, error: userValidation.error };
-    }
-
-    const member = await getMemberByEmail(userEmail);
-
-    if (!member) {
-      return { success: false, error: `No Member found in DB matching email: ${userEmail}` };
-    }
-    return { success: true, memberCMSId: member._id };
-  } catch (error) {
-    console.error('Error getting member CMS ID:', error);
-    return { success: false, error: 'Failed to retrieve member data' };
-  }
-}
-
 module.exports = {
   loginQAMember,
 };

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, getSiteMemberId } = require('../members-data-methods');
+const { getMemberByContactId, prepareMemberForSSOLogin } = require('../members-data-methods');
 const {
   formatDateToMonthYear,
   getAddressDisplayOptions,
@@ -133,12 +133,12 @@ const authenticateSSOToken = async ({ token }, generateSessionToken) => {
   if (isValidToken) {
     const jwt = decode(responseToken);
     const payload = jwt.payload;
-    const membersData = await getSiteMemberId(payload);
-    console.log('membersDataCollectionId', membersData._id);
-    const sessionToken = await generateSessionToken(membersData.email);
+    const memberData = await prepareMemberForSSOLogin(payload);
+    console.log('memberDataCollectionId', memberData._id);
+    const sessionToken = await generateSessionToken(memberData.email);
     const authObj = {
       type: 'success',
-      memberId: membersData._id,
+      memberId: memberData._id,
       sessionToken,
     };
     return authObj;

package/backend/members-area-methods.js

@@ -2,10 +2,11 @@ const { auth } = require('@wix/essentials');
 const { members, authentication } = require('@wix/members');
 const elevatedCreateMember = auth.elevate(members.createMember);
 
-function prepareContactData(partner) {
+function prepareMemberData(partner) {
   const phones = Array.isArray(partner.phones) ? partner.phones : []; //some users don't have phones
   const options = {
     member: {
+      //Keeping contact creation in member data for future purposes, in case we need to use it later
       contact: {
         ...partner,
         phones,
@@ -22,9 +23,8 @@ async function createMemberFunction(member) {
 }
 const createSiteMember = async memberDetails => {
   try {
-    const options = prepareContactData(memberDetails);
-    const contactId = await createMemberFunction(options);
-    return contactId;
+    const options = prepareMemberData(memberDetails);
+    return await createMemberFunction(options);
   } catch (error) {
     console.error(`Error in createSiteMember ${error.message}`);
     throw error;
@@ -37,22 +37,25 @@ const getCurrentMember = async () => {
 };
 
 /**
- * Updates Wix member login email if the member has a contactId (registered Wix member)
- * @param {Object} member - Member object with contactId and email
+ * Updates Wix member login email if the member has a wixMemberId (registered Wix member)
+ * @param {Object} member - Member object with wixMemberId and email
  * @param {Object} result - Result object to track Wix member updates
  */
 async function updateWixMemberLoginEmail(member, result = {}) {
-  if (!member.contactId) {
-    console.log(`Member ${member.memberId} has no contactId - skipping Wix login email update`);
+  if (!member.wixMemberId) {
+    console.log(`Member ${member.memberId} has no wixMemberId - skipping Wix login email update`);
     return;
   }
 
   try {
     console.log(
-      `Updating Wix login email for member ${member.memberId} (contactId: ${member.contactId})`
+      `Updating Wix login email for member ${member.memberId} (wixMemberId: ${member.wixMemberId})`
     );
 
-    const updatedWixMember = await authentication.changeLoginEmail(member.contactId, member.email);
+    const updatedWixMember = await authentication.changeLoginEmail(
+      member.wixMemberId,
+      member.email
+    );
 
     console.log(
       `✅ Successfully updated Wix login email for member ${member.memberId}: ${updatedWixMember.loginEmail}`
@@ -75,7 +78,7 @@ async function updateWixMemberLoginEmail(member, result = {}) {
     }
     result.wixMemberErrors.push({
       memberId: member.memberId,
-      contactId: member.contactId,
+      wixMemberId: member.wixMemberId,
       email: member.email,
       error: error.message,
     });

package/backend/members-data-methods.js

@@ -1,8 +1,7 @@
 const { COLLECTIONS } = require('../public/consts');
-const { isWixHostedImage } = require('../public/Utils/sharedUtils');
 
 const { MEMBERSHIPS_TYPES } = require('./consts');
-const { updateMemberContactInfo } = 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');
@@ -43,10 +42,14 @@ async function createContactAndMemberIfNew(memberData) {
       phones: memberData.phones,
       contactFormEmail: memberData.contactFormEmail || memberData.email,
     };
-    const contactId = await createSiteMember(toCreateMemberData);
+    const [wixMemberId, wixContactId] = await Promise.all([
+      createSiteMember(toCreateMemberData),
+      createContact(toCreateMemberData),
+    ]);
     let memberDataWithContactId = {
       ...memberData,
-      contactId,
+      wixMemberId,
+      wixContactId,
     };
     const updatedResult = await updateMember(memberDataWithContactId);
     memberDataWithContactId = {
@@ -94,10 +97,16 @@ async function findMemberById(memberId) {
     const queryResult = await wixData
       .query(COLLECTIONS.MEMBERS_DATA)
       .eq('memberId', memberId)
+      .limit(2)
       .find();
-
-    return queryResult.items.length > 0 ? queryResult.items[0] : null;
+    if (queryResult.items.length > 1) {
+      throw new Error(
+        `Multiple members found with memberId ${memberId} members _ids are : [${queryResult.items.map(member => member._id).join(', ')}]`
+      );
+    }
+    return queryResult.items.length === 1 ? queryResult.items[0] : null;
   } catch (error) {
+    console.error('Error finding member by ID:', error);
     throw new Error(`Failed to retrieve member data: ${error.message}`);
   }
 }
@@ -319,9 +328,9 @@ async function getAllMembersWithExternalImages() {
 
     const allItems = await queryAllItems(membersQuery);
 
-    // Filter for external images (not 'wix hosted images')
+    // Filter for external images (not starting with 'wix:')
     const membersWithExternalImages = allItems.filter(
-      member => member.profileImage && !isWixHostedImage(member.profileImage)
+      member => member.profileImage && !member.profileImage.startsWith('wix:')
     );
 
     return membersWithExternalImages;
@@ -442,38 +451,53 @@ const getQAUsers = async () => {
     throw new Error(`Failed to get QA users: ${error.message}`);
   }
 };
-async function getSiteMemberId(data) {
+/**
+ * Ensures member has a contact - creates one if missing
+ * @param {Object} memberData - Member data from DB
+ * @returns {Promise<Object>} - Member data with contactId
+ */
+async function ensureMemberHasContact(memberData) {
+  if (!memberData) {
+    throw new Error('Member data is required');
+  }
+  if (!memberData.contactId) {
+    const memberDataWithContactId = await createContactAndMemberIfNew(memberData);
+    return memberDataWithContactId;
+  }
+  return memberData;
+}
+async function prepareMemberForSSOLogin(data) {
   try {
     console.log('data', data);
     const memberId = data?.pac?.cst_recno;
     if (!memberId) {
-      const errorMessage = `Member ID is missing in passed data ${JSON.stringify(data)}`;
-      console.error(errorMessage);
-      throw new Error(errorMessage);
+      throw new Error(`Member ID is missing in passed data ${JSON.stringify(data)}`);
     }
-    const queryMemberResult = await wixData
-      .query(COLLECTIONS.MEMBERS_DATA)
-      .eq('memberId', Number(memberId))
-      .find()
-      .then(res => res.items);
-    if (!queryMemberResult.length || queryMemberResult.length > 1) {
-      throw new Error(
-        `Invalid Members count found in DB for email ${data.email} members count is : [${
-          queryMemberResult.length
-        }] membersIds are : [${queryMemberResult.map(member => member.memberId).join(', ')}]`
-      );
+    const memberData = await findMemberById(Number(memberId));
+    if (!memberData) {
+      throw new Error(`Member data not found for memberId ${memberId}`);
     }
-    let memberData = queryMemberResult[0];
     console.log('memberData', memberData);
-    const isNewUser = !memberData.contactId;
-    if (isNewUser) {
-      const memberDataWithContactId = await createContactAndMemberIfNew(memberData);
-      console.log('memberDataWithContactId', memberDataWithContactId);
-      memberData = memberDataWithContactId;
+    return await ensureMemberHasContact(memberData);
+  } catch (error) {
+    console.error('Error in prepareMemberForSSOLogin', error.message);
+    throw error;
+  }
+}
+async function prepareMemberForQALogin(email) {
+  try {
+    console.log('qa email:', email);
+    if (!email) {
+      throw new Error(`Email is missing in passed data ${email}`);
+    }
+    const memberData = await getMemberByEmail(email);
+    if (!memberData) {
+      throw new Error(`Member data not found for email ${email}`);
     }
-    return memberData;
+    console.log('memberData', memberData);
+    return await ensureMemberHasContact(memberData);
   } catch (error) {
-    console.error('Error in getSiteMemberId', error.message);
+    console.error('Error in prepareMemberForQALogin', error.message);
     throw error;
   }
 }
@@ -540,7 +564,8 @@ module.exports = {
   getMembersByIds,
   getMemberByEmail,
   getQAUsers,
-  getSiteMemberId,
+  prepareMemberForSSOLogin,
+  prepareMemberForQALogin,
   checkUrlUniqueness,
   trackButtonClick,
 };

package/backend/pac-api-methods.js

@@ -1,4 +1,4 @@
-const { PAC_API_URL, BACKUP_API_URL } = require('./consts');
+const { PAC_API_URL } = require('./consts');
 const { getSecret } = require('./utils');
 
 const getHeaders = async () => {
@@ -8,22 +8,8 @@ const getHeaders = async () => {
   };
   return headers;
 };
-/**
- *
- * @param {*} params
- * @param {number} params.page - The page number to fetch
- * @param {string} params.action - The action to fetch
- * @param {string} [params.backupDate] - Optional. The backup date to fetch in format YYYY-MM-DD, use only to fetch from backup endpoint not from PAC endpoint.
- * @returns {Promise<Object>} - The response from the API
- */
-const fetchPACMembers = async ({ page, action, backupDate }) => {
-  const baseUrl = backupDate ? BACKUP_API_URL : PAC_API_URL;
-  const queryParams = { page, actionFilter: action };
-  if (backupDate) {
-    queryParams.date = backupDate;
-  }
-  const url = `${baseUrl}/Members?${new URLSearchParams(queryParams).toString()}`;
-  console.log(`Fetching PAC members from:  ${url}`);
+const fetchPACMembers = async (pageNum, actionFilter) => {
+  const url = `${PAC_API_URL}/Members?page=${pageNum}&actionFilter=${actionFilter}`;
   const headers = await getHeaders();
   const fetchOptions = {
     method: 'get',
@@ -32,14 +18,14 @@ const fetchPACMembers = async ({ page, action, backupDate }) => {
   const response = await fetch(url, fetchOptions);
   const responseType = response.headers.get('content-type');
   if (!responseType.includes('application/json')) {
-    const errorMessage = `[fetchPACMembers] got invalid responseType: ${responseType} for page ${page} and actionFilter ${action}`;
+    const errorMessage = `[fetchPACMembers] got invalid responseType: ${responseType} for page ${pageNum} and actionFilter ${actionFilter}`;
     console.error(errorMessage);
     throw new Error(errorMessage);
   }
   if (response.ok) {
     return response.json();
   } else {
-    const errorMessage = `[fetchPACMembers] failed with status ${response.status} for page ${page} and actionFilter ${action}`;
+    const errorMessage = `[fetchPACMembers] failed with status ${response.status} for page ${pageNum} and actionFilter ${actionFilter}`;
     console.error(errorMessage);
     throw new Error(errorMessage);
   }

package/backend/routers/methods.js

@@ -1,5 +1,4 @@
 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');
@@ -28,11 +27,7 @@ const createRoutersHandlers = wixRouterMethods => {
       const defaultProfileImage = siteConfigs[CONFIG_KEYS.DEFAULT_PROFILE_IMAGE];
       const profileData = await getMemberProfileData(slug, siteAssociation);
       if (profileData && profileData.showWixUrl) {
-        const profileImage =
-          profileData.profileImage?.trim() && isWixHostedImage(profileData.profileImage)
-            ? profileData.profileImage
-            : defaultProfileImage;
-        const ogImage = profileImage || profileData.logoImage || siteLogoUrl;
+        const ogImage = profileData.profileImage || profileData.logoImage || siteLogoUrl;
         const seoTitle = generateSEOTitle({
           fullName: profileData.fullName,
           areasOfPractices: profileData.areasOfPractices,

package/backend/tasks/tasks-configs.js

@@ -43,7 +43,7 @@ const TASKS = {
   },
   [TASKS_NAMES.ScheduleMembersDataPerAction]: {
     name: TASKS_NAMES.ScheduleMembersDataPerAction,
-    getIdentifier: task => task.data,
+    getIdentifier: task => task.data.action,
     process: syncMembersDataPerAction,
     shouldSkipCheck: () => false,
     estimatedDurationSec: 6,

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

@@ -1,36 +1,29 @@
 const crypto = require('crypto');
 
-const { auth } = require('@wix/essentials');
 const { files } = require('@wix/media');
 const aws4 = require('aws4');
 const axios = require('axios');
 
-const elevatedGenerateFileUploadUrl = auth.elevate(files.generateFileUploadUrl);
-
 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');
+
 async function getServerlessAuth() {
   const serverlessAuth = await getSecret('serverless_auth');
   return serverlessAuth;
 }
 
 function isValidImageUrl(url) {
-  console.log('url', url);
-  console.log('typeof url', typeof url);
   if (!url || typeof url !== 'string') return false;
 
   // Check for valid URL format
   let parsedUrl;
   try {
     parsedUrl = new URL(url);
-    console.log('parsedUrl', parsedUrl);
   } catch {
     return false;
   }
-  console.log('parsedUrl', parsedUrl);
-  console.log('parsedUrl.protocol', parsedUrl.protocol);
+
   // Only allow HTTP and HTTPS protocols (reject blob:, data:, file:, etc.)
   const validProtocols = ['http:', 'https:'];
   if (!validProtocols.includes(parsedUrl.protocol)) {
@@ -40,10 +33,10 @@ function isValidImageUrl(url) {
   // Extract file extension from URL (handle query parameters)
   const urlPath = url.split('?')[0].toLowerCase();
   const validExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.bmp'];
-  console.log('urlPath', urlPath);
+
   // Check if URL ends with valid extension
   const hasValidExtension = validExtensions.some(ext => urlPath.endsWith(ext));
-  console.log('hasValidExtension', hasValidExtension);
+
   // Reject obviously invalid extensions
   const invalidExtensions = [
     '.pdf',
@@ -58,7 +51,7 @@ function isValidImageUrl(url) {
     '_gif',
   ];
   const hasInvalidExtension = invalidExtensions.some(ext => urlPath.includes(ext));
-  console.log('hasInvalidExtension', hasInvalidExtension);
+
   return hasValidExtension && !hasInvalidExtension;
 }
 
@@ -145,23 +138,20 @@ 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 (!trimmedProfileImage || isWixHostedImage(trimmedProfileImage)) {
+    if (!member.profileImage || member.profileImage.startsWith('wix:')) {
       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(trimmedProfileImage)) {
-      console.log(`Member ${memberId} has invalid image URL format: ${trimmedProfileImage}`);
+    if (!isValidImageUrl(member.profileImage)) {
+      console.log(`Member ${memberId} has invalid image URL format: ${member.profileImage}`);
       return { success: true, message: 'Invalid image URL format - skipped' };
     }
 
-    // Encode URL to handle spaces and special characters in the path
-    const encodedImageUrl = encodeURI(trimmedProfileImage);
-
-    const response = await axios.get(encodedImageUrl, {
+    const response = await axios.get(member.profileImage, {
       responseType: 'arraybuffer',
       headers: {
         'User-Agent':
@@ -218,7 +208,7 @@ async function updateMemberProfileImage(memberId) {
 
     const sanitizedFileName = `profile-${memberId}-${Date.now()}.${extension}`.replace(/\./g, '_');
     const uploadUrl = (
-      await elevatedGenerateFileUploadUrl(contentType, {
+      await files.generateFileUploadUrl(contentType, {
         fileName: sanitizedFileName,
         filePath: 'member-profiles',
       })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.10.21",
+  "version": "1.10.22",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",
@@ -50,7 +50,7 @@
     "csv-parser": "^3.0.0",
     "ngeohash": "^0.6.3",
     "phone": "^3.1.67",
-    "psdev-task-manager": "1.1.10",
+    "psdev-task-manager": "1.1.7",
     "psdev-utils": "1.1.1"
   }
 }

package/pages/Home.js

@@ -9,7 +9,6 @@ const {
   getMainAddress,
   formatPracticeAreasForDisplay,
   checkAddressIsVisible,
-  isWixHostedImage,
 } = require('../public/Utils/sharedUtils.js');
 
 let filter = JSON.parse(JSON.stringify(DEFAULT_FILTER));
@@ -188,7 +187,7 @@ const homePageOnReady = async ({
         : [];
 
       // 2) Profile image
-      if (itemData.profileImage?.trim() && isWixHostedImage(itemData.profileImage)) {
+      if (itemData.profileImage) {
         $item('#profileImage').src = itemData.profileImage;
       }
 
@@ -211,16 +210,9 @@ const homePageOnReady = async ({
       // 5) Location text
       const mainAddress = getMainAddress(itemData.addressDisplayOption, addresses);
       $item('#location').text = mainAddress || '';
-
-      // 6) Miles away
-      const isNearbyEnabled = _$w('#nearBy').checked;
       const miles = itemData.distance ?? 0;
-
-      if (isNearbyEnabled && miles) {
-        $item('#differenceInMiles').text = miles.toFixed(1);
-        $item('#milesAwayText').text = 'miles away';
-      } else {
-        $item('#differenceInMiles').text = '';
+      $item('#differenceInMiles').text = miles ? miles.toFixed(1) : '';
+      if (!miles) {
         $item('#milesAwayText').text = '';
       }
 

package/pages/Profile.js

@@ -2,11 +2,7 @@ const { location: wixLocation } = require('@wix/site-location');
 const { window: wixWindow } = require('@wix/site-window');
 
 const { LIGHTBOX_NAMES } = require('../public/consts');
-const {
-  generateId,
-  formatPracticeAreasForDisplay,
-  isWixHostedImage,
-} = require('../public/Utils/sharedUtils');
+const { generateId, formatPracticeAreasForDisplay } = require('../public/Utils/sharedUtils');
 
 const TESTIMONIALS_PER_PAGE_CONFIG = {
   DESKTOP: 4,
@@ -121,7 +117,7 @@ async function profileOnReady({ $w: _$w }) {
       _$w('#logoImage').delete();
     }
 
-    if (profileData.profileImage && isWixHostedImage(profileData.profileImage)) {
+    if (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, isWixHostedImage } = require('../public/Utils/sharedUtils');
+const { generateId } = require('../public/Utils/sharedUtils');
 
 const MAX_PHONES_COUNT = 10;
 const MAX_ADDRESSES_COUNT = 10;
@@ -793,14 +793,8 @@ async function personalDetailsOnReady({
           : null
         : itemMemberObj[key];
 
-      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;
-        }
+      if (imageValue) {
+        _$w(imageSelector).src = imageValue;
         _$w(nameSelector).text = formatFileName(extractFileName(imageValue));
         _$w(containerSelector).expand();
         uploadedImages[key === 'bannerImages' ? 'bannerImage' : key] = imageValue;
@@ -1686,13 +1680,7 @@ async function personalDetailsOnReady({
       option.isMain = false;
     });
 
-    let selectedOption = itemMemberObj.addressDisplayOption.find(opt => opt.key === selectedId);
-
-    // If the option doesn't exist, create it
-    if (!selectedOption) {
-      selectedOption = { key: selectedId, isMain: false };
-      itemMemberObj.addressDisplayOption.push(selectedOption);
-    }
+    const selectedOption = itemMemberObj.addressDisplayOption.find(opt => opt.key === selectedId);
 
     selectedOption.isMain = true;
   }

package/public/Utils/sharedUtils.js

@@ -158,13 +158,6 @@ 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,
@@ -176,5 +169,4 @@ module.exports = {
   toRadians,
   generateId,
   formatAddress,
-  isWixHostedImage,
 };