ui-soxo-bootstrap-core 2.6.5 → 2.6.6

package/core/lib/utils/http/auth.helper.js

@@ -1,95 +1,95 @@
-import { Location } from '../location/location.utils';
-
-let refreshTokenPromise = null; // Holds the ongoing token refresh promise
-let pendingRequests = []; // Array to store requests waiting for the new token
-const MAX_PENDING_REQUESTS = 20; // Maximum number of requests allowed in the queue
-
-// Get the current access token from localStorage
-export const getAccessToken = () => localStorage.getItem('access_token');
-
-// Get the current refresh token from localStorage
-export const getRefreshToken = () => localStorage.getItem('refresh_token');
-
-// Set a new access token in localStorage
-export const setAccessToken = (token) => token && localStorage.setItem('access_token', token);
-
-// Set a new refresh token in localStorage
-export const setRefreshToken = (token) => token && localStorage.setItem('refresh_token', token);
-
-// Clear both access and refresh tokens from localStorage
-export const clearAuthTokens = () => {
-  localStorage.removeItem('access_token');
-  localStorage.removeItem('refresh_token');
-};
-
-// Queue a request to be retried after token refresh
-export const queueRequest = (cb) =>
-  new Promise((resolve, reject) => {
-    // Reject if too many requests are already queued
-    if (pendingRequests.length >= MAX_PENDING_REQUESTS) {
-      reject(new Error('Too many requests waiting for token refresh'));
-      return;
-    }
-
-    // Add the request to the pending requests array
-    pendingRequests.push({ cb, resolve, reject });
-  });
-
-// Retry all queued requests with the new access token
-const retryQueuedRequests = (newToken) => {
-  pendingRequests.forEach(({ cb, resolve, reject }) => {
-    cb(newToken).then(resolve).catch(reject); // Retry each request
-  });
-
-  // Clear the queue after retrying all requests
-  pendingRequests = [];
-};
-
-export const refreshAccessToken = () => {
-  // If a refresh is already in progress, return the same promise
-  if (refreshTokenPromise) {
-    return refreshTokenPromise;
-  }
-
-  const refreshToken = getRefreshToken();
-
-  refreshTokenPromise = new Promise(async (resolve, reject) => {
-    try {
-      const response = await fetch(`${process.env.REACT_APP_endpoint}auth/refresh`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          db_ptr: localStorage.getItem('db_ptr'),
-        },
-        body: JSON.stringify({ refreshToken }),
-      });
-
-      const data = await response.json();
-
-      const { access_token, refresh_token, success } = data || {};
-
-      if (success) {
-        // Save the new access token
-        setAccessToken(access_token);
-        // Save the new refresh token
-        setRefreshToken(refresh_token);
-        // Retry all queued requests with the new token
-        retryQueuedRequests(access_token);
-        // Resolve the promise with the new token
-        resolve(access_token);
-      } else {
-        localStorage.clear();
-        Location.navigate({ url: '/login' });
-        throw new Error('Token refresh failed');
-      }
-    } catch (error) {
-      pendingRequests.forEach(({ reject }) => reject(error));
-      pendingRequests = [];
-      reject(error);
-    } finally {
-      refreshTokenPromise = null;
-    }
-  });
-
-  return refreshTokenPromise;
-};
+import { Location } from '../location/location.utils';
+
+let refreshTokenPromise = null; // Holds the ongoing token refresh promise
+let pendingRequests = []; // Array to store requests waiting for the new token
+const MAX_PENDING_REQUESTS = 20; // Maximum number of requests allowed in the queue
+
+// Get the current access token from localStorage
+export const getAccessToken = () => localStorage.getItem('access_token');
+
+// Get the current refresh token from localStorage
+export const getRefreshToken = () => localStorage.getItem('refresh_token');
+
+// Set a new access token in localStorage
+export const setAccessToken = (token) => token && localStorage.setItem('access_token', token);
+
+// Set a new refresh token in localStorage
+export const setRefreshToken = (token) => token && localStorage.setItem('refresh_token', token);
+
+// Clear both access and refresh tokens from localStorage
+export const clearAuthTokens = () => {
+  localStorage.removeItem('access_token');
+  localStorage.removeItem('refresh_token');
+};
+
+// Queue a request to be retried after token refresh
+export const queueRequest = (cb) =>
+  new Promise((resolve, reject) => {
+    // Reject if too many requests are already queued
+    if (pendingRequests.length >= MAX_PENDING_REQUESTS) {
+      reject(new Error('Too many requests waiting for token refresh'));
+      return;
+    }
+
+    // Add the request to the pending requests array
+    pendingRequests.push({ cb, resolve, reject });
+  });
+
+// Retry all queued requests with the new access token
+const retryQueuedRequests = (newToken) => {
+  pendingRequests.forEach(({ cb, resolve, reject }) => {
+    cb(newToken).then(resolve).catch(reject); // Retry each request
+  });
+
+  // Clear the queue after retrying all requests
+  pendingRequests = [];
+};
+
+export const refreshAccessToken = () => {
+  // If a refresh is already in progress, return the same promise
+  if (refreshTokenPromise) {
+    return refreshTokenPromise;
+  }
+
+  const refreshToken = getRefreshToken();
+
+  refreshTokenPromise = new Promise(async (resolve, reject) => {
+    try {
+      const response = await fetch(`${process.env.REACT_APP_endpoint}auth/refresh`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          db_ptr: localStorage.getItem('db_ptr'),
+        },
+        body: JSON.stringify({ refreshToken }),
+      });
+
+      const data = await response.json();
+
+      const { access_token, refresh_token, success } = data || {};
+
+      if (success) {
+        // Save the new access token
+        setAccessToken(access_token);
+        // Save the new refresh token
+        setRefreshToken(refresh_token);
+        // Retry all queued requests with the new token
+        retryQueuedRequests(access_token);
+        // Resolve the promise with the new token
+        resolve(access_token);
+      } else {
+        localStorage.clear();
+        Location.navigate({ url: '/login' });
+        throw new Error('Token refresh failed');
+      }
+    } catch (error) {
+      pendingRequests.forEach(({ reject }) => reject(error));
+      pendingRequests = [];
+      reject(error);
+    } finally {
+      refreshTokenPromise = null;
+    }
+  });
+
+  return refreshTokenPromise;
+};

package/core/lib/utils/http/http.utils.js

@@ -1,158 +1,158 @@
-/**
- *
- * Final Entry for all the API calls
- *
- * All the common configurations should bypass httpUtils
- * Keep adding additional methods on requirement
- *
- */
-
-import { message } from 'antd';
-
-import FirebaseUtils from '../firebase.utils';
-
-import { Location } from '../location/location.utils';
-import { getRefreshToken, queueRequest, refreshAccessToken } from './auth.helper';
-
-let headers = {
-  // 'Accept': 'application/json',
-  'Content-Type': 'application/json',
-  // 'Cache-Control': 'no-cache',
-  // 'X-Apartment-Id': 1,
-};
-
-/**
- * Method for Get Call
- *
- * @param {*} param
- * @public
- */
-export async function GetData({ url, formBody, settings, ...props }) {
-  return ApiCall({ url, formBody, method: 'GET', settings, ...props });
-}
-
-/**
- * Method posts data to mentioned url
- *
- * @param {*} param
- * @public
- */
-export async function PostData({ url, formBody, ...props }) {
-  return ApiCall({ url, formBody, method: 'POST', returnResponse: true, ...props });
-}
-
-/**
- * Method for update the data
- * @public
- */
-export async function PutData({ url, formBody, ...props }) {
-  return ApiCall({ url, formBody, method: 'PUT', returnResponse: true, ...props });
-}
-
-/**
- * Method for update the data
- * @public
- */
-export async function PatchData({ url, formBody, ...props }) {
-  return ApiCall({ url, formBody, method: 'PATCH', returnResponse: true, ...props });
-}
-
-/**
- * Method for update the data
- * @public
- */
-export async function DeleteData({ url, ...props }) {
-  return ApiCall({ url, method: 'DELETE', returnResponse: true, ...props });
-}
-
-/**
- * Final Exit for API call
- *
- * @param {*} param
- */
-
-export async function ApiCall({ url, formBody, method, settings, ...props }) {
-  const token = props.token || (await settings.getToken());
-  const path = window.location.pathname;
-  const baseUrl = props.baseUrl || process.env.REACT_APP_endpoint;
-
-  const payload = {
-    method,
-    headers: {
-      ...settings.headers,
-      ...headers,
-      ...(props.headers || {}),
-      Authorization: `Bearer ${token}`,
-      'Content-Type': 'application/json',
-    },
-    body: formBody ? JSON.stringify(formBody) : null,
-  };
-
-  // 🟡 Handles both normal and retried responses
-  const handleResponse = async (res) => {
-    if (props.responseType === 'blob') {
-      const blob = await res.blob();
-      return {
-        contentType: res.headers.get('Content-Type'),
-        raw: blob,
-      };
-    }
-
-    const json = await res.json();
-
-    if ([400, 404].includes(res.status) || [400, 500, 501].includes(json?.statusCode)) {
-      if (!props.hideError) {
-        message.error(json.message || 'Request failed');
-      }
-      throw json;
-    }
-
-    return json;
-  };
-
-  // 🟢 Main function with retry logic
-  const makeRequest = async () => {
-    const res = await fetch(baseUrl + url, payload);
-    const refreshToken = getRefreshToken();
-
-    if (res.status === 403) {
-      message.warn('Your license has expired. Please contact support.');
-    }
-
-    if (res.status === 401 && path !== '/login' && refreshToken) {
-      const retryPromise = queueRequest(async (newToken) => {
-        payload.headers = {
-          ...payload.headers,
-          Authorization: `Bearer ${newToken}`,
-        };
-
-        const retryRes = await fetch(baseUrl + url, payload);
-
-        if (retryRes.status === 401) {
-          Location.navigate({ url: '/login' });
-          throw new Error('Unauthorized after token refresh');
-        }
-
-        // ✅ return parsed JSON
-        return handleResponse(retryRes);
-      });
-
-      // 🔁 triggers queued requests
-      refreshAccessToken();
-      // ✅ resolve to retried final data
-      return retryPromise;
-    }
-
-    // ✅ normal (non-401) case
-    return handleResponse(res);
-  };
-
-  try {
-    const result = await makeRequest();
-    // ✅ always return final result
-    return result;
-  } catch (err) {
-    console.error('Login error -->', err?.message);
-    throw err;
-  }
-}
+/**
+ *
+ * Final Entry for all the API calls
+ *
+ * All the common configurations should bypass httpUtils
+ * Keep adding additional methods on requirement
+ *
+ */
+
+import { message } from 'antd';
+
+import FirebaseUtils from '../firebase.utils';
+
+import { Location } from '../location/location.utils';
+import { getRefreshToken, queueRequest, refreshAccessToken } from './auth.helper';
+
+let headers = {
+  // 'Accept': 'application/json',
+  'Content-Type': 'application/json',
+  // 'Cache-Control': 'no-cache',
+  // 'X-Apartment-Id': 1,
+};
+
+/**
+ * Method for Get Call
+ *
+ * @param {*} param
+ * @public
+ */
+export async function GetData({ url, formBody, settings, ...props }) {
+  return ApiCall({ url, formBody, method: 'GET', settings, ...props });
+}
+
+/**
+ * Method posts data to mentioned url
+ *
+ * @param {*} param
+ * @public
+ */
+export async function PostData({ url, formBody, ...props }) {
+  return ApiCall({ url, formBody, method: 'POST', returnResponse: true, ...props });
+}
+
+/**
+ * Method for update the data
+ * @public
+ */
+export async function PutData({ url, formBody, ...props }) {
+  return ApiCall({ url, formBody, method: 'PUT', returnResponse: true, ...props });
+}
+
+/**
+ * Method for update the data
+ * @public
+ */
+export async function PatchData({ url, formBody, ...props }) {
+  return ApiCall({ url, formBody, method: 'PATCH', returnResponse: true, ...props });
+}
+
+/**
+ * Method for update the data
+ * @public
+ */
+export async function DeleteData({ url, ...props }) {
+  return ApiCall({ url, method: 'DELETE', returnResponse: true, ...props });
+}
+
+/**
+ * Final Exit for API call
+ *
+ * @param {*} param
+ */
+
+export async function ApiCall({ url, formBody, method, settings, ...props }) {
+  const token = props.token || (await settings.getToken());
+  const path = window.location.pathname;
+  const baseUrl = props.baseUrl || process.env.REACT_APP_endpoint;
+
+  const payload = {
+    method,
+    headers: {
+      ...settings.headers,
+      ...headers,
+      ...(props.headers || {}),
+      Authorization: `Bearer ${token}`,
+      'Content-Type': 'application/json',
+    },
+    body: formBody ? JSON.stringify(formBody) : null,
+  };
+
+  // 🟡 Handles both normal and retried responses
+  const handleResponse = async (res) => {
+    if (props.responseType === 'blob') {
+      const blob = await res.blob();
+      return {
+        contentType: res.headers.get('Content-Type'),
+        raw: blob,
+      };
+    }
+
+    const json = await res.json();
+
+    if ([400, 404].includes(res.status) || [400, 500, 501].includes(json?.statusCode)) {
+      if (!props.hideError) {
+        message.error(json.message || 'Request failed');
+      }
+      throw json;
+    }
+
+    return json;
+  };
+
+  // 🟢 Main function with retry logic
+  const makeRequest = async () => {
+    const res = await fetch(baseUrl + url, payload);
+    const refreshToken = getRefreshToken();
+
+    if (res.status === 403) {
+      message.warn('Your license has expired. Please contact support.');
+    }
+
+    if (res.status === 401 && path !== '/login' && refreshToken) {
+      const retryPromise = queueRequest(async (newToken) => {
+        payload.headers = {
+          ...payload.headers,
+          Authorization: `Bearer ${newToken}`,
+        };
+
+        const retryRes = await fetch(baseUrl + url, payload);
+
+        if (retryRes.status === 401) {
+          Location.navigate({ url: '/login' });
+          throw new Error('Unauthorized after token refresh');
+        }
+
+        // ✅ return parsed JSON
+        return handleResponse(retryRes);
+      });
+
+      // 🔁 triggers queued requests
+      refreshAccessToken();
+      // ✅ resolve to retried final data
+      return retryPromise;
+    }
+
+    // ✅ normal (non-401) case
+    return handleResponse(res);
+  };
+
+  try {
+    const result = await makeRequest();
+    // ✅ always return final result
+    return result;
+  } catch (err) {
+    console.error('Login error -->', err?.message);
+    throw err;
+  }
+}

package/core/lib/utils/http/readme.md

@@ -1,14 +1,14 @@
-## Usage
-
-HTTP Utils is a JavaScript library for making HTTP requests. It provides a set of functions for making GET, POST, PUT, and DELETE requests, as well as for handling errors and parsing response data.
-
-To use HTTP Utils in your JavaScript code, you need to require it:
-
-### HTTP Requests
-
-The following functions are available for making HTTP requests:
-
-● get(url, params): Sends a GET request to the specified url with the given params. Returns a Promise that resolves with the response data.<br>
-● post(url, data): Sends a POST request to the specified url with the given data. Returns a Promise that resolves with the response data.<br>
-● put(url, data): Sends a PUT request to the specified url with the given data. Returns a Promise that resolves with the response data.<br>
-● del(url): Sends a DELETE request to the specified url. Returns a Promise that resolves with the response data.
+## Usage
+
+HTTP Utils is a JavaScript library for making HTTP requests. It provides a set of functions for making GET, POST, PUT, and DELETE requests, as well as for handling errors and parsing response data.
+
+To use HTTP Utils in your JavaScript code, you need to require it:
+
+### HTTP Requests
+
+The following functions are available for making HTTP requests:
+
+● get(url, params): Sends a GET request to the specified url with the given params. Returns a Promise that resolves with the response data.<br>
+● post(url, data): Sends a POST request to the specified url with the given data. Returns a Promise that resolves with the response data.<br>
+● put(url, data): Sends a PUT request to the specified url with the given data. Returns a Promise that resolves with the response data.<br>
+● del(url): Sends a DELETE request to the specified url. Returns a Promise that resolves with the response data.

package/core/lib/utils/index.js

@@ -1,40 +1,40 @@
-import { Location } from './location/location.utils';
-
-import Notification from './notification.utils';
-
-import DateUtils from './date/date.utils';
-
-import ApiUtils from './api/api.utils';
-
-import FormUtils from './form/form.utils';
-
-import { UploadUtils } from './upload.utils';
-
-import { GetData, PostData, PutData, DeleteData } from './http/http.utils';
-
-import { getExportData } from './generic/generic.utils';
-
-import { ConvertBytesToArray, safeJSON } from './common/common.utils';
-
-import SettingsUtil from './setting.utils';
-
-export {
-  // FirebaseUtils,
-
-  Notification,
-  Location,
-  DateUtils,
-  ApiUtils,
-  UploadUtils,
-  GetData,
-  PostData,
-  PutData,
-  DeleteData,
-  getExportData,
-
-  // Common Functions
-  ConvertBytesToArray,
-  SettingsUtil,
-  FormUtils,
-  safeJSON,
-};
+import { Location } from './location/location.utils';
+
+import Notification from './notification.utils';
+
+import DateUtils from './date/date.utils';
+
+import ApiUtils from './api/api.utils';
+
+import FormUtils from './form/form.utils';
+
+import { UploadUtils } from './upload.utils';
+
+import { GetData, PostData, PutData, DeleteData } from './http/http.utils';
+
+import { getExportData } from './generic/generic.utils';
+
+import { ConvertBytesToArray, safeJSON } from './common/common.utils';
+
+import SettingsUtil from './setting.utils';
+
+export {
+  // FirebaseUtils,
+
+  Notification,
+  Location,
+  DateUtils,
+  ApiUtils,
+  UploadUtils,
+  GetData,
+  PostData,
+  PutData,
+  DeleteData,
+  getExportData,
+
+  // Common Functions
+  ConvertBytesToArray,
+  SettingsUtil,
+  FormUtils,
+  safeJSON,
+};