abmp-npm 2.0.29 → 2.0.31

package/backend/consts.js

@@ -16,6 +16,7 @@ const CONFIG_KEYS = {
   SITE_LOGO_URL: 'SITE_LOGO_URL',
   MEMBERS_EXTERNAL_PORTAL_URL: 'MEMBERS_EXTERNAL_PORTAL_URL',
   DEFAULT_PROFILE_IMAGE: 'DEFAULT_PROFILE_IMAGE',
+  QA_ALLOW_ANY_MEMBER: 'QA_ALLOW_ANY_MEMBER',
 };
 
 const MAX__MEMBERS_SEARCH_RESULTS = 120;

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

@@ -9,6 +9,22 @@ const { bulkProcessAndSaveMemberData } = require('./bulk-process-methods');
 const { MEMBER_ACTIONS } = require('./consts');
 const { isUpdatedMember, isSiteAssociatedMember } = require('./utils');
 
+const filterLicensesByAssociation = (member, siteAssociation) => {
+  if (!member?.licenses || !Array.isArray(member.licenses)) {
+    return member;
+  }
+  const filteredLicenses = member.licenses.filter(license => {
+    if (!license || !license.association) {
+      return true;
+    }
+    return license.association === siteAssociation;
+  });
+  return {
+    ...member,
+    licenses: filteredLicenses,
+  };
+};
+
 async function syncMembersDataPerAction(taskData) {
   const { action, backupDate, isTestEnvironment, includeNone } = taskData;
   try {
@@ -110,6 +126,9 @@ async function synchronizeSinglePage(taskObject) {
       }
       return isUpdatedMember(member);
     });
+    const toSyncMembersWithFilteredLicenses = toSyncMembers.map(member =>
+      filterLicensesByAssociation(member, siteAssociation)
+    );
     if (toSyncMembers.length === 0) {
       return {
         success: true,
@@ -120,7 +139,7 @@ async function synchronizeSinglePage(taskObject) {
       };
     }
     const result = await bulkProcessAndSaveMemberData({
-      memberDataList: toSyncMembers,
+      memberDataList: toSyncMembersWithFilteredLicenses,
       currentPageNumber: pageNumber,
     });
 

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

@@ -1,5 +1,6 @@
+const { CONFIG_KEYS } = require('../consts');
 const { prepareMemberForQALogin, getQAUsers } = require('../members-data-methods');
-const { getSecret } = require('../utils');
+const { getSecret, getSiteConfigs } = require('../utils');
 
 const validateQAUser = async userEmail => {
   const qaUsers = await getQAUsers();
@@ -20,18 +21,21 @@ const validateQAUser = async userEmail => {
  */
 const loginQAMember = async ({ userEmail, secret }, generateSessionToken) => {
   try {
-    const [userValidation, qaSecret] = await Promise.all([
-      validateQAUser(userEmail),
+    const [qaSecret, allowAnyMember] = await Promise.all([
       getSecret('ABMP_QA_SECRET'),
+      getSiteConfigs(CONFIG_KEYS.QA_ALLOW_ANY_MEMBER),
     ]);
-    if (userValidation.error) {
-      return { success: false, error: userValidation.error };
-    }
     if (secret !== qaSecret) {
       return { success: false, error: 'Invalid secret' };
     }
+    if (!allowAnyMember) {
+      const userValidation = await validateQAUser(userEmail);
+      if (userValidation.error) {
+        return { success: false, error: userValidation.error };
+      }
+    }
 
-    const memberData = await prepareMemberForQALogin(userValidation.email);
+    const memberData = await prepareMemberForQALogin(userEmail);
     const token = await generateSessionToken(memberData.email, qaSecret);
     return {
       success: true,

package/package.json

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