abmp-npm 1.1.73 → 1.1.75

package/backend/consts.js

@@ -1,5 +1,6 @@
 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
@@ -40,4 +41,5 @@ module.exports = {
   COMPILED_FILTERS_FIELDS,
   MEMBERSHIPS_TYPES,
   SSO_TOKEN_AUTH_API_URL,
+  SSO_TOKEN_AUTH_API_KEY,
 };

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/consts');
+const { TASKS_NAMES } = require('./tasks');
 
 const scheduleCompileFiltersTask = field =>
   taskManager().schedule({

package/backend/http-functions/httpFunctions.js

@@ -1,6 +1,7 @@
 const { COLLECTIONS } = require('../../public/consts');
 const { clearCollection } = require('../cms-data-methods');
-const { getSecret } = require('../utils');
+const { CONFIG_KEYS } = require('../consts');
+const { getSecret, getSiteConfigs } = require('../utils');
 
 const { migrateInterests } = require('./interests');
 
@@ -62,10 +63,23 @@ const createHTTPFunctionsHelpers = wixHTTPFunctionsMethods => {
       return serverError(error);
     }
   };
+  const getSiteAssociationHandler = async _request => {
+    try {
+      const siteAssociation = await getSiteConfigs(CONFIG_KEYS.SITE_ASSOCIATION);
+      return ok({
+        ...responseOptions,
+        body: { siteAssociation },
+      });
+    } catch (error) {
+      console.error('Error getting site association:', error);
+      return serverError(error);
+    }
+  };
 
   return {
     post_migrateInterests: withAuth(migrateInterestsHandler),
     delete_clearCollection: withAuth(clearCollectionHandler),
+    get_getSiteAssociation: withAuth(getSiteAssociationHandler),
   };
 };
 

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('./login'),
+  ...require('./sso-methods'),
   ...require('./data-hooks'),
   ...require('./http-functions'),
 };

package/backend/jobs.js

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

package/backend/members-data-methods.js

@@ -444,13 +444,10 @@ const getMemberByEmail = async email => {
 const getQAUsers = async () => {
   try {
     return await wixData
-      .query(COLLECTIONS.QA_Users)
+      .query(COLLECTIONS.QA_USERS)
       .include('member')
       .find()
-      .then(res => {
-        console.log('res', JSON.stringify(res.items, null, 2));
-        return res.items.map(item => item.member);
-      });
+      .then(res => res.items.map(item => item.member));
   } catch (error) {
     console.error('Error getting QA users:', error);
     throw new Error(`Failed to get QA users: ${error.message}`);

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

@@ -1,26 +1,18 @@
-const { getMemberByEmail, getQAUsers } = require('../members-data-methods');
-const { getSecret } = require('../utils');
+const { authentication } = require('@wix/members');
+
+const { getMemberByEmail, getQAUsers } = require('./members-data-methods');
+const { getSecret } = require('./utils');
 
 const validateQAUser = async userEmail => {
   const qaUsers = await getQAUsers();
-  console.log('userEmail', userEmail);
-  const matchingUserEmail = qaUsers.find(user => user.email === userEmail)?.email;
-  console.log('matchingUserEmail', matchingUserEmail);
-  if (!matchingUserEmail) {
+  const matchingUser = qaUsers.find(user => user.email === userEmail);
+  if (!matchingUser) {
     return { error: `Invalid user email: ${userEmail}` };
   }
-  return { valid: true, email: matchingUserEmail };
+  return { valid: true, user: matchingUser };
 };
 
-/**
- * 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) => {
+const loginQAMember = async (userEmail, secret) => {
   try {
     const userValidation = await validateQAUser(userEmail);
     if (userValidation.error) {
@@ -32,7 +24,8 @@ const loginQAMember = async ({ userEmail, secret }, generateSessionToken) => {
       return { success: false, error: 'Invalid secret' };
     }
 
-    const token = await generateSessionToken(userValidation.email, qaSecret);
+    //TODO: this code still needs fixes, as there is no generateSessionToken method on
+    const token = await authentication.generateSessionToken(userValidation.user, qaSecret);
 
     const result = await getMemberCMSId(userEmail);
     if (!result.success) {

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

@@ -1,18 +1,20 @@
 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 } = require('../consts');
-const { MEMBER_ACTIONS } = require('../daily-pull/consts');
-const { getCurrentMember } = require('../members-area-methods');
-const { getMemberByContactId, getSiteMemberId } = require('../members-data-methods');
+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 {
   formatDateToMonthYear,
   getAddressDisplayOptions,
   isStudent,
   getSiteConfigs,
-  getSecret,
-} = require('../utils');
+} = require('./utils');
 
 /**
  * Validates member token and retrieves member data
@@ -88,7 +90,6 @@ 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 = {
@@ -108,14 +109,16 @@ async function checkAndFetchSSO(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) => {
+function generateSessionTokenFunction(email) {
+  return generateSessionToken({ email })
+    .then(response => response.sessionToken)
+    .catch(error => {
+      console.error('Error in generateSessionTokenFunction', error);
+      throw error;
+    });
+}
+
+const authenticateSSOToken = async token => {
   const responseToken = await checkAndFetchSSO(token);
   const isValidToken = Boolean(
     responseToken && typeof responseToken === 'string' && responseToken?.trim()
@@ -135,7 +138,7 @@ const authenticateSSOToken = async ({ token }, generateSessionToken) => {
     const payload = jwt.payload;
     const membersData = await getSiteMemberId(payload);
     console.log('membersDataCollectionId', membersData._id);
-    const sessionToken = await generateSessionToken(membersData.email);
+    const sessionToken = await generateSessionTokenFunction(membersData.email);
     const authObj = {
       type: 'success',
       memberId: membersData._id,

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/sync-to-cms-methods');
+} = require('../daily-pull');
 
 const { TASKS_NAMES } = require('./consts');
 const {

package/backend/utils.js

@@ -154,7 +154,7 @@ const normalizeUrlForComparison = url => {
 };
 
 async function getSecret(secretKey) {
-  return (await elevatedGetSecretValue(secretKey)).value;
+  return await elevatedGetSecretValue(secretKey).value;
 }
 
 async function getSiteBaseUrl() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.1.73",
+  "version": "1.1.75",
   "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 authenticateSSOToken to checkAndLogin so it will run as a web method not a public one.
+    //Need to pass processSubmission 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/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');

package/backend/login/index.js

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

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

@@ -1,24 +0,0 @@
-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,
-};