abmp-npm 2.0.82 → 2.0.83

package/backend/association-expiry.js

@@ -119,6 +119,15 @@ const getTodayInAssociationTimeZone = (now = new Date()) => {
   }
 };
 
+const isAssociationExpirationCurrent = (member, now) => {
+  const stored = member?.[ASSOCIATION_EXPIRATION_FIELD];
+  const expiration = stored instanceof Date ? stored : stored ? new Date(stored) : null;
+
+  if (!expiration || Number.isNaN(expiration.getTime())) return false;
+
+  return expiration.getTime() >= getTodayInAssociationTimeZone(now).getTime();
+};
+
 module.exports = {
   parseExpirationToUtcDate,
   classifyAssociationExpiration,
@@ -126,6 +135,7 @@ module.exports = {
   summarizeExpirationOutcomes,
   memberNeedsAssociationExpirationBackfill,
   getTodayInAssociationTimeZone,
+  isAssociationExpirationCurrent,
   ASSOCIATION_EXPIRATION_FIELD,
   ASSOCIATION_TIME_ZONE,
   EXPIRATION_OUTCOMES,

package/backend/cms-data-methods.js

@@ -4,6 +4,10 @@ const { COLLECTIONS, MEMBERS_FIELDS } = require('../public/consts.js');
 const { findMainAddress } = require('../public/Utils/sharedUtils.js');
 const { calculateDistance, shuffleArray } = require('../public/Utils/sharedUtils.js');
 
+const {
+  getTodayInAssociationTimeZone,
+  ASSOCIATION_EXPIRATION_FIELD,
+} = require('./association-expiry');
 const {
   GEO_HASH_PRECISION,
   MAX__MEMBERS_SEARCH_RESULTS,
@@ -34,6 +38,8 @@ function buildMembersSearchQuery(data) {
         .ne('action', 'drop')
         .ne('memberships.membertype', MEMBERSHIPS_TYPES.PAC_STAFF)
         .eq('isVisible', true);
+
+      query = query.ge(ASSOCIATION_EXPIRATION_FIELD, getTodayInAssociationTimeZone());
       let filterConfig = [
         {
           filterKey: 'practiceAreas',

package/backend/consts.js

@@ -43,6 +43,10 @@ const LOGIN_EMAIL_SYNC_STATUS = {
   SKIPPED: 'skipped', // member has no wixMemberId, nothing to change
 };
 
+const LOGIN_REFUSAL_REASONS = {
+  ASSOCIATION_MEMBERSHIP_EXPIRED: 'ASSOCIATION_MEMBERSHIP_EXPIRED',
+};
+
 module.exports = {
   CONFIG_KEYS,
   MAX__MEMBERS_SEARCH_RESULTS,
@@ -55,4 +59,5 @@ module.exports = {
   SSO_TOKEN_AUTH_API_URL,
   BACKUP_API_URL,
   LOGIN_EMAIL_SYNC_STATUS,
+  LOGIN_REFUSAL_REASONS,
 };

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

@@ -1,4 +1,5 @@
 const { ADDRESS_STATUS_TYPES } = require('../../public/consts');
+const { ASSOCIATION_EXPIRATION_FIELD } = require('../association-expiry');
 const { findMemberById, getMemberBySlug } = require('../members-data-methods');
 const { isValidArray, generateGeoHash } = require('../utils');
 
@@ -198,6 +199,7 @@ async function createCoreMemberData(inputMemberData, existingDbMember, currentPa
     memberships: inputMemberData.memberships,
     pageNumber: currentPageNumber,
     isVisible: inputMemberData.action !== MEMBER_ACTIONS.DROP,
+    [ASSOCIATION_EXPIRATION_FIELD]: inputMemberData[ASSOCIATION_EXPIRATION_FIELD] ?? null,
 
     // Handle Member emails
     ...getMemberEmails(),

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

@@ -1,5 +1,9 @@
 const { taskManager } = require('psdev-task-manager');
 
+const {
+  resolveAssociationExpiration,
+  ASSOCIATION_EXPIRATION_FIELD,
+} = require('../association-expiry');
 const { CONFIG_KEYS } = require('../consts');
 const { fetchPACMembers } = require('../pac-api-methods');
 const { TASKS_NAMES } = require('../tasks/consts');
@@ -126,9 +130,10 @@ async function synchronizeSinglePage(taskObject) {
       }
       return isUpdatedMember(member);
     });
-    const toSyncMembersWithFilteredLicenses = toSyncMembers.map(member =>
-      filterLicensesByAssociation(member, siteAssociation)
-    );
+    const toSyncMembersWithFilteredLicenses = toSyncMembers.map(member => ({
+      ...filterLicensesByAssociation(member, siteAssociation),
+      [ASSOCIATION_EXPIRATION_FIELD]: resolveAssociationExpiration(member, siteAssociation),
+    }));
     if (toSyncMembers.length === 0) {
       return {
         success: true,

package/backend/login/sso-methods.js

@@ -3,7 +3,8 @@ const { createHmac } = require('crypto');
 const axios = require('axios');
 const { decode } = require('jwt-js-decode');
 
-const { CONFIG_KEYS, SSO_TOKEN_AUTH_API_URL } = require('../consts');
+const { isAssociationExpirationCurrent } = require('../association-expiry');
+const { CONFIG_KEYS, SSO_TOKEN_AUTH_API_URL, LOGIN_REFUSAL_REASONS } = require('../consts');
 const { MEMBER_ACTIONS } = require('../daily-pull/consts');
 const { getCurrentMember } = require('../members-area-methods');
 const { getCMSMemberByWixMemberId, prepareMemberForSSOLogin } = require('../members-data-methods');
@@ -79,6 +80,13 @@ async function validateMemberToken(memberIdInput) {
       return invalidTokenResponse;
     }
 
+    if (!isAssociationExpirationCurrent(memberData)) {
+      console.log(
+        `[validateMemberToken] association membership expired for memberId ${memberData.memberId}`
+      );
+      return invalidTokenResponse;
+    }
+
     // Add computed properties
     memberData.addressDisplayOption = getAddressDisplayOptions(memberData);
     console.log('memberData', memberData);
@@ -134,7 +142,14 @@ const authenticateSSOToken = async ({ token }) => {
   if (isValidToken) {
     const jwt = decode(responseToken);
     const payload = jwt.payload;
-    const memberData = await prepareMemberForSSOLogin(payload);
+    let memberData;
+    try {
+      memberData = await prepareMemberForSSOLogin(payload);
+    } catch (error) {
+      if (error.message !== LOGIN_REFUSAL_REASONS.ASSOCIATION_MEMBERSHIP_EXPIRED) throw error;
+      console.log('[authenticateSSOToken] refusing login, association membership expired');
+      return { type: 'error', memberId: '', sessionToken: '' };
+    }
     console.log('memberDataCollectionId', memberData._id);
     const sessionToken = await generateMemberSessionToken(memberData.email);
     const authObj = {

package/backend/members-data-methods.js

@@ -1,7 +1,8 @@
 const { COLLECTIONS } = require('../public/consts');
 const { isWixHostedImage, emailsMatch, normalizeEmail } = require('../public/Utils/sharedUtils');
 
-const { MEMBERSHIPS_TYPES } = require('./consts');
+const { isAssociationExpirationCurrent } = require('./association-expiry');
+const { MEMBERSHIPS_TYPES, LOGIN_REFUSAL_REASONS } = require('./consts');
 const { createSiteContact } = require('./contacts-methods');
 const { MEMBER_ACTIONS } = require('./daily-pull/consts');
 const { wixData } = require('./elevated-modules');
@@ -696,6 +697,12 @@ async function prepareMemberForSSOLogin(data) {
     if (!memberData) {
       throw new Error(`Member data not found for memberId ${memberId}`);
     }
+    if (!isAssociationExpirationCurrent(memberData)) {
+      console.log(
+        `[prepareMemberForSSOLogin] refusing login, association membership expired for memberId ${memberId}`
+      );
+      throw new Error(LOGIN_REFUSAL_REASONS.ASSOCIATION_MEMBERSHIP_EXPIRED);
+    }
     console.log('memberData', memberData);
     return await ensureWixMemberAndContactExist(memberData);
   } catch (error) {

package/backend/routers/utils.js

@@ -1,4 +1,5 @@
 const { getMainAddress } = require('../../public/Utils/sharedUtils');
+const { isAssociationExpirationCurrent } = require('../association-expiry');
 const { getMemberBySlug } = require('../members-data-methods');
 const {
   getMoreAddressesToDisplay,
@@ -113,6 +114,11 @@ const getMemberProfileData = async (slug, siteAssociation) => {
       return null;
     }
 
+    if (!isAssociationExpirationCurrent(member)) {
+      console.log(`[getMemberProfileData] Association membership expired for slug: ${slug}`);
+      return null;
+    }
+
     return transformMemberToProfileData(member, siteAssociation);
   } catch (error) {
     const errorMessage = `Error in getMemberProfileData for slug: ${slug} : ${error.message}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "2.0.82",
+  "version": "2.0.83",
   "main": "index.js",
   "files": [
     "index.js",