abmp-npm 1.8.16 → 1.8.18

package/backend/consts.js

@@ -12,9 +12,22 @@ const PRECISION = 3;
 const MAX__MEMBERS_SEARCH_RESULTS = 120;
 const WIX_QUERY_MAX_LIMIT = 1000;
 
+/**
+ * Member action types
+ * @readonly
+ * @enum {string}
+ */
+const MEMBER_ACTIONS = {
+  UPDATE: 'update',
+  NEW: 'new',
+  DROP: 'drop',
+  NONE: 'none',
+};
+
 module.exports = {
   CONFIG_KEYS,
   PRECISION,
   MAX__MEMBERS_SEARCH_RESULTS,
   WIX_QUERY_MAX_LIMIT,
+  MEMBER_ACTIONS,
 };

package/backend/index.js

@@ -1,4 +1,5 @@
 module.exports = {
   ...require('./forms-methods'),
   ...require('./search-filters-methods'),
+  ...require('./members-data-methods'),
 };

package/backend/members-data-methods.js

@@ -1,7 +1,15 @@
+const { auth } = require('@wix/essentials');
+const { currentMember } = require('@wix/members');
+
 const { COLLECTIONS } = require('../public/consts');
 
+const { MEMBER_ACTIONS } = require('./consts');
 const { wixData } = require('./elevated-modules');
 const { createSiteMember } = require('./members-area-methods');
+const { formatDateToMonthYear, getAddressDisplayOptions, isStudent } = require('./utils');
+
+// Elevate currentMember.getMember to bypass permissions
+const elevatedGetMember = auth.elevate(currentMember.getMember);
 
 /**
  * Retrieves member data by member ID
@@ -49,7 +57,82 @@ async function createContactAndMemberIfNew(memberData) {
   }
 }
 
+/**
+ * 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 {
+    // Get current logged-in member using elevated permissions
+    const member = await elevatedGetMember();
+    if (!member || !member._id) {
+      console.log(
+        'member not found from currentMember.getMember() for memberIdInput',
+        memberIdInput
+      );
+      return invalidTokenResponse;
+    }
+
+    // Query member data using elevated permissions (suppressAuth equivalent)
+    const { items } = await wixData
+      .query(COLLECTIONS.MEMBERS_DATA)
+      .eq('contactId', member._id)
+      .find();
+
+    console.log('items', items[0]);
+    console.log('member._id', member._id);
+
+    if (!items[0]?._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 ${items[0]?._id}`);
+
+    const memberData = items[0];
+
+    // Format membership dates
+    memberData.memberships = memberData.memberships.map(membership => ({
+      ...membership,
+      membersince: formatDateToMonthYear(membership.membersince),
+    }));
+
+    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 };
+  } catch (error) {
+    console.error('Error in validateMemberToken:', error);
+    throw error;
+  }
+}
+
 module.exports = {
   findMemberByWixDataId,
   createContactAndMemberIfNew,
+  validateMemberToken,
 };

package/backend/utils.js

@@ -39,7 +39,50 @@ 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;
+}
+
 module.exports = {
   getSiteConfigs,
   retrieveAllItems,
+  formatDateToMonthYear,
+  isStudent,
+  getAddressDisplayOptions,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.8.16",
+  "version": "1.8.18",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/pages/personalDetails.js

@@ -48,8 +48,6 @@ const FORM_SECTION_HANDLER_MAP = {
 
 async function personalDetailsOnReady({
   $w: _$w,
-  memberTokenId,
-  baseUrl,
   getInterestAll,
   saveRegistrationData,
   validateMemberToken,
@@ -102,14 +100,11 @@ async function personalDetailsOnReady({
   let memberData, isValid, isStudent;
 
   // Main initialization
-  console.log('memberTokenId', memberTokenId);
-  console.log('baseUrl', baseUrl);
-
-  const memberTokenIdAPI = await wixLocation.query();
-  console.log('memberTokenIdAPI with await', memberTokenIdAPI);
+  const queryParams = await wixLocation.query();
+  const memberTokenId = queryParams.token;
+  const baseUrl = await wixLocation.baseUrl();
 
-  const baseUrlAPI = await wixLocation.baseUrl();
-  console.log('baseUrlAPI with await', baseUrlAPI);
+  console.log('memberTokenId', memberTokenId);
 
   if (!memberTokenId) {
     showUnauthorizedState();