abmp-npm 1.1.52 → 1.1.53

package/backend/cms-data-methods.js

@@ -207,7 +207,33 @@ async function fetchAllItemsInParallel(query) {
   };
 }
 
+/**
+ * Get all interests from the database
+ * @returns {Promise<Array<string>>} Array of interest titles sorted alphabetically
+ */
+async function getInterestAll() {
+  try {
+    let res = await wixData.query(COLLECTIONS.INTERESTS).limit(1000).find();
+
+    let interests = res.items.map(x => x.title);
+
+    while (res.hasNext()) {
+      res = await res.next();
+      interests.push(...res.items.map(x => x.title));
+    }
+
+    // Sort the interests alphabetically (case-insensitive)
+    interests = interests.sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
+
+    return interests;
+  } catch (e) {
+    console.error('Error in getInterestAll:', e);
+    throw e;
+  }
+}
+
 module.exports = {
   buildMembersSearchQuery,
   fetchAllItemsInParallel,
+  getInterestAll,
 };

package/backend/consts.js

@@ -12,6 +12,7 @@ const CONFIG_KEYS = {
   INTERESTS_API_URL: 'INTERESTS_API_URL',
   SITE_LOGO_URL: 'SITE_LOGO_URL',
   MEMBERS_EXTERNAL_PORTAL_URL: 'MEMBERS_EXTERNAL_PORTAL_URL',
+  DEFAULT_PROFILE_IMAGE: 'DEFAULT_PROFILE_IMAGE',
 };
 
 const MAX__MEMBERS_SEARCH_RESULTS = 120;

package/backend/contacts-methods.js

@@ -0,0 +1,128 @@
+const { contacts } = require('@wix/crm');
+const { auth } = require('@wix/essentials');
+
+const elevatedGetContact = auth.elevate(contacts.getContact);
+const elevatedUpdateContact = auth.elevate(contacts.updateContact);
+
+/**
+ * Generic contact update helper function
+ * @param {string} contactId - The contact ID in Wix CRM
+ * @param {function} updateInfoCallback - Function that returns the updated info object
+ * @param {string} operationName - Name of the operation for logging
+ */
+async function updateContactInfo(contactId, updateInfoCallback, operationName) {
+  if (!contactId) {
+    throw new Error('Contact ID is required');
+  }
+
+  try {
+    const contact = await elevatedGetContact(contactId);
+    const currentInfo = contact.info;
+    const updatedInfo = updateInfoCallback(currentInfo);
+
+    await elevatedUpdateContact(contactId, { info: updatedInfo }, contact.revision);
+  } catch (error) {
+    console.error(`Error in ${operationName}:`, error);
+    throw new Error(`Failed to ${operationName}: ${error.message}`);
+  }
+}
+
+/**
+ * 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
+ * @param {string} contactId - The contact ID in Wix CRM
+ * @param {string} firstName - The new first name
+ * @param {string} lastName - The new last name
+ */
+async function updateContactNames(contactId, firstName, lastName) {
+  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'
+  );
+}
+
+/**
+ * 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 { contactId } = existingMemberData;
+
+  const updateConfig = [
+    {
+      fields: ['contactFormEmail'],
+      updater: updateContactEmail,
+      args: ([email]) => [contactId, email],
+    },
+    {
+      fields: ['firstName', 'lastName'],
+      updater: updateContactNames,
+      args: ([firstName, lastName]) => [contactId, firstName, lastName],
+    },
+  ];
+
+  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,
+};

package/backend/index.js

@@ -8,4 +8,6 @@ module.exports = {
   ...require('./pac-api-methods'), //TODO: remove it once we finish NPM movement
   ...require('./members-area-methods'), //TODO: remove it once we finish NPM movement
   ...require('./members-data-methods'), //TODO: remove it once we finish NPM movement
+  ...require('./cms-data-methods'), //TODO: remove it once we finish NPM movement
+  ...require('./sso-methods'),
 };

package/backend/members-area-methods.js

@@ -31,6 +31,11 @@ const createSiteMember = async memberDetails => {
   }
 };
 
+const getCurrentMember = async () => {
+  const member = await members.getCurrentMember();
+  return member.member;
+};
+
 /**
  * Updates Wix member login email if the member has a contactId (registered Wix member)
  * @param {Object} member - Member object with contactId and email
@@ -79,5 +84,6 @@ async function updateWixMemberLoginEmail(member, result = {}) {
 
 module.exports = {
   createSiteMember,
+  getCurrentMember,
   updateWixMemberLoginEmail,
 };

package/backend/members-data-methods.js

@@ -1,8 +1,15 @@
 const { COLLECTIONS } = require('../public/consts');
 
+const { updateMemberContactInfo } = require('./contacts-methods');
+const { MEMBER_ACTIONS } = require('./daily-pull');
 const { wixData } = require('./elevated-modules');
 const { createSiteMember } = require('./members-area-methods');
-const { createBatches, normalizeUrlForComparison, queryAllItems } = require('./utils');
+const {
+  createBatches,
+  normalizeUrlForComparison,
+  queryAllItems,
+  generateGeoHash,
+} = require('./utils');
 
 /**
  * Retrieves member data by member ID
@@ -50,10 +57,9 @@ async function createContactAndMemberIfNew(memberData) {
   }
 }
 
-/**
- * Performs bulk save operation for member data
- * @param {Array} memberDataList - Array of member data objects to save
- * @returns {Promise<Object>} - Bulk save operation result
+/** Performs bulk save operation for member data
+ * @param { Array } memberDataList - Array of member data objects to save
+ * @returns { Promise < Object >} - Bulk save operation result
  */
 async function bulkSaveMembers(memberDataList) {
   if (!Array.isArray(memberDataList) || memberDataList.length === 0) {
@@ -71,6 +77,7 @@ async function bulkSaveMembers(memberDataList) {
     throw new Error(`Bulk save failed: ${error.message}`);
   }
 }
+
 /**
  * Retrieves member data by member ID
  * @param {string} memberId - The member ID to search for
@@ -181,9 +188,88 @@ async function getMemberByContactId(contactId) {
   }
 }
 
+/**
+ * Saves member registration data
+ * @param {Object} data - Member data to save
+ * @param {string} id - Member ID
+ * @returns {Promise<Object>} Result object with type and data/error
+ */
+async function saveRegistrationData(data, id) {
+  try {
+    console.log(' saveRegistrationData data._id', data._id);
+    console.log(' saveRegistrationData id', id);
+    if (data._id !== id) return { type: 'notAuthorized' };
+
+    if (data.url) {
+      const isDuplicate = await urlExists(data.url, data.memberId);
+
+      if (isDuplicate) {
+        return {
+          type: 'error',
+          error: 'URL slug is already taken. Please choose a different one.',
+        };
+      }
+    }
+
+    if (data.addresses && Array.isArray(data.addresses)) {
+      data.locHash = generateGeoHash(data.addresses);
+    }
+
+    const existingMemberData = await findMemberByWixDataId(id);
+
+    await updateMemberContactInfo(data, existingMemberData);
+
+    const saveData = await wixData.update(COLLECTIONS.MEMBERS_DATA, data);
+    return {
+      type: 'success',
+      saveData,
+    };
+  } catch (error) {
+    console.error(error);
+    return {
+      type: 'error',
+      error,
+    };
+  }
+}
+
+/**
+ * Checks if a URL already exists in the database for a different member (case-insensitive)
+ * @param {string} url - The URL to check
+ * @param {string|number} excludeMemberId - Member ID to exclude from the check
+ * @returns {Promise<boolean>} - True if URL exists for another member
+ */
+async function urlExists(url, excludeMemberId) {
+  if (!url) return false;
+
+  try {
+    let query = wixData
+      .query(COLLECTIONS.MEMBERS_DATA)
+      .contains('url', url)
+      .ne('action', MEMBER_ACTIONS.DROP);
+
+    if (excludeMemberId) {
+      query = query.ne('memberId', excludeMemberId);
+    }
+
+    const { items } = await query.find();
+
+    // Case-insensitive comparison
+    const matchingMembers = items.filter(
+      item => item.url && item.url.toLowerCase() === url.toLowerCase()
+    );
+
+    return matchingMembers.length > 0;
+  } catch (error) {
+    console.error('Error checking URL existence:', error);
+    return false;
+  }
+}
+
 module.exports = {
   findMemberByWixDataId,
   createContactAndMemberIfNew,
+  saveRegistrationData,
   bulkSaveMembers,
   findMemberById,
   getMemberBySlug,

package/backend/sso-methods.js

@@ -0,0 +1,88 @@
+const { CONFIG_KEYS } = require('./consts');
+const { MEMBER_ACTIONS } = require('./daily-pull');
+const { getCurrentMember } = require('./members-area-methods');
+const { getMemberByContactId } = require('./members-data-methods');
+const {
+  formatDateToMonthYear,
+  getAddressDisplayOptions,
+  isStudent,
+  getSiteConfigs,
+} = require('./utils');
+
+/**
+ * Validates member token and retrieves member data
+ * @param {string} memberIdInput - The member ID to validate
+ * @returns {Promise<{memberData: Object|null, isValid: boolean}>} Validation result with member data
+ */
+async function validateMemberToken(memberIdInput) {
+  const invalidTokenResponse = { memberData: null, isValid: false };
+
+  if (!memberIdInput) {
+    return invalidTokenResponse;
+  }
+
+  try {
+    const member = await getCurrentMember();
+    if (!member || !member._id) {
+      console.log(
+        'member not found from members.getCurrentMember() for memberIdInput',
+        memberIdInput
+      );
+      return invalidTokenResponse;
+    }
+
+    const [dbMember, siteConfigs] = await Promise.all([
+      getMemberByContactId(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('member._id', member._id);
+
+    if (!dbMember?._id) {
+      const errorMessage = `No record found in DB for logged in Member [Corrupted Data - Duplicate Members? ] - There is no match in DB for currentMember: ${JSON.stringify(
+        { memberIdInput, currentMemberId: member._id }
+      )}`;
+      console.error(errorMessage);
+      throw new Error('CORRUPTED_MEMBER_DATA');
+    }
+
+    console.log(`Id found in DB for memberIdInput :${memberIdInput} is ${dbMember?._id}`);
+
+    const memberData = dbMember;
+
+    // Format membership dates
+    memberData.memberships = memberData.memberships.map(membership => ({
+      ...membership,
+      membersince: formatDateToMonthYear(membership.membersince),
+      isSiteAssociation: membership.association === siteAssociation,
+    }));
+
+    const savedMemberId = memberData?._id;
+    const isValid = savedMemberId === memberIdInput;
+
+    if (!savedMemberId || !isValid) {
+      return invalidTokenResponse;
+    }
+
+    // Check if member is dropped
+    if (memberData.action === MEMBER_ACTIONS.DROP) {
+      return invalidTokenResponse;
+    }
+
+    // Add computed properties
+    memberData.addressDisplayOption = getAddressDisplayOptions(memberData);
+    console.log('memberData', memberData);
+    memberData.isStudent = isStudent(memberData);
+
+    return { memberData, isValid, membersExternalPortalUrl };
+  } catch (error) {
+    console.error('Error in validateMemberToken:', error);
+    throw error;
+  }
+}
+
+module.exports = {
+  validateMemberToken,
+};

package/backend/utils.js

@@ -4,6 +4,7 @@ const { COLLECTIONS } = require('../public/consts');
 
 const { CONFIG_KEYS, GEO_HASH_PRECISION } = require('./consts');
 const { wixData } = require('./elevated-modules');
+const { urlExists } = require('./members-data-methods');
 
 /**
  * Retrieves site configuration values from the database
@@ -41,6 +42,46 @@ const retrieveAllItems = async collectionName => {
   return allItems;
 };
 
+/**
+ * Format date to Month Year string
+ * @param {string} dateString - The date string to format
+ * @returns {string} Formatted date (e.g., "January 2024")
+ */
+function formatDateToMonthYear(dateString) {
+  if (!dateString) return '';
+
+  const date = new Date(dateString);
+  if (isNaN(date.getTime())) return '';
+  const options = { year: 'numeric', month: 'long' };
+  return date.toLocaleDateString('en-US', options);
+}
+
+/**
+ * Check if member is a student
+ * @param {Object} member - The member object
+ * @returns {boolean} True if member has student membership
+ */
+function isStudent(member) {
+  const memberships = member?.memberships;
+  if (!Array.isArray(memberships)) return false;
+
+  return memberships.some(membership => membership.membertype === 'student');
+}
+
+/**
+ * Get address display options for member
+ * @param {Object} member - The member object
+ * @returns {Array} Address display options
+ */
+function getAddressDisplayOptions(member) {
+  const addresses = member.addresses || [];
+  const displayOptions = member.addressDisplayOption || [];
+  if (addresses.length === 1 && addresses[0].key) {
+    return [{ key: addresses[0].key, isMain: true }];
+  }
+  return displayOptions;
+}
+
 const queryAllItems = async query => {
   console.log('start query');
   let oldResults = await query.find();
@@ -87,6 +128,28 @@ const normalizeUrlForComparison = url => {
   return url.toLowerCase().replace(/-\d+$/, '');
 };
 
+/**
+ * Checks URL uniqueness for a member
+ * @param {string} url - The URL to check
+ * @param {string} memberId - The member ID to exclude from the check
+ * @returns {Promise<Object>} Result object with isUnique boolean
+ */
+async function checkUrlUniqueness(url, memberId) {
+  if (!url || !memberId) {
+    throw new Error('Missing required parameters: url and memberId are required');
+  }
+
+  try {
+    const trimmedUrl = url.trim();
+    const exists = await urlExists(trimmedUrl, memberId);
+
+    return { isUnique: !exists };
+  } catch (error) {
+    console.error('Error checking URL uniqueness:', error);
+    throw new Error(`Failed to check URL uniqueness: ${error.message}`);
+  }
+}
+
 module.exports = {
   getSiteConfigs,
   retrieveAllItems,
@@ -95,4 +158,8 @@ module.exports = {
   isValidArray,
   normalizeUrlForComparison,
   queryAllItems,
+  checkUrlUniqueness,
+  formatDateToMonthYear,
+  isStudent,
+  getAddressDisplayOptions,
 };

package/eslint.config.js

@@ -31,7 +31,7 @@ module.exports = [
       // Error prevention
       'no-var': 'error',
       'no-unused-vars': ['error', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
-      'no-console': ['warn', { allow: ['warn', 'error', 'log', 'info'] }],
+      'no-console': ['warn', { allow: ['warn', 'error', 'log', 'info', 'group', 'groupEnd'] }],
       'no-debugger': 'warn',
       'no-duplicate-imports': 'error',
       'no-unused-expressions': ['error', { allowShortCircuit: true, allowTernary: true }],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.1.52",
+  "version": "1.1.53",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -34,6 +34,7 @@
     "@wix/secrets": "^1.0.62",
     "@wix/site-location": "^1.31.0",
     "@wix/site-window": "^1.44.0",
+    "lodash": "^4.17.21",
     "ngeohash": "^0.6.3",
     "phone": "^3.1.67",
     "psdev-task-manager": "1.1.7",