abmp-npm 10.0.78 → 10.0.80

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.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/login/sso-methods.js

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

package/backend/pac-api-methods.js

@@ -1,5 +1,3 @@
-const axios = require('axios');
-
 const { PAC_API_URL, TEST_PAC_API_URL, BACKUP_API_URL } = require('./consts');
 const { getSecret } = require('./utils');
 
@@ -31,58 +29,25 @@ const fetchPACMembers = async ({ page, action, backupDate, isTestEnvironment })
     queryParams.date = backupDate;
   }
   const url = `${baseUrl}/Members?${new URLSearchParams(queryParams).toString()}`;
-  console.log('[fetchPACMembers] request', {
-    url,
-    page,
-    action,
-    backupDate: backupDate || null,
-    isTestEnvironment: Boolean(isTestEnvironment),
-  });
-
-  try {
-    const headers = await getHeaders();
-    console.log('[fetchPACMembers] headers', headers);
-    console.log('[fetchPACMembers] url', url);
-    const response = await axios.get(url, { headers });
-    const responseType = response.headers?.['content-type'] || 'unknown';
-
-    console.log('[fetchPACMembers] response', {
-      status: response.status,
-      ok: response.status >= 200 && response.status < 300,
-      contentType: responseType,
-    });
-
-    if (!responseType.includes('application/json')) {
-      const errorMessage = `[fetchPACMembers] invalid responseType: ${responseType} for page ${page} and actionFilter ${action}`;
-      console.error(errorMessage, {
-        status: response.status,
-        bodySample: JSON.stringify(response.data)?.slice(0, 500),
-      });
-      throw new Error(errorMessage);
-    }
-
-    return response.data;
-  } catch (error) {
-    if (error?.response) {
-      console.error('[fetchPACMembers] request failed', {
-        page,
-        action,
-        backupDate: backupDate || null,
-        isTestEnvironment: Boolean(isTestEnvironment),
-        status: error.response.status,
-        contentType: error.response.headers?.['content-type'] || 'unknown',
-        bodySample: JSON.stringify(error.response.data)?.slice(0, 500),
-      });
-      throw error;
-    }
-    console.error('[fetchPACMembers] request failed', {
-      page,
-      action,
-      backupDate: backupDate || null,
-      isTestEnvironment: Boolean(isTestEnvironment),
-      errorMessage: error?.message || error,
-    });
-    throw error;
+  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');
+  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);
   }
 };
 

package/package.json

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