abmp-npm 1.1.89 → 1.1.90

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

@@ -1,4 +1,4 @@
-const { getMemberByEmail, getQAUsers } = require('../members-data-methods');
+const { prepareMemberForQALogin, getQAUsers } = require('../members-data-methods');
 const { getSecret } = require('../utils');
 
 const validateQAUser = async userEmail => {
@@ -20,27 +20,23 @@ const validateQAUser = async userEmail => {
  */
 const loginQAMember = async ({ userEmail, secret }, generateSessionToken) => {
   try {
-    const userValidation = await validateQAUser(userEmail);
+    const [userValidation, qaSecret] = await Promise.all([
+      validateQAUser(userEmail),
+      getSecret('ABMP_QA_SECRET'),
+    ]);
     if (userValidation.error) {
       return { success: false, error: userValidation.error };
     }
-
-    const qaSecret = await getSecret('ABMP_QA_SECRET');
     if (secret !== qaSecret) {
       return { success: false, error: 'Invalid secret' };
     }
 
-    const token = await generateSessionToken(userValidation.email, qaSecret);
-
-    const result = await getMemberCMSId(userEmail);
-    if (!result.success) {
-      return { success: false, error: result.error };
-    }
-
+    const memberData = await prepareMemberForQALogin(userValidation.email);
+    const token = await generateSessionToken(memberData.email, qaSecret);
     return {
       success: true,
       token,
-      memberCMSId: result.memberCMSId,
+      memberCMSId: memberData._id,
     };
   } catch (error) {
     console.error('QA login error:', error);
@@ -48,25 +44,6 @@ const loginQAMember = async ({ userEmail, secret }, generateSessionToken) => {
   }
 };
 
-async function getMemberCMSId(userEmail) {
-  try {
-    const userValidation = await validateQAUser(userEmail);
-    if (userValidation.error) {
-      return { success: false, error: userValidation.error };
-    }
-
-    const member = await getMemberByEmail(userEmail);
-
-    if (!member) {
-      return { success: false, error: `No Member found in DB matching email: ${userEmail}` };
-    }
-    return { success: true, memberCMSId: member._id };
-  } catch (error) {
-    console.error('Error getting member CMS ID:', error);
-    return { success: false, error: 'Failed to retrieve member data' };
-  }
-}
-
 module.exports = {
   loginQAMember,
 };

package/backend/login/sso-methods.js

@@ -5,7 +5,7 @@ const { decode } = require('jwt-js-decode');
 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 { getMemberByContactId, prepareMemberForSSOLogin } = require('../members-data-methods');
 const {
   formatDateToMonthYear,
   getAddressDisplayOptions,
@@ -133,12 +133,12 @@ const authenticateSSOToken = async ({ token }, generateSessionToken) => {
   if (isValidToken) {
     const jwt = decode(responseToken);
     const payload = jwt.payload;
-    const membersData = await getSiteMemberId(payload);
-    console.log('membersDataCollectionId', membersData._id);
-    const sessionToken = await generateSessionToken(membersData.email);
+    const memberData = await prepareMemberForSSOLogin(payload);
+    console.log('memberDataCollectionId', memberData._id);
+    const sessionToken = await generateSessionToken(memberData.email);
     const authObj = {
       type: 'success',
-      memberId: membersData._id,
+      memberId: memberData._id,
       sessionToken,
     };
     return authObj;

package/backend/members-data-methods.js

@@ -93,10 +93,16 @@ async function findMemberById(memberId) {
     const queryResult = await wixData
       .query(COLLECTIONS.MEMBERS_DATA)
       .eq('memberId', memberId)
+      .limit(2)
       .find();
-
-    return queryResult.items.length > 0 ? queryResult.items[0] : null;
+    if (queryResult.items.length > 1) {
+      throw new Error(
+        `Multiple members found with memberId ${memberId} members _ids are : [${queryResult.items.map(member => member._id).join(', ')}]`
+      );
+    }
+    return queryResult.items.length === 1 ? queryResult.items[0] : null;
   } catch (error) {
+    console.error('Error finding member by ID:', error);
     throw new Error(`Failed to retrieve member data: ${error.message}`);
   }
 }
@@ -441,38 +447,53 @@ const getQAUsers = async () => {
     throw new Error(`Failed to get QA users: ${error.message}`);
   }
 };
-async function getSiteMemberId(data) {
+/**
+ * Ensures member has a contact - creates one if missing
+ * @param {Object} memberData - Member data from DB
+ * @returns {Promise<Object>} - Member data with contactId
+ */
+async function ensureMemberHasContact(memberData) {
+  if (!memberData) {
+    throw new Error('Member data is required');
+  }
+  if (!memberData.contactId) {
+    const memberDataWithContactId = await createContactAndMemberIfNew(memberData);
+    return memberDataWithContactId;
+  }
+  return memberData;
+}
+async function prepareMemberForSSOLogin(data) {
   try {
     console.log('data', data);
     const memberId = data?.pac?.cst_recno;
     if (!memberId) {
-      const errorMessage = `Member ID is missing in passed data ${JSON.stringify(data)}`;
-      console.error(errorMessage);
-      throw new Error(errorMessage);
+      throw new Error(`Member ID is missing in passed data ${JSON.stringify(data)}`);
     }
-    const queryMemberResult = await wixData
-      .query(COLLECTIONS.MEMBERS_DATA)
-      .eq('memberId', Number(memberId))
-      .find()
-      .then(res => res.items);
-    if (!queryMemberResult.length || queryMemberResult.length > 1) {
-      throw new Error(
-        `Invalid Members count found in DB for email ${data.email} members count is : [${
-          queryMemberResult.length
-        }] membersIds are : [${queryMemberResult.map(member => member.memberId).join(', ')}]`
-      );
+    const memberData = await findMemberById(Number(memberId));
+    if (!memberData) {
+      throw new Error(`Member data not found for memberId ${memberId}`);
     }
-    let memberData = queryMemberResult[0];
     console.log('memberData', memberData);
-    const isNewUser = !memberData.contactId;
-    if (isNewUser) {
-      const memberDataWithContactId = await createContactAndMemberIfNew(memberData);
-      console.log('memberDataWithContactId', memberDataWithContactId);
-      memberData = memberDataWithContactId;
+    return await ensureMemberHasContact(memberData);
+  } catch (error) {
+    console.error('Error in prepareMemberForSSOLogin', error.message);
+    throw error;
+  }
+}
+async function prepareMemberForQALogin(email) {
+  try {
+    console.log('qa email:', email);
+    if (!email) {
+      throw new Error(`Email is missing in passed data ${email}`);
+    }
+    const memberData = await getMemberByEmail(email);
+    if (!memberData) {
+      throw new Error(`Member data not found for email ${email}`);
     }
-    return memberData;
+    console.log('memberData', memberData);
+    return await ensureMemberHasContact(memberData);
   } catch (error) {
-    console.error('Error in getSiteMemberId', error.message);
+    console.error('Error in prepareMemberForQALogin', error.message);
     throw error;
   }
 }
@@ -494,6 +515,7 @@ module.exports = {
   getMembersByIds,
   getMemberByEmail,
   getQAUsers,
-  getSiteMemberId,
+  prepareMemberForSSOLogin,
+  prepareMemberForQALogin,
   checkUrlUniqueness,
 };

package/package.json

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