abmp-npm 10.3.3 → 10.3.6

package/backend/consts.js

@@ -1,5 +1,5 @@
 const PAC_API_URL = 'https://members.abmp.com/eweb/api/Wix';
-const TEST_PAC_API_URL = 'https://members-test.abmp.com/nfpactest/eweb/api/Wix';
+const TEST_PAC_API_URL = 'https://members-test.abmp.com/eweb/api/Wix';
 const BACKUP_API_URL = 'https://psdevteamenterpris.wixstudio.com/abmp-backup/_functions';
 const SSO_TOKEN_AUTH_API_URL = 'https://members.professionalassistcorp.com/';
 

package/backend/elevated-modules.js

@@ -1,27 +1,18 @@
 const { items } = require('@wix/data');
 const { auth } = require('@wix/essentials');
 
-// @wix/data does not support suppressAuth currently, so we need to elevate it.
-// Elevation is deferred (called per-invocation) because @wix/data's `items.*`
-// methods are not guaranteed to be populated at module-load time in the Velo
-// cloud runtime — accessing them eagerly throws "Cannot read properties of
-// undefined (reading 'insert')" while loading the module.
-const elevated =
-  method =>
-  (...args) =>
-    auth.elevate(items[method])(...args);
-
+// @wix/data does not support suppressAuth currently, so we need to elevate it
 const wixData = {
-  insert: elevated('insert'),
-  update: elevated('update'),
-  bulkInsert: elevated('bulkInsert'),
-  query: elevated('query'),
-  save: elevated('save'),
-  remove: elevated('remove'),
-  get: elevated('get'),
-  truncate: elevated('truncate'),
-  bulkSave: elevated('bulkSave'),
-  search: elevated('search'),
+  insert: auth.elevate(items.insert),
+  update: auth.elevate(items.update),
+  bulkInsert: auth.elevate(items.bulkInsert),
+  query: auth.elevate(items.query),
+  save: auth.elevate(items.save),
+  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/http-functions/interests.js

@@ -1,3 +1,5 @@
+const axios = require('axios');
+
 const { COLLECTIONS } = require('../../public/consts');
 const { clearCollection } = require('../cms-data-methods');
 const { CONFIG_KEYS } = require('../consts');
@@ -10,13 +12,9 @@ const getInterests = async () => {
     getSiteConfigs(CONFIG_KEYS.INTERESTS_API_URL),
     getHeaders(),
   ]);
-  const fetchOptions = {
-    method: 'get',
-    headers: headers,
-  };
   try {
-    const response = await fetch(url, fetchOptions);
-    return await response.json();
+    const response = await axios.get(url, { headers });
+    return response.data;
   } catch (e) {
     console.error('Error getting interests:', e);
     throw e;

package/backend/login/sso-methods.js

@@ -1,5 +1,6 @@
 const { createHmac } = require('crypto');
 
+const axios = require('axios');
 const { decode } = require('jwt-js-decode');
 
 const { CONFIG_KEYS, SSO_TOKEN_AUTH_API_URL } = require('../consts');
@@ -91,17 +92,16 @@ 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 = {
-    method: 'get',
-  };
   try {
-    const httpResponse = await fetch(professionalassistcorpUrl, options);
+    const httpResponse = await axios.get(professionalassistcorpUrl, {
+      transformResponse: [d => d],
+      validateStatus: () => true,
+    });
     console.log('httpResponse status', httpResponse.status);
-    if (!httpResponse.ok) {
+    if (httpResponse.status < 200 || httpResponse.status >= 300) {
       throw new Error('Fetch did not succeed with status: ' + httpResponse.status);
     }
-    const responseToken = await httpResponse.text();
-    return responseToken;
+    return httpResponse.data;
   } catch (error) {
     console.error('Error in checkAndFetchSSO', error);
     return null;

package/backend/pac-api-methods.js

@@ -1,3 +1,5 @@
+const axios = require('axios');
+
 const { PAC_API_URL, TEST_PAC_API_URL, BACKUP_API_URL } = require('./consts');
 const { getSecret } = require('./utils');
 
@@ -31,24 +33,22 @@ const fetchPACMembers = async ({ page, action, backupDate, isTestEnvironment })
   const url = `${baseUrl}/Members?${new URLSearchParams(queryParams).toString()}`;
   console.log(`Fetching PAC members from:  ${url}`);
   const headers = await getHeaders();
-  const fetchOptions = {
-    method: 'get',
-    headers: headers,
-  };
-  const response = await fetch(url, fetchOptions);
-  const responseType = response.headers.get('content-type');
+  const response = await axios.get(url, {
+    headers,
+    validateStatus: () => true,
+  });
+  const responseType = response.headers['content-type'] || '';
   if (!responseType.includes('application/json')) {
     const errorMessage = `[fetchPACMembers] got invalid responseType: ${responseType} for page ${page} and actionFilter ${action}`;
     console.error(errorMessage);
     throw new Error(errorMessage);
   }
-  if (response.ok) {
-    return response.json();
-  } else {
-    const errorMessage = `[fetchPACMembers] failed with status ${response.status} for page ${page} and actionFilter ${action}`;
-    console.error(errorMessage);
-    throw new Error(errorMessage);
+  if (response.status >= 200 && response.status < 300) {
+    return response.data;
   }
+  const errorMessage = `[fetchPACMembers] failed with status ${response.status} for page ${page} and actionFilter ${action}`;
+  console.error(errorMessage);
+  throw new Error(errorMessage);
 };
 
 module.exports = { fetchPACMembers, getHeaders }; //TODO: remove getHeaders from exported methods once npm movement finishes

package/backend/tasks/tasks-helpers-methods.js

@@ -103,23 +103,23 @@ async function updateMemberRichContent(memberId) {
     content: htmlString,
   });
 
-  const requestOptions = {
-    method: 'post',
-    headers: {
-      'Content-Type': 'application/json',
-      Cookie: 'XSRF-TOKEN=1753949844|p--a7HsuVjR4',
-      Authorization: 'Bearer ' + (await getServerlessAuth()),
-    },
-    body: raw,
+  const requestHeaders = {
+    'Content-Type': 'application/json',
+    Cookie: 'XSRF-TOKEN=1753949844|p--a7HsuVjR4',
+    Authorization: 'Bearer ' + (await getServerlessAuth()),
   };
 
   try {
-    const response = await fetch(
+    const response = await axios.post(
       'https://www.wixapis.com/data-sync/v1/abmp-content-converter',
-      requestOptions
+      raw,
+      {
+        headers: requestHeaders,
+        validateStatus: () => true,
+      }
     );
-    if (response.ok) {
-      const data = await response.json();
+    if (response.status >= 200 && response.status < 300) {
+      const data = response.data;
       const updatedMember = {
         ...member,
         aboutYourSelf: data.richContent.richContent,
@@ -358,9 +358,13 @@ async function uploadMembersSitemap({ members, tokens, destinationFileName, site
 
   const url = `https://${host}${pathName}`;
   console.log('url', url);
-  const res = await fetch(url, { method, headers: reqOpts.headers, body });
-  if (!res.ok) {
-    const respText = await res.text();
+  const res = await axios.put(url, body, {
+    headers: reqOpts.headers,
+    transformResponse: [d => d],
+    validateStatus: () => true,
+  });
+  if (res.status < 200 || res.status >= 300) {
+    const respText = res.data;
     console.log('Response body', respText);
     throw new Error(`S3 PUT failed ${res.status} ${res.statusText}: ${respText}`);
   }
@@ -391,13 +395,13 @@ async function stsPost(body, baseAccessKeyId, baseSecretAccessKey) {
     accessKeyId: baseAccessKeyId,
     secretAccessKey: baseSecretAccessKey,
   });
-  const res = await fetch(`https://${host}${path}`, {
-    method,
+  const res = await axios.post(`https://${host}${path}`, body, {
     headers: reqOpts.headers,
-    body,
+    transformResponse: [d => d],
+    validateStatus: () => true,
   });
-  const text = await res.text();
-  if (!res.ok) throw new Error(`STS ${res.status}: ${text}`);
+  const text = res.data;
+  if (res.status < 200 || res.status >= 300) throw new Error(`STS ${res.status}: ${text}`);
 
   const accessKeyId = parseXmlVal(text, 'AccessKeyId');
   const secretAccessKey = parseXmlVal(text, 'SecretAccessKey');

package/package.json

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