abmp-npm 1.8.44 → 1.9.0

package/pages/LoadingPage.js

@@ -0,0 +1,20 @@
+const { window: wixWindow, rendering } = require('@wix/site-window');
+
+const { LIGHTBOX_NAMES } = require('../public/consts');
+const { checkAndLogin } = require('../public/sso-auth-methods');
+
+async function loadingPageOnReady(authenticateSSOToken) {
+  const renderingEnv = await rendering.env();
+  //This calls needs to triggered on client side, otherwise PAC API will return 401 error
+  if (renderingEnv === 'browser') {
+    //Need to pass processSubmission to checkAndLogin so it will run as a web method not a public one.
+    await checkAndLogin(authenticateSSOToken).catch(error => {
+      wixWindow.openLightbox(LIGHTBOX_NAMES.LOGIN_ERROR_ALERT);
+      console.error(`Something went wrong while logging in: ${error}`);
+    });
+  }
+}
+
+module.exports = {
+  loadingPageOnReady,
+};

package/pages/Profile.js

@@ -1,7 +1,7 @@
 const { location: wixLocation } = require('@wix/site-location');
 const { window: wixWindow } = require('@wix/site-window');
 
-const { DEFAULT_PROFILE_IMAGE, LIGHTBOX_NAMES } = require('../public/consts');
+const { LIGHTBOX_NAMES } = require('../public/consts');
 const { generateId, formatPracticeAreasForDisplay } = require('../public/Utils/sharedUtils');
 
 const TESTIMONIALS_PER_PAGE_CONFIG = {
@@ -120,7 +120,7 @@ async function profileOnReady({ $w: _$w }) {
     if (profileData.profileImage) {
       _$w('#profileImage').src = profileData.profileImage;
     } else {
-      _$w('#profileImage').src = DEFAULT_PROFILE_IMAGE;
+      _$w('#profileImage').src = profileData.defaultProfileImage;
     }
   }
 

package/pages/Save Alerts.js

@@ -0,0 +1,14 @@
+const { lightbox } = require('@wix/site-window');
+
+const { ABMP_MEMBERS_HOME_URL } = require('../public/consts');
+
+function saveAlertsOnReady({ $w: _$w }) {
+  _$w('#closeButton').onClick(async () => await lightbox.close());
+  _$w('#cancelButton').onClick(async () => await lightbox.close());
+  _$w('#leaveButton').link = ABMP_MEMBERS_HOME_URL;
+  _$w('#leaveButton').target = '_blank';
+}
+
+module.exports = {
+  saveAlertsOnReady,
+};

package/pages/index.js

@@ -3,4 +3,5 @@ module.exports = {
   ...require('./Profile.js'),
   ...require('./Home.js'),
   ...require('./personalDetails.js'),
+  ...require('./LoadingPage.js'),
 };

package/pages/personalDetails.js

@@ -3,7 +3,6 @@ const { window: wixWindow } = require('@wix/site-window');
 const _ = require('lodash');
 
 const {
-  ABMP_MEMBERS_HOME_URL,
   ADDRESS_STATUS_TYPES,
   DEFAULT_BUSINESS_NAME_TEXT,
   FREE_WEBSITE_TEXT_STATES,
@@ -34,6 +33,7 @@ const MAIN_STATE_BOX_STATES = {
   FORM_STATE: 'formState',
   UNAUTHORIZED_STATE: 'unauthorizedState',
   ERROR_STATE: 'errorState',
+  LOADING_STATE: 'loading',
 };
 
 const FALLBACK_ADDRESS_STATUS = ADDRESS_STATUS_TYPES.STATE_CITY_ZIP;
@@ -99,7 +99,7 @@ async function personalDetailsOnReady({
     _$w('#mainMultiStateBox').changeState(MAIN_STATE_BOX_STATES.UNAUTHORIZED_STATE);
   };
 
-  let memberData, isValid, isStudent;
+  let memberData, isValid, isStudent, membersExternalPortalUrl;
 
   // Main initialization
   const queryParams = await wixLocation.query();
@@ -117,10 +117,12 @@ async function personalDetailsOnReady({
     const {
       memberData: { isStudent: _isStudent, ...memberDataResponse },
       isValid: isValidResponse,
+      membersExternalPortalUrl: _membersExternalPortalUrl,
     } = await validateMemberToken(memberTokenId);
     memberData = memberDataResponse;
     isValid = isValidResponse;
     isStudent = _isStudent;
+    membersExternalPortalUrl = _membersExternalPortalUrl;
   } catch (error) {
     console.error(`Error in validateMemberToken memberTokenId : ${memberTokenId}`, error);
     _$w('#mainMultiStateBox').changeState(MAIN_STATE_BOX_STATES.ERROR_STATE);
@@ -141,9 +143,11 @@ async function personalDetailsOnReady({
     try {
       const isFormHasUnsavedChanges = Object.values(formHasUnsavedChanges).some(Boolean);
       if (isFormHasUnsavedChanges) {
-        wixWindow.openLightbox(LIGHTBOX_NAMES.SAVE_ALERT);
+        wixWindow.openLightbox(LIGHTBOX_NAMES.SAVE_ALERT, {
+          membersExternalPortalUrl,
+        });
       } else {
-        await wixLocation.to(ABMP_MEMBERS_HOME_URL);
+        await wixLocation.to(membersExternalPortalUrl);
       }
     } catch (error) {
       console.error('Logout failed:', error);
@@ -617,11 +621,11 @@ async function personalDetailsOnReady({
 
     // Get memberships array
     const memberships = Array.isArray(itemMemberObj.memberships) ? itemMemberObj.memberships : [];
-    // Find ABMP object
-    const abmp = memberships.find(m => m.association === 'ABMP');
+    // Find Site Association Member Since
+    const siteAssociationMemberSince = memberships.find(m => m.isSiteAssociation)?.membersince;
     // Set yearJoinedText
-    if (abmp && abmp.membersince) {
-      _$w('#yearJoinedText').text = abmp.membersince;
+    if (siteAssociationMemberSince) {
+      _$w('#yearJoinedText').text = siteAssociationMemberSince;
     } else {
       _$w('#yearJoinedText').text = 'Year joined not provided';
     }

package/public/Utils/sharedUtils.js

@@ -168,5 +168,4 @@ module.exports = {
   calculateDistance,
   toRadians,
   generateId,
-  formatAddress,
 };

package/public/consts.js

@@ -11,6 +11,7 @@ const COLLECTIONS = {
   STATE: 'State',
   INTERESTS: 'interests',
   STATE_CITY_MAP: 'City',
+  UPDATED_LOGIN_EMAILS: 'updatedLoginEmails',
 };
 
 /**
@@ -83,31 +84,19 @@ const LIGHTBOX_NAMES = {
   CONTACT_US: 'Contact Us',
 };
 
-const ABMP_MEMBERS_HOME_URL = 'https://www.abmp.com/members';
-
 const FREE_WEBSITE_TEXT_STATES = {
   ENABLED: 'This is the default and will auto-populate with the information entered on this page.',
   DISABLED: 'To deactivate, please opt in via Personal Details.',
 };
 
 const DEFAULT_BUSINESS_NAME_TEXT = 'Business name not provided';
-
-const DEFAULT_SEO_DESCRIPTION =
-  'Find a licensed ABMP massage therapist or bodyworker near you! Powered by Associated Bodywork & Massage Professionals. ';
-
-const DEFAULT_PROFILE_IMAGE =
-  'https://static.wixstatic.com/media/1d7134_e052e9b1d0a543d0980650e16dd6d374~mv2.jpg';
-
-const ABMP_LOGO_URL =
-  'https://static.wixstatic.com/media/3eb9c9_b7447dc19d1b48cc99348a828cf77278~mv2.png';
-
-const SITE_ASSOCIATION = 'ABMP';
-
-const MEMBERSHIPS_TYPES = {
-  STUDENT: 'Student',
-  PAC_STAFF: 'PAC STAFF',
+const PAGES_PATHS = {
+  PROFILE: 'profile',
+  MEMBERS_FORM: 'directory-website-update',
 };
 
+const ABMP_MEMBERS_HOME_URL = 'https://www.abmp.com/members';
+
 module.exports = {
   REGEX,
   COLLECTIONS,
@@ -117,12 +106,8 @@ module.exports = {
   DEBOUNCE_DELAY,
   MEMBERS_FIELDS,
   LIGHTBOX_NAMES,
-  ABMP_MEMBERS_HOME_URL,
   FREE_WEBSITE_TEXT_STATES,
   DEFAULT_BUSINESS_NAME_TEXT,
-  DEFAULT_SEO_DESCRIPTION,
-  DEFAULT_PROFILE_IMAGE,
-  ABMP_LOGO_URL,
-  SITE_ASSOCIATION,
-  MEMBERSHIPS_TYPES,
+  PAGES_PATHS,
+  ABMP_MEMBERS_HOME_URL,
 };

package/public/index.js

@@ -1,5 +1,4 @@
 module.exports = {
   ...require('./consts'),
   ...require('./messages'),
-  ...require('./Utils/sharedUtils'),
 };

package/public/sso-auth-methods.js

@@ -0,0 +1,43 @@
+const { location: wixLocationFrontend } = require('@wix/site-location');
+const { authentication } = require('@wix/site-members');
+const { local } = require('@wix/site-storage');
+
+const { PAGES_PATHS } = require('./consts');
+
+const checkAndLogin = async authenticateSSOToken => {
+  const query = await wixLocationFrontend.query();
+  const token = query['token']?.trim();
+  try {
+    if (token) {
+      const authObj = await authenticateSSOToken(token);
+      console.log('authObj', authObj);
+      if (authObj.type == 'success') {
+        console.log('success');
+        await Promise.all([
+          authentication.applySessionToken(authObj?.sessionToken),
+          local.setItem('memberId', authObj.memberId),
+        ]);
+        console.log('memberId', authObj.memberId);
+        const queryParams = {
+          ...query,
+          token: authObj?.memberId,
+        };
+        const redirectTo = `${PAGES_PATHS.MEMBERS_FORM}?${new URLSearchParams(queryParams).toString()}`;
+        await wixLocationFrontend.to(`/${redirectTo}`);
+      } else {
+        console.error('Something went wrong while logging in');
+        throw new Error('Authentication failed - invalid response from server');
+      }
+    } else {
+      console.log('checkAndLogin: No token found');
+      throw new Error('No authentication token found in URL');
+    }
+  } catch (error) {
+    console.error('Error in checkAndLogin', error);
+    throw error;
+  }
+};
+
+module.exports = {
+  checkAndLogin,
+};

package/backend/routers-methods.js

@@ -1,182 +0,0 @@
-const { DEFAULT_SEO_DESCRIPTION, ABMP_LOGO_URL } = require('../public');
-
-const { fetchAllItemsInParallel: _fetchAllItemsInParallel } = require('./cms-data-methods');
-const { getMemberBySlug } = require('./members-data-methods');
-const { generateSEOTitle, stripHtmlTags, getMemberProfileData } = require('./routers-utils');
-
-/**
- * Profile router handler
- * @param {Object} request - Router request object
- * @param {Object} dependencies - Dependencies (ok, notFound, redirect, sendStatus)
- * @returns {Promise} Router response
- */
-async function profileRouter(request, dependencies) {
-  const { ok, notFound, redirect, sendStatus } = dependencies;
-
-  const slug = request.path[0];
-  if (!slug) {
-    return redirect(request.baseUrl);
-  }
-  try {
-    const member = await getMemberBySlug({
-      slug,
-      excludeDropped: true,
-      excludeSearchedMember: false,
-    });
-
-    if (!member) {
-      return notFound();
-    }
-
-    const profileData = getMemberProfileData(member);
-
-    if (profileData && profileData.showWixUrl) {
-      const ogImage = profileData.profileImage || profileData.logoImage || ABMP_LOGO_URL;
-      const seoTitle = generateSEOTitle(profileData.fullName, profileData.areasOfPractices);
-      // Use stripped HTML from aboutService rich text content
-      let description = stripHtmlTags(profileData.aboutService) || DEFAULT_SEO_DESCRIPTION;
-
-      // Limit description to 160 characters for optimal SEO
-      if (description.length > 160) {
-        description = description.substring(0, 157) + '...';
-      }
-      const profileUrl = `https://www.abmpmembers.com/profile/${profileData.url}`;
-      const isPrivateMember = profileData.isPrivateMember;
-      const seoData = {
-        title: seoTitle,
-        description: description,
-        noIndex: isPrivateMember,
-        metaTags: [
-          {
-            name: 'description',
-            content: description,
-          },
-          {
-            name: 'keywords',
-            content:
-              `${profileData.fullName}, ${profileData.areasOfPractices ? profileData.areasOfPractices.slice(0, 3).join(', ') : ''}, ABMP, ${profileData.city || ''}, ${profileData.state || ''}`
-                .replace(/,\s*,/g, ',')
-                .replace(/^,|,$/g, ''),
-          },
-          {
-            name: 'author',
-            content: profileData.fullName,
-          },
-          {
-            name: 'robots',
-            content: isPrivateMember ? 'noindex, nofollow' : 'index, follow',
-          },
-          // Open Graph tags
-          {
-            property: 'og:type',
-            content: 'profile',
-          },
-          {
-            property: 'og:title',
-            content: seoTitle,
-          },
-          {
-            property: 'og:description',
-            content: description,
-          },
-          {
-            property: 'og:image',
-            content: ogImage,
-          },
-          {
-            property: 'og:url',
-            content: profileUrl,
-          },
-          {
-            property: 'og:site_name',
-            content: 'ABMP Members',
-          },
-          // Twitter Card tags
-          {
-            name: 'twitter:card',
-            content: 'summary_large_image',
-          },
-          {
-            name: 'twitter:title',
-            content: seoTitle,
-          },
-          {
-            name: 'twitter:description',
-            content: description,
-          },
-          {
-            name: 'twitter:image',
-            content: ogImage,
-          },
-          // Additional SEO tags
-          {
-            name: 'geo.region',
-            content: profileData.state || '',
-          },
-          {
-            name: 'geo.placename',
-            content: profileData.city || '',
-          },
-        ].filter(tag => tag.content && tag.content.trim() !== ''), // Remove empty tags
-      };
-      return ok('profile', profileData, seoData);
-    }
-    return notFound();
-  } catch (error) {
-    console.error(error);
-    return sendStatus('500', 'Internal Server Error');
-  }
-}
-
-/**
- * Profile sitemap generator
- * @param {Object} _sitemapRequest - Sitemap request object
- * @param {Object} _dependencies - Dependencies (WixRouterSitemapEntry)
- * @returns {Promise<Array>} Sitemap entries
- */
-async function profileSiteMap(_sitemapRequest, _dependencies) {
-  return [];
-  // Commented out - currently disabled in host site
-  /*
-  const { WixRouterSitemapEntry, wixData } = dependencies;
-  
-  try {
-    const membersQuery = wixData
-      .query(COLLECTIONS.MEMBERS_DATA)
-      .eq('showWixUrl', true)
-      .isNotEmpty('url')
-      .ne('action', 'drop')
-      .fields('url', 'fullName');
-
-    const allMembers = await _fetchAllItemsInParallel(membersQuery);
-
-    const batchSize = 1000;
-    const sitemapEntries = [];
-    const totalItems = allMembers.items.length;
-
-    for (let i = 0; i < totalItems; i += batchSize) {
-      const batch = allMembers.items.slice(i, i + batchSize);
-      const batchEntries = batch.map(member => {
-        const entry = new WixRouterSitemapEntry(member.fullName);
-        entry.pageName = 'profile';
-        entry.url = `profile/${member.url}`;
-        entry.title = member.fullName;
-        entry.changeFrequency = 'monthly';
-        entry.priority = 1.0;
-        return entry;
-      });
-      sitemapEntries.push(...batchEntries);
-    }
-
-    return sitemapEntries;
-  } catch (error) {
-    console.error('Error generating profile sitemap:', error);
-    return [];
-  }
-  */
-}
-
-module.exports = {
-  profileRouter,
-  profileSiteMap,
-};

package/backend/routers-utils.js

@@ -1,158 +0,0 @@
-const { ADDRESS_STATUS_TYPES, SITE_ASSOCIATION, MEMBERSHIPS_TYPES } = require('../public');
-const { formatAddress, generateId, getMainAddress } = require('../public/Utils/sharedUtils');
-
-const { formatDateToMonthYear } = require('./utils');
-
-/**
- * Generates SEO title for member profile
- * @param {string} fullName - Member's full name
- * @param {Array<string>} areasOfPractices - Member's areas of practice
- * @returns {string} SEO title
- */
-function generateSEOTitle(fullName, areasOfPractices) {
-  return `${fullName}${
-    areasOfPractices && areasOfPractices.length > 0
-      ? ` | ${areasOfPractices.slice(0, 3).join(', ')}`
-      : ''
-  } | ABMP Member`;
-}
-
-/**
- * Strips HTML tags and decodes HTML entities from a string
- * @param {string} html - HTML string to clean
- * @returns {string} Cleaned text
- */
-function stripHtmlTags(html) {
-  if (!html) return '';
-  // Remove HTML tags and decode HTML entities
-  return html
-    .replace(/<[^>]*>/g, '') // Remove HTML tags
-    .replace(/&nbsp;/g, ' ') // Replace non-breaking spaces
-    .replace(/&amp;/g, '&') // Replace encoded ampersands
-    .replace(/&lt;/g, '<') // Replace encoded less than
-    .replace(/&gt;/g, '>') // Replace encoded greater than
-    .replace(/&quot;/g, '"') // Replace encoded quotes
-    .replace(/&#39;/g, "'") // Replace encoded apostrophes
-    .replace(/\s+/g, ' ') // Replace multiple whitespace with single space
-    .trim(); // Remove leading/trailing whitespace
-}
-
-/**
- * Check if member has student membership
- * @param {Object} member - Member object
- * @param {boolean} checkAssociation - Whether to check for specific association
- * @returns {boolean} True if member has student membership
- */
-function hasStudentMembership(member, checkAssociation) {
-  const memberships = member?.memberships;
-  if (!Array.isArray(memberships)) return false;
-
-  return memberships.some(membership => {
-    const isStudent = membership.membertype === MEMBERSHIPS_TYPES.STUDENT;
-    const hasCorrectAssociation = !checkAssociation || membership.association === SITE_ASSOCIATION;
-    return isStudent && hasCorrectAssociation;
-  });
-}
-
-/**
- * Check if member should have student badge
- * @param {Object} member - Member object
- * @returns {boolean} True if should have badge
- */
-function shouldHaveStudentBadge(member) {
-  return hasStudentMembership(member, true);
-}
-
-/**
- * Get addresses by status, excluding main address
- * @param {Array} addresses - All addresses
- * @param {Array} addressDisplayOption - Display options
- * @returns {Array} Processed addresses
- */
-function getAddressesByStatus(addresses = [], addressDisplayOption = []) {
-  const visible = addresses.filter(addr => addr.addressStatus !== ADDRESS_STATUS_TYPES.DONT_SHOW);
-  if (visible.length < 2) {
-    return [];
-  }
-  const opts = Array.isArray(addressDisplayOption) ? addressDisplayOption : [];
-  const mainOpt = opts.find(o => o.isMain);
-  const mainKey = mainOpt ? mainOpt.key : visible[0].key;
-  return visible
-    .filter(addr => addr?.key !== mainKey)
-    .map(addr => {
-      const addressString = formatAddress(addr);
-      return addressString ? { _id: generateId(), address: addressString } : null;
-    })
-    .filter(Boolean);
-}
-
-/**
- * Get member profile data formatted for display
- * @param {Object} member - Member object
- * @returns {Object} Formatted profile data
- */
-function getMemberProfileData(member) {
-  if (!member) {
-    throw new Error('member is required');
-  }
-
-  const addresses = member.addresses || [];
-  const licenceNo = member.licenses
-    ?.map(val => val.license)
-    .filter(Boolean)
-    .join(', ');
-  const processedAddresses = getAddressesByStatus(member.addresses, member.addressDisplayOption);
-
-  const memberships = member.memberships || [];
-  const abmp = memberships.find(m => m.association === SITE_ASSOCIATION);
-
-  const areasOfPractices =
-    member.areasOfPractices
-      ?.filter(item => typeof item === 'string' && item.trim().length > 0)
-      .map(item => item.trim())
-      .sort((a, b) =>
-        a.localeCompare(b, undefined, {
-          sensitivity: 'base',
-          numeric: true,
-        })
-      ) || [];
-
-  const mainAddress = getMainAddress(member.addressDisplayOption, addresses);
-
-  return {
-    mainAddress: mainAddress,
-    testimonials: member.testimonial || [],
-    licenceNo,
-    processedAddresses,
-    memberSince: (member.showABMP && abmp && formatDateToMonthYear(abmp?.membersince)) || '',
-    shouldHaveStudentBadge: shouldHaveStudentBadge(member),
-    logoImage: member.logoImage,
-    fullName: member.fullName,
-    profileImage: member.profileImage,
-    showContactForm: member.showContactForm,
-    bookingUrl: member.bookingUrl,
-    aboutService: member.aboutService,
-    businessName: (member.showBusinessName && member.businessName) || '',
-    phone: member.toShowPhone || '',
-    areasOfPractices,
-    gallery: member.gallery,
-    bannerImages: member.bannerImages,
-    showWixUrl: member.showWixUrl,
-    _id: member._id,
-    url: member.url,
-    city: mainAddress?.city || '',
-    state: mainAddress?.state || '',
-    isPrivateMember: member.memberships.some(
-      membership => membership.membertype === MEMBERSHIPS_TYPES.PAC_STAFF
-    ),
-  };
-}
-
-module.exports = {
-  generateSEOTitle,
-  stripHtmlTags,
-  hasStudentMembership,
-  shouldHaveStudentBadge,
-  getAddressesByStatus,
-  getMemberProfileData,
-};

package/backend/tasks.js

@@ -1,37 +0,0 @@
-const { TASKS_NAMES } = require('./consts');
-const { MEMBER_ACTIONS, synchronizeSinglePage, syncMembersDataPerAction } = require('./daily-pull');
-
-const getDailyMembersDataSyncChildTasks = () => {
-  // we don't want to sync none action as it means this members data hasn't changed and we don't need to sync it
-  const MEMBER_ACTIONS_EXCEPT_NONE = Object.values(MEMBER_ACTIONS).filter(
-    action => action !== MEMBER_ACTIONS.NONE
-  );
-  return MEMBER_ACTIONS_EXCEPT_NONE.map(action => ({
-    name: TASKS_NAMES.ScheduleMembersDataPerAction,
-    data: { action },
-  }));
-};
-const TASKS = {
-  [TASKS_NAMES.ScheduleDailyMembersDataSync]: {
-    name: TASKS_NAMES.ScheduleDailyMembersDataSync,
-    scheduleChildrenSequentially: false,
-    estimatedDurationSec: 60,
-    childTasks: getDailyMembersDataSyncChildTasks(),
-  },
-  [TASKS_NAMES.ScheduleMembersDataPerAction]: {
-    name: TASKS_NAMES.ScheduleMembersDataPerAction,
-    getIdentifier: task => task.data.action,
-    process: syncMembersDataPerAction,
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 6,
-  },
-  [TASKS_NAMES.SyncMembers]: {
-    name: TASKS_NAMES.SyncMembers,
-    getIdentifier: task => task,
-    process: synchronizeSinglePage,
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 6,
-  },
-};
-
-module.exports = { TASKS };