abmp-npm 10.3.16 → 10.3.18

package/backend/association-expiry.js

@@ -1,5 +1,5 @@
-// The per-association expiry rule. Shared by the daily sync, the backfill and the directory query
-// so they cannot drift on what "expired" means. No Wix imports.
+// The per-association expiry rule, shared by the sync, the backfill and the read paths so they
+// cannot drift on what "expired" means. Deliberately free of Wix imports.
 
 const ASSOCIATION_EXPIRATION_FIELD = 'associationExpiration';
 const ASSOCIATION_TIME_ZONE = 'America/Denver';
@@ -14,11 +14,8 @@ const EXPIRATION_OUTCOMES = {
   UNREADABLE_EXPIRATION: 'unreadableExpiration',
 };
 
-/**
- * PAC sends expirations as zoneless ISO strings ("2027-06-12T00:00:00"). `new Date()` would read
- * those as local time, so the same feed would mean different days depending on where it ran.
- * @returns {Date|null} UTC midnight, or null if absent or unreadable
- */
+// PAC sends zoneless ISO strings, which `new Date()` would read as local time - the same feed
+// would then mean different days depending on where it ran.
 const parseExpirationToUtcDate = expiration => {
   if (typeof expiration !== 'string') return null;
 
@@ -37,10 +34,8 @@ const parseExpirationToUtcDate = expiration => {
   return isRealDate ? parsed : null;
 };
 
-/**
- * @returns {{ date: Date|null, outcome: string }} outcome explains a null date, for the backfill
- *   report: no entry for this association is a different thing from a malformed date.
- */
+// outcome explains a null date for the backfill report: no entry for this association is a very
+// different thing from a malformed one.
 const classifyAssociationExpiration = (member, siteAssociation) => {
   if (!siteAssociation) {
     return { date: null, outcome: EXPIRATION_OUTCOMES.NO_SITE_ASSOCIATION };
@@ -96,11 +91,8 @@ const memberNeedsAssociationExpirationBackfill = (member, siteAssociation) => {
   return storedTime !== resolvedTime;
 };
 
-/**
- * Today in Denver, where PAC operates. UTC rolls over first, so a UTC-derived today would hide
- * everyone expiring that day up to seven hours early, every evening.
- * @param {Date} [now] injectable for tests
- */
+// Today in Denver, where PAC operates. UTC rolls over first, so a UTC-derived today would hide
+// everyone expiring that day up to seven hours early, every evening.
 const getTodayInAssociationTimeZone = (now = new Date()) => {
   try {
     const parts = new Intl.DateTimeFormat('en-US', {
@@ -127,6 +119,17 @@ const getTodayInAssociationTimeZone = (now = new Date()) => {
   }
 };
 
+// Mirrors the directory query's `.ge()` for a record already in hand, so search, the profile page
+// and the members area cannot disagree. Missing or unreadable is not current, as in the query.
+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,
@@ -134,6 +137,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,11 @@ function buildMembersSearchQuery(data) {
         .ne('action', 'drop')
         .ne('memberships.membertype', MEMBERSHIPS_TYPES.PAC_STAFF)
         .eq('isVisible', true);
+
+      // Filter in the query, not after it: count() and skip() in run() then page over the
+      // filtered set. Do not publish this to a site whose backfill has not run - members with no
+      // date are excluded, and before the backfill that is all of them.
+      query = query.ge(ASSOCIATION_EXPIRATION_FIELD, getTodayInAssociationTimeZone());
       let filterConfig = [
         {
           filterKey: 'practiceAreas',

package/backend/consts.js

@@ -43,6 +43,12 @@ const LOGIN_EMAIL_SYNC_STATUS = {
   SKIPPED: 'skipped', // member has no wixMemberId, nothing to change
 };
 
+// Thrown by the data layer, recognised by the login layer, which turns it into the ordinary error
+// response rather than a 500.
+const LOGIN_REFUSAL_REASONS = {
+  ASSOCIATION_MEMBERSHIP_EXPIRED: 'ASSOCIATION_MEMBERSHIP_EXPIRED',
+};
+
 module.exports = {
   CONFIG_KEYS,
   MAX__MEMBERS_SEARCH_RESULTS,
@@ -55,4 +61,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,9 @@ async function createCoreMemberData(inputMemberData, existingDbMember, currentPa
     memberships: inputMemberData.memberships,
     pageNumber: currentPageNumber,
     isVisible: inputMemberData.action !== MEMBER_ACTIONS.DROP,
+    // Belongs here, not in getNewMemberOnlyFields: that returns {} for existing members, so the
+    // date would never refresh on renewal and a member who paid would stay hidden. null = hidden.
+    [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,12 @@ async function synchronizeSinglePage(taskObject) {
       }
       return isUpdatedMember(member);
     });
-    const toSyncMembersWithFilteredLicenses = toSyncMembers.map(member =>
-      filterLicensesByAssociation(member, siteAssociation)
-    );
+    // Narrow each member to this site's association: licenses filtered to it, and its expiration
+    // lifted out of the memberships array into a scalar the directory query can filter on.
+    const toSyncMembersWithFilteredLicenses = toSyncMembers.map(member => ({
+      ...filterLicensesByAssociation(member, siteAssociation),
+      [ASSOCIATION_EXPIRATION_FIELD]: resolveAssociationExpiration(member, siteAssociation),
+    }));
     if (toSyncMembers.length === 0) {
       return {
         success: true,

package/backend/jobs.js

@@ -134,7 +134,7 @@ async function runDailyPullExecutionCheck(options = {}) {
 }
 
 /**
- * One-off backfill of associationExpiration. Run with `{ dryRun: true }` first to get the count of
+ * One-off backfill of associationExpiration. Run with `{ dryRun: true }` first: it counts the
  * members that resolve to no date, and would therefore be hidden, without writing anything.
  * @param {Object} [options]
  * @param {boolean} [options.dryRun]

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,15 @@ async function validateMemberToken(memberIdInput) {
       return invalidTokenResponse;
     }
 
+    // Ends an already-open session once the association lapses. Without this, a member logged in
+    // before their expiry date keeps editing a listing the directory no longer shows.
+    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 +144,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');
@@ -561,8 +562,8 @@ const getAllMembersWithoutContactFormEmail = async () => {
 };
 
 /**
- * Every member, unfiltered. The expiry backfill has to count members with no readable expiration,
- * so filtering the query would hide the records its report exists to surface.
+ * Every member, unfiltered. Filtering would hide the very records the expiry backfill's report
+ * exists to surface - the ones with no readable expiration.
  * @returns {Promise<Array>} - Array of member data
  */
 const getAllMembers = async () => {
@@ -696,6 +697,14 @@ async function prepareMemberForSSOLogin(data) {
     if (!memberData) {
       throw new Error(`Member data not found for memberId ${memberId}`);
     }
+    // Before ensureWixMemberAndContactExist, which creates the Wix member and contact when they are
+    // missing - refusing later would still provision an account for someone who cannot use it.
+    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,13 @@ const getMemberProfileData = async (slug, siteAssociation) => {
       return null;
     }
 
+    // Gated here rather than in getMemberBySlug: that also backs URL uniqueness during the sync,
+    // where an expired member's slug must still count as taken or a new member could claim it.
+    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/backend/tasks/tasks-configs.js

@@ -256,7 +256,9 @@ const TASKS = {
     getIdentifier: task => task.data,
     process: associationExpiryBackfillChunk,
     shouldSkipCheck: () => false,
-    estimatedDurationSec: 80,
+    // A packing budget, not a timeout: the manager fills each 240s tick with tasks costing
+    // estimate x 1.5. Chunks measured at ~6.5s, so 10 gives 16 per tick with room to spare.
+    estimatedDurationSec: 10,
   },
   [TASKS_NAMES.dailyPullExecutionCheck]: {
     name: TASKS_NAMES.dailyPullExecutionCheck,

package/package.json

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

package/pages/personalDetails.js

@@ -166,10 +166,14 @@ async function personalDetailsOnReady({
 
   try {
     const {
-      memberData: { isStudent: _isStudent, ...memberDataResponse },
+      memberData: validatedMember,
       isValid: isValidResponse,
       membersExternalPortalUrl: _membersExternalPortalUrl,
     } = await validateMemberToken(memberTokenId);
+    // validateMemberToken returns memberData: null for every rejection, expired and dropped
+    // included. Destructuring that directly threw, so the catch below showed the "something is
+    // broken" screen instead of the unauthorized one built for exactly this.
+    const { isStudent: _isStudent, ...memberDataResponse } = validatedMember ?? {};
     memberData = memberDataResponse;
     isValid = isValidResponse;
     isStudent = _isStudent;