abmp-npm 1.1.75 → 1.1.77

package/backend/consts.js

@@ -1,6 +1,5 @@
 const PAC_API_URL = 'https://members.abmp.com/eweb/api/Wix';
 const SSO_TOKEN_AUTH_API_URL = 'https://members.professionalassistcorp.com/';
-const SSO_TOKEN_AUTH_API_KEY = 'testkey';
 
 /**
  * Valid configuration keys for getSiteConfigs function
@@ -41,5 +40,4 @@ module.exports = {
   COMPILED_FILTERS_FIELDS,
   MEMBERSHIPS_TYPES,
   SSO_TOKEN_AUTH_API_URL,
-  SSO_TOKEN_AUTH_API_KEY,
 };

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

@@ -42,7 +42,7 @@ const ensureUniqueUrl = async ({ url, memberId, fullName }) => {
     excludeDropped: true,
     excludeSearchedMember: true,
     memberId,
-    queryAllMatches: true,
+    normalizeSlugForComparison: true,
   });
   if (existingMember && existingMember.url) {
     console.log(

package/backend/data-hooks.js

@@ -1,7 +1,7 @@
 const { taskManager, TASK_TYPE } = require('psdev-task-manager');
 
 const { COMPILED_FILTERS_FIELDS } = require('./consts');
-const { TASKS_NAMES } = require('./tasks');
+const { TASKS_NAMES } = require('./tasks/consts');
 
 const scheduleCompileFiltersTask = field =>
   taskManager().schedule({

package/backend/elevated-modules.js

@@ -11,7 +11,8 @@ const wixData = {
   remove: auth.elevate(items.remove),
   get: auth.elevate(items.get),
   truncate: auth.elevate(items.truncate),
+  bulkSave: auth.elevate(items.bulkSave),
+  search: auth.elevate(items.search),
   //TODO: add other methods here as needed
 };
-
 module.exports = { wixData };

package/backend/index.js

@@ -10,7 +10,7 @@ module.exports = {
   ...require('./members-data-methods'), //TODO: remove it once we finish NPM movement
   ...require('./cms-data-methods'), //TODO: remove it once we finish NPM movement
   ...require('./routers'),
-  ...require('./sso-methods'),
+  ...require('./login'),
   ...require('./data-hooks'),
   ...require('./http-functions'),
 };

package/backend/jobs.js

@@ -1,6 +1,7 @@
 const { taskManager } = require('psdev-task-manager');
 
-const { TASKS, TASKS_NAMES } = require('./tasks');
+const { TASKS_NAMES } = require('./tasks/consts');
+const { TASKS } = require('./tasks/tasks-configs');
 
 async function runScheduledTasks() {
   try {

package/backend/login/index.js

@@ -0,0 +1,7 @@
+const { createLoginMethods } = require('./login-methods-factory');
+const { validateMemberToken } = require('./sso-methods');
+
+module.exports = {
+  createLoginMethods,
+  validateMemberToken,
+};

package/backend/login/login-methods-factory.js

@@ -0,0 +1,24 @@
+const { loginQAMember } = require('./qa-login-methods');
+const { authenticateSSOToken } = require('./sso-methods');
+
+/**
+ * Creates login methods with injected generateSessionToken dependency
+ * @param {Function} generateSessionToken - The Velo generateSessionToken function to inject
+ * @returns {Object} Object containing loginQAMember and authenticateSSOToken methods
+ */
+const createLoginMethods = generateSessionToken => {
+  //There is no generateSessionToken SDK version,  and the signOn of @wix/identity returns 403 error regardless that the permissions are valid
+  //Therefore, as a workaround we need to inject the Velo version of generateSessionToken to the login methods.
+  const injectGenerateSessionTokenToMethod =
+    method =>
+    async (...args) =>
+      await method(...args, generateSessionToken);
+  return {
+    loginQAMember: injectGenerateSessionTokenToMethod(loginQAMember),
+    authenticateSSOToken: injectGenerateSessionTokenToMethod(authenticateSSOToken),
+  };
+};
+
+module.exports = {
+  createLoginMethods,
+};

package/backend/{qa-login-methods.js → login/qa-login-methods.js}

@@ -1,18 +1,24 @@
-const { authentication } = require('@wix/members');
-
-const { getMemberByEmail, getQAUsers } = require('./members-data-methods');
-const { getSecret } = require('./utils');
+const { getMemberByEmail, getQAUsers } = require('../members-data-methods');
+const { getSecret } = require('../utils');
 
 const validateQAUser = async userEmail => {
   const qaUsers = await getQAUsers();
-  const matchingUser = qaUsers.find(user => user.email === userEmail);
-  if (!matchingUser) {
+  const matchingUserEmail = qaUsers.find(user => user.email === userEmail)?.email;
+  if (!matchingUserEmail) {
     return { error: `Invalid user email: ${userEmail}` };
   }
-  return { valid: true, user: matchingUser };
+  return { valid: true, email: matchingUserEmail };
 };
 
-const loginQAMember = async (userEmail, secret) => {
+/**
+ * Login a QA user
+ * @param {Object} params - The parameters for the login
+ * @param {string} params.userEmail - The email of the user to login
+ * @param {string} params.secret - The secret of the user to login
+ * @param {Function} generateSessionToken - a dependency of the method, injected by the createLoginMethods function
+ * @returns {Promise<Object>} The result of the login
+ */
+const loginQAMember = async ({ userEmail, secret }, generateSessionToken) => {
   try {
     const userValidation = await validateQAUser(userEmail);
     if (userValidation.error) {
@@ -24,8 +30,7 @@ const loginQAMember = async (userEmail, secret) => {
       return { success: false, error: 'Invalid secret' };
     }
 
-    //TODO: this code still needs fixes, as there is no generateSessionToken method on
-    const token = await authentication.generateSessionToken(userValidation.user, qaSecret);
+    const token = await generateSessionToken(userValidation.email, qaSecret);
 
     const result = await getMemberCMSId(userEmail);
     if (!result.success) {

package/backend/{sso-methods.js → login/sso-methods.js}

@@ -1,20 +1,18 @@
 const { createHmac } = require('crypto');
 
-const { auth } = require('@wix/essentials');
-const { authentication } = require('@wix/identity'); //importing from @wix/identity because @wix/members authentication do not have generateSessionToken method
-const generateSessionToken = auth.elevate(authentication.signOn);
 const { decode } = require('jwt-js-decode');
 
-const { CONFIG_KEYS, SSO_TOKEN_AUTH_API_URL, SSO_TOKEN_AUTH_API_KEY } = require('./consts');
-const { MEMBER_ACTIONS } = require('./daily-pull');
-const { getCurrentMember } = require('./members-area-methods');
-const { getMemberByContactId, getSiteMemberId } = require('./members-data-methods');
+const { CONFIG_KEYS, SSO_TOKEN_AUTH_API_URL } = require('../consts');
+const { MEMBER_ACTIONS } = require('../daily-pull/consts');
+const { getCurrentMember } = require('../members-area-methods');
+const { getMemberByContactId, getSiteMemberId } = require('../members-data-methods');
 const {
   formatDateToMonthYear,
   getAddressDisplayOptions,
   isStudent,
   getSiteConfigs,
-} = require('./utils');
+  getSecret,
+} = require('../utils');
 
 /**
  * Validates member token and retrieves member data
@@ -90,6 +88,7 @@ async function validateMemberToken(memberIdInput) {
   }
 }
 async function checkAndFetchSSO(token) {
+  const SSO_TOKEN_AUTH_API_KEY = await getSecret('SSO_TOKEN_AUTH_API_KEY');
   const signature = createHmac('sha256', SSO_TOKEN_AUTH_API_KEY).update(token).digest('hex');
   const professionalassistcorpUrl = `${SSO_TOKEN_AUTH_API_URL}/eweb/SSOToken.ashx?token=${token}&Partner=Wix&Signature=${signature}`;
   const options = {
@@ -109,16 +108,14 @@ async function checkAndFetchSSO(token) {
   }
 }
 
-function generateSessionTokenFunction(email) {
-  return generateSessionToken({ email })
-    .then(response => response.sessionToken)
-    .catch(error => {
-      console.error('Error in generateSessionTokenFunction', error);
-      throw error;
-    });
-}
-
-const authenticateSSOToken = async token => {
+/**
+ * Authenticate an SSO token
+ * @param {Object} params - The parameters for the authentication
+ * @param {string} params.token - The token to authenticate
+ * @param {Function} generateSessionToken - a dependency of the method, injected by the createLoginMethods function
+ * @returns {Promise<Object>} The result of the authentication
+ */
+const authenticateSSOToken = async ({ token }, generateSessionToken) => {
   const responseToken = await checkAndFetchSSO(token);
   const isValidToken = Boolean(
     responseToken && typeof responseToken === 'string' && responseToken?.trim()
@@ -138,7 +135,7 @@ const authenticateSSOToken = async token => {
     const payload = jwt.payload;
     const membersData = await getSiteMemberId(payload);
     console.log('membersDataCollectionId', membersData._id);
-    const sessionToken = await generateSessionTokenFunction(membersData.email);
+    const sessionToken = await generateSessionToken(membersData.email);
     const authObj = {
       type: 'success',
       memberId: membersData._id,

package/backend/members-data-methods.js

@@ -10,6 +10,7 @@ const {
   normalizeUrlForComparison,
   queryAllItems,
   generateGeoHash,
+  searchAllItems,
 } = require('./utils');
 
 /**
@@ -108,7 +109,7 @@ async function findMemberById(memberId) {
  * @param {boolean} options.excludeDropped - Whether to exclude dropped members (default: true)
  * @param {boolean} options.excludeSearchedMember - Whether to exclude a specific member (default: false)
  * @param {string|number} [options.memberId] - Member ID to exclude when excludeSearchedMember is true (optional)
- * @param {boolean} [options.queryAllMatches=false] - Whether to query all matches or just the first one (default: false)
+ * @param {boolean} [options.normalizeSlugForComparison=false] - Whether to normalize the slug for comparison (default: false)
  * @returns {Promise<Object|null>} - Member data or null if not found
  */
 async function getMemberBySlug({
@@ -116,12 +117,12 @@ async function getMemberBySlug({
   excludeDropped = true,
   excludeSearchedMember = false,
   memberId = null,
-  queryAllMatches = false,
+  normalizeSlugForComparison = false,
 }) {
   if (!slug) return null;
 
   try {
-    let query = wixData.query(COLLECTIONS.MEMBERS_DATA).contains('url', slug);
+    let query = wixData.search(COLLECTIONS.MEMBERS_DATA).expression(slug);
 
     if (excludeDropped) {
       query = query.ne('action', 'drop');
@@ -130,17 +131,13 @@ async function getMemberBySlug({
     if (excludeSearchedMember && memberId) {
       query = query.ne('memberId', memberId);
     }
-    let membersList;
-    if (queryAllMatches) {
-      query = query.limit(1000);
-      membersList = await queryAllItems(query);
-    } else {
-      membersList = await query.find().then(res => res.items);
-    }
+    query = query.limit(1000);
+    const searchResult = await searchAllItems(query);
+    const membersList = searchResult.items.filter(item => item.url && item.url.includes(slug)); //replacement for contains
     let matchingMembers = membersList.filter(
       item => item.url && item.url.toLowerCase() === slug.toLowerCase()
     );
-    if (queryAllMatches) {
+    if (normalizeSlugForComparison) {
       matchingMembers = membersList
         .filter(
           //remove trailing "-1", "-2", etc.
@@ -152,7 +149,7 @@ async function getMemberBySlug({
       const queryResultMsg = `Multiple members found with same slug ${slug} membersIds are : [${matchingMembers
         .map(member => member.memberId)
         .join(', ')}]`;
-      if (!queryAllMatches) {
+      if (!normalizeSlugForComparison) {
         throw new Error(queryResultMsg);
       } else {
         console.log(queryResultMsg);

package/backend/tasks/tasks-configs.js

@@ -1,8 +1,8 @@
+const { MEMBER_ACTIONS } = require('../daily-pull/consts.js');
 const {
-  MEMBER_ACTIONS,
   synchronizeSinglePage,
   syncMembersDataPerAction,
-} = require('../daily-pull');
+} = require('../daily-pull/sync-to-cms-methods');
 
 const { TASKS_NAMES } = require('./consts');
 const {

package/backend/utils.js

@@ -107,18 +107,28 @@ function getAddressesByStatus(addresses = [], addressDisplayOption = []) {
     })
     .filter(Boolean);
 }
-const queryAllItems = async query => {
-  console.log('start query');
-  let oldResults = await query.find();
+const getAllItems = async querySearchResult => {
+  let oldResults = querySearchResult;
   console.log(`found items: ${oldResults.items.length}`);
   const allItems = oldResults.items;
   while (oldResults.hasNext()) {
     oldResults = await oldResults.next();
     allItems.push(...oldResults.items);
   }
-  console.log(`all items: ${allItems.length}`);
+  console.log(`all items count : ${allItems.length}`);
   return allItems;
 };
+const searchAllItems = async searchQuery => {
+  console.log('start search');
+  const searchResults = await searchQuery.run();
+  return getAllItems(searchResults);
+};
+
+const queryAllItems = async query => {
+  console.log('start query');
+  const queryResults = await query.find();
+  return getAllItems(queryResults);
+};
 /**
  * Chunks large arrays into smaller chunks for processing
  * @param {Array} array - Array to chunk
@@ -154,7 +164,7 @@ const normalizeUrlForComparison = url => {
 };
 
 async function getSecret(secretKey) {
-  return await elevatedGetSecretValue(secretKey).value;
+  return (await elevatedGetSecretValue(secretKey)).value;
 }
 
 async function getSiteBaseUrl() {
@@ -206,4 +216,5 @@ module.exports = {
   formatDateOnly,
   getAddressesByStatus,
   isPAC_STAFF,
+  searchAllItems,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.1.75",
+  "version": "1.1.77",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",

package/pages/LoadingPage.js

@@ -7,7 +7,7 @@ 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.
+    //Need to pass authenticateSSOToken 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}`);

package/pages/QAPage.js

@@ -10,7 +10,7 @@ async function qaPageOnReady({ $w: _$w, loginQAMember }) {
       throw new Error('Missing required parameters: userEmail and/or secret');
     }
 
-    const result = await loginQAMember(userEmail, secret);
+    const result = await loginQAMember({ userEmail, secret });
 
     if (!result.success || !result.token) {
       throw new Error(result.error || 'Login failed');

package/pages/SaveAlerts.js

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

package/pages/SelectBannerImages.js

@@ -0,0 +1,46 @@
+const { lightbox } = require('@wix/site-window');
+
+function selectBannerImagesOnReady({ $w: _$w }) {
+  _$w('#imageDataset').onReady(async () => {
+    const numOfItems = _$w('#imageDataset').getTotalCount();
+    const result = await _$w('#imageDataset').getItems(0, numOfItems);
+    const items = result.items;
+    console.log('Loaded items from dataset:', items);
+
+    _$w('#bannerImagesRepeater').data = items;
+  });
+
+  _$w('#bannerImagesRepeater').onItemReady(($item, itemData, index) => {
+    $item('#bannerImage').src = itemData.image; // image field
+    $item('#bannerSelected').checked = false;
+
+    // Only one checkbox can be selected
+    $item('#bannerSelected').onChange(() => {
+      if ($item('#bannerSelected').checked) {
+        _$w('#bannerImagesRepeater').forEachItem(($otherItem, _, otherIndex) => {
+          if (otherIndex !== index) {
+            $otherItem('#bannerSelected').checked = false;
+          }
+        });
+      }
+    });
+  });
+
+  _$w('#uploadSelectedImages').onClick(() => {
+    let selectedImage = null;
+
+    _$w('#bannerImagesRepeater').forEachItem(($item, itemData) => {
+      if ($item('#bannerSelected').checked) {
+        selectedImage = {
+          image: itemData.image,
+          title: itemData.title,
+        };
+      }
+    });
+    lightbox.close(selectedImage);
+  });
+}
+
+module.exports = {
+  selectBannerImagesOnReady,
+};

package/pages/deleteConfirm.js

@@ -0,0 +1,19 @@
+const { lightbox } = require('@wix/site-window');
+
+function deleteConfirmOnReady({ $w: _$w }) {
+  _$w('#delete').onClick(() => {
+    lightbox.close({
+      toDelete: true,
+    });
+  });
+
+  _$w('#cancel').onClick(() => {
+    lightbox.close({
+      toDelete: false,
+    });
+  });
+}
+
+module.exports = {
+  deleteConfirmOnReady,
+};

package/pages/index.js

@@ -5,4 +5,7 @@ module.exports = {
   ...require('./personalDetails.js'),
   ...require('./QAPage.js'),
   ...require('./LoadingPage.js'),
+  ...require('./SelectBannerImages.js'),
+  ...require('./deleteConfirm.js'),
+  ...require('./SaveAlerts.js'),
 };

package/public/consts.js

@@ -12,7 +12,7 @@ const COLLECTIONS = {
   INTERESTS: 'interests',
   STATE_CITY_MAP: 'City',
   UPDATED_LOGIN_EMAILS: 'updatedLoginEmails',
-  QA_Users: 'QA_Users', //Make QA users configurable per site
+  QA_USERS: 'QA_Users', //Make QA users configurable per site
 };
 
 /**

package/public/sso-auth-methods.js

@@ -9,7 +9,7 @@ const checkAndLogin = async authenticateSSOToken => {
   const token = query['token']?.trim();
   try {
     if (token) {
-      const authObj = await authenticateSSOToken(token);
+      const authObj = await authenticateSSOToken({ token });
       console.log('authObj', authObj);
       if (authObj.type == 'success') {
         console.log('success');