abmp-npm 10.3.6 → 10.3.8

package/backend/login/generate-member-session-token.js

@@ -0,0 +1,27 @@
+const { auth } = require('@wix/essentials');
+const { authentication } = require('@wix/identity');
+
+const elevatedSignOn = auth.elevate(authentication.signOn);
+
+/**
+ * Creates a Wix member session token for SSO / QA login using @wix/identity signOn (elevated).
+ * @param {string} email - Member login email
+ * @returns {Promise<string>} Session token for authentication.applySessionToken on the client
+ */
+async function generateMemberSessionToken(email) {
+  const trimmedEmail = (email || '').trim();
+  if (!trimmedEmail) {
+    throw new Error('Email is required to generate a session token');
+  }
+
+  const response = await elevatedSignOn({ email: trimmedEmail });
+  const sessionToken = response?.sessionToken;
+  if (!sessionToken) {
+    throw new Error('Failed to generate session token: empty response from signOn');
+  }
+  return sessionToken;
+}
+
+module.exports = {
+  generateMemberSessionToken,
+};

package/backend/login/index.js

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

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

@@ -2,6 +2,8 @@ const { CONFIG_KEYS } = require('../consts');
 const { prepareMemberForQALogin, getQAUsers } = require('../members-data-methods');
 const { getSecret, getSiteConfigs } = require('../utils');
 
+const { generateMemberSessionToken } = require('./generate-member-session-token');
+
 const validateQAUser = async userEmail => {
   const qaUsers = await getQAUsers();
   const matchingUserEmail = qaUsers.find(user => user.email === userEmail)?.email;
@@ -16,10 +18,9 @@ const validateQAUser = async userEmail => {
  * @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 [qaSecret, allowAnyMember] = await Promise.all([
       getSecret('ABMP_QA_SECRET'),
@@ -36,7 +37,7 @@ const loginQAMember = async ({ userEmail, secret }, generateSessionToken) => {
     }
 
     const memberData = await prepareMemberForQALogin(userEmail);
-    const token = await generateSessionToken(memberData.email, qaSecret);
+    const token = await generateMemberSessionToken(memberData.email);
     return {
       success: true,
       token,

package/backend/login/sso-methods.js

@@ -15,6 +15,8 @@ const {
   getSecret,
 } = require('../utils');
 
+const { generateMemberSessionToken } = require('./generate-member-session-token');
+
 /**
  * Validates member token and retrieves member data
  * @param {string} memberIdInput - The member ID to validate
@@ -112,10 +114,9 @@ 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) => {
+const authenticateSSOToken = async ({ token }) => {
   const responseToken = await checkAndFetchSSO(token);
   const isValidToken = Boolean(
     responseToken && typeof responseToken === 'string' && responseToken?.trim()
@@ -135,7 +136,7 @@ const authenticateSSOToken = async ({ token }, generateSessionToken) => {
     const payload = jwt.payload;
     const memberData = await prepareMemberForSSOLogin(payload);
     console.log('memberDataCollectionId', memberData._id);
-    const sessionToken = await generateSessionToken(memberData.email);
+    const sessionToken = await generateMemberSessionToken(memberData.email);
     const authObj = {
       type: 'success',
       memberId: memberData._id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "10.3.6",
+  "version": "10.3.8",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",
@@ -35,8 +35,8 @@
     "@wix/automations": "^1.0.261",
     "@wix/crm": "^1.0.1061",
     "@wix/data": "^1.0.349",
-    "@wix/essentials": "^0.1.28",
-    "@wix/identity": "^1.0.178",
+    "@wix/essentials": "^1.0.7",
+    "@wix/identity": "^1.0.195",
     "@wix/media": "^1.0.213",
     "@wix/members": "^1.0.365",
     "@wix/secrets": "^1.0.62",

package/public/Utils/homePage.js

@@ -5,6 +5,43 @@ const { DEFAULT_FILTER } = require('../consts.js');
 
 const { debouncedFunction } = require('./sharedUtils.js');
 
+function isValidGeolocation(lat, lng) {
+  return Number.isFinite(lat) && Number.isFinite(lng) && (lat !== 0 || lng !== 0);
+}
+
+function applyGeolocationToFilter(filter, lat, lng, isSearchingNearby) {
+  return {
+    ...filter,
+    postalcode: isSearchingNearby ? null : filter.postalcode,
+    state: isSearchingNearby ? [] : filter.state,
+    city: isSearchingNearby ? [] : filter.city,
+    stateSearch: isSearchingNearby ? '' : filter.stateSearch,
+    citySearch: isSearchingNearby ? '' : filter.citySearch,
+    latitude: lat,
+    longitude: lng,
+  };
+}
+
+const GEOLOCATION_TIMEOUT_MS = 10000;
+
+function getCurrentGeolocationWithTimeout(timeoutMs = GEOLOCATION_TIMEOUT_MS) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      reject(new Error(`Geolocation timed out after ${timeoutMs}ms`));
+    }, timeoutMs);
+    wixWindow
+      .getCurrentGeolocation()
+      .then(location => {
+        clearTimeout(timer);
+        resolve(location);
+      })
+      .catch(error => {
+        clearTimeout(timer);
+        reject(error);
+      });
+  });
+}
+
 const createHomepageUtils = (_$w, filterProfiles) => {
   const getFiltersSelectors = filterName => ({
     checkBoxContainerSelector: _$w(`#${filterName}CheckBoxContainer`),
@@ -362,29 +399,24 @@ const createHomepageUtils = (_$w, filterProfiles) => {
       });
   }
   async function getAndSetUserLocation(isSearchingNearby, filter) {
-    try {
-      let location = {
-        coords: {
-          latitude: 0,
-          longitude: 0,
-        },
+    const { latitude: existingLat, longitude: existingLng } = filter;
+    if (isValidGeolocation(existingLat, existingLng)) {
+      return {
+        success: true,
+        filter: applyGeolocationToFilter(filter, existingLat, existingLng, isSearchingNearby),
       };
-      location = await wixWindow.getCurrentGeolocation();
+    }
+
+    try {
+      const location = await getCurrentGeolocationWithTimeout();
 
       console.log('location inside getAndSetUserLocation', location);
       const userLat = location.coords?.latitude ?? 0;
       const userLong = location.coords?.longitude ?? 0;
-      filter = {
-        ...filter,
-        postalcode: isSearchingNearby ? null : filter.postalcode,
-        state: isSearchingNearby ? [] : filter.state,
-        city: isSearchingNearby ? [] : filter.city,
-        stateSearch: isSearchingNearby ? '' : filter.stateSearch,
-        citySearch: isSearchingNearby ? '' : filter.citySearch,
-        latitude: userLat,
-        longitude: userLong,
+      return {
+        success: true,
+        filter: applyGeolocationToFilter(filter, userLat, userLong, isSearchingNearby),
       };
-      return { success: true, filter };
     } catch (error) {
       console.warn('Failed to get user location in getAndSetUserLocation', error);
       return { success: false, filter };

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,
-};