abmp-npm 10.3.21 → 10.3.24

package/backend/association-expiry.js

@@ -2,6 +2,7 @@
 // cannot drift on what "expired" means. Deliberately free of Wix imports.
 
 const ASSOCIATION_EXPIRATION_FIELD = 'associationExpiration';
+const PAC_STAFF_MEMBERTYPE = 'PAC STAFF';
 const ASSOCIATION_TIME_ZONE = 'America/Denver';
 
 const EXPIRATION_DATE_PATTERN = /^(\d{4})-(\d{2})-(\d{2})/;
@@ -128,7 +129,20 @@ const isAssociationExpirationCurrent = (member, now) => {
   return expiration.getTime() >= getTodayInAssociationTimeZone(now).getTime();
 };
 
+// PAC staff accounts carry a rolling "expiration" equal to the date of the feed that last mentioned
+// them, so the association gate would lock a staff member out on any day the feed did not resend
+// them (ticket 13031107600). Staff are already excluded from the directory and have no public
+// profile; login is the one place the gate reaches them, and it should not.
+const isPacStaff = member =>
+  Array.isArray(member?.memberships) &&
+  member.memberships.some(membership => membership?.membertype === PAC_STAFF_MEMBERTYPE);
+
+const isLoginAllowedByExpiration = (member, now) =>
+  isPacStaff(member) || isAssociationExpirationCurrent(member, now);
+
 module.exports = {
+  isPacStaff,
+  isLoginAllowedByExpiration,
   parseExpirationToUtcDate,
   classifyAssociationExpiration,
   resolveAssociationExpiration,

package/backend/cms-data-methods.js

@@ -244,9 +244,15 @@ async function fetchAllItemsInParallel(query) {
   const batchSize = WIX_QUERY_MAX_LIMIT;
   const allItems = [];
 
-  const firstResult = await query.skip(0).limit(batchSize).find();
+  // @wix/data leaves totalPages undefined unless the count is requested explicitly, so reading it
+  // off the first page silently stopped this at 1,000 rows. Count first; count() is already what
+  // the typed search relies on.
+  const [totalCount, firstResult] = await Promise.all([
+    query.count(),
+    query.skip(0).limit(batchSize).find(),
+  ]);
 
-  const totalBatches = firstResult.totalPages;
+  const totalBatches = Math.ceil(totalCount / batchSize);
   allItems.push(...firstResult.items);
 
   if (totalBatches > 1) {

package/backend/login/sso-methods.js

@@ -3,7 +3,7 @@ const { createHmac } = require('crypto');
 const axios = require('axios');
 const { decode } = require('jwt-js-decode');
 
-const { isAssociationExpirationCurrent } = require('../association-expiry');
+const { isLoginAllowedByExpiration } = 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');
@@ -80,7 +80,7 @@ async function validateMemberToken(memberIdInput) {
       return invalidTokenResponse;
     }
 
-    if (!isAssociationExpirationCurrent(memberData)) {
+    if (!isLoginAllowedByExpiration(memberData)) {
       console.log(
         `[validateMemberToken] association membership expired for memberId ${memberData.memberId}`
       );

package/backend/members-data-methods.js

@@ -1,7 +1,7 @@
 const { COLLECTIONS } = require('../public/consts');
 const { isWixHostedImage, emailsMatch, normalizeEmail } = require('../public/Utils/sharedUtils');
 
-const { isAssociationExpirationCurrent } = require('./association-expiry');
+const { isLoginAllowedByExpiration } = require('./association-expiry');
 const { MEMBERSHIPS_TYPES, LOGIN_REFUSAL_REASONS } = require('./consts');
 const { createSiteContact } = require('./contacts-methods');
 const { MEMBER_ACTIONS } = require('./daily-pull/consts');
@@ -701,7 +701,7 @@ async function prepareMemberForSSOLogin(data) {
     if (!memberData) {
       throw new Error(`Member data not found for memberId ${memberId}`);
     }
-    if (!isAssociationExpirationCurrent(memberData)) {
+    if (!isLoginAllowedByExpiration(memberData)) {
       console.log(
         `[prepareMemberForSSOLogin] refusing login, association membership expired for memberId ${memberId}`
       );

package/package.json

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

package/pages/Profile.js

@@ -2,6 +2,7 @@ const { location: wixLocation } = require('@wix/site-location');
 const { window: wixWindow } = require('@wix/site-window');
 
 const { LIGHTBOX_NAMES } = require('../public/consts');
+const { hasCopyrightYear, withCurrentCopyrightYear } = require('../public/Utils/copyrightYear');
 const {
   generateId,
   formatPracticeAreasForDisplay,
@@ -20,6 +21,26 @@ const BREAKPOINTS = {
   TABLET: 750,
 };
 
+// The footer reads "© <year> <name>. All rights reserved.": the name goes into #fullNameTextFoter,
+// but the year was typed into each site's editor and has no nickname of its own, so ABMP stayed on
+// 2025 while ASCP and AHP said 2026 (PAC ticket 12914830766). The three profile pages declare the
+// same plain text elements; the copyright notice is found among them by content and its year kept
+// current, so no editor needs touching now or next January.
+const PLAIN_TEXT_ELEMENT_IDS = [
+  '#text389',
+  '#text178',
+  '#text150',
+  '#text155',
+  '#text157',
+  '#text158',
+  '#text164',
+  '#text169',
+  '#text171',
+  '#text175',
+  '#text177',
+  '#text179',
+];
+
 async function profileOnReady({ $w: _$w }) {
   const profileData = await wixWindow.getRouterData();
   console.log('profileData', profileData);
@@ -97,6 +118,23 @@ async function profileOnReady({ $w: _$w }) {
     bindStudentBadge();
     bindProfileImages();
     bindFullName();
+    bindCopyrightYear();
+  }
+
+  function bindCopyrightYear() {
+    PLAIN_TEXT_ELEMENT_IDS.forEach(id => {
+      try {
+        const element = _$w(id);
+        // .html keeps the element's formatting; fall back to .text for elements without markup.
+        if (hasCopyrightYear(element.html)) {
+          element.html = withCurrentCopyrightYear(element.html);
+        } else if (hasCopyrightYear(element.text)) {
+          element.text = withCurrentCopyrightYear(element.text);
+        }
+      } catch {
+        // The element does not exist on this site's page: nothing to update.
+      }
+    });
   }
 
   function bindMemberSince() {

package/public/Utils/copyrightYear.js

@@ -0,0 +1,35 @@
+// The member website footer reads "© <year> <member name>. All rights reserved." The year was typed
+// into each site's editor, so ABMP stayed on 2025 while ASCP and AHP said 2026 (PAC ticket
+// 12914830766). This keeps the year current without anyone touching the editors again.
+// Deliberately free of Wix imports so it can be unit-tested.
+
+const ASSOCIATION_TIME_ZONE = 'America/Denver';
+// Matches the year in "© 2025", "&copy; 2025" (the .html of a text element), "(c) 2025" and
+// "Copyright 2025", and nothing else — "Member since 2025" is left alone.
+const COPYRIGHT_YEAR_PATTERN = /(©|&copy;|\(c\)|copyright)(\s*|&nbsp;)(\d{4})/i;
+
+// PAC operates in Denver; the year should roll over at their midnight, not the visitor's.
+const getCurrentYear = (now = new Date()) => {
+  try {
+    return Number(
+      new Intl.DateTimeFormat('en-US', { timeZone: ASSOCIATION_TIME_ZONE, year: 'numeric' }).format(
+        now
+      )
+    );
+  } catch {
+    return now.getUTCFullYear();
+  }
+};
+
+/** Returns the text with the year after the copyright mark set to the current year, or unchanged. */
+const withCurrentCopyrightYear = (text, now = new Date()) => {
+  if (typeof text !== 'string') return text;
+  return text.replace(
+    COPYRIGHT_YEAR_PATTERN,
+    (_, mark, space) => `${mark}${space}${getCurrentYear(now)}`
+  );
+};
+
+const hasCopyrightYear = text => typeof text === 'string' && COPYRIGHT_YEAR_PATTERN.test(text);
+
+module.exports = { getCurrentYear, withCurrentCopyrightYear, hasCopyrightYear };