underpost 3.2.5 → 3.2.8

package/src/client/services/core/core.service.js

@@ -4,19 +4,14 @@
  * @module src/client/services/core/core.service.js
  * @namespace CoreServiceClient
  */
-
 import { Auth } from '../../components/core/Auth.js';
 import { loggerFactory } from '../../components/core/Logger.js';
 import { getProxyPath } from '../../components/core/Router.js';
-
+import { GuestService } from '../user/guest.service.js';
 const logger = loggerFactory(import.meta);
-
 logger.info('Load service');
-
 const endpoint = 'core';
-
 // https://developer.mozilla.org/en-US/docs/Web/API/AbortController
-
 /**
  * Returns the normalized proxy path from renderPayload (always trailing `/`).
  * Falls back to `null` when no apiBaseProxyPath is set.
@@ -29,7 +24,6 @@ const getApiBaseProxyPath = () =>
       ? window.renderPayload.apiBaseProxyPath
       : `${window.renderPayload.apiBaseProxyPath}/`
     : null;
-
 /**
  * Gets the base host for API requests.
  * Uses the apiBaseHost from renderPayload if available, otherwise falls back to location.host.
@@ -37,7 +31,6 @@ const getApiBaseProxyPath = () =>
  * @return {string} The base host string.
  */
 const getBaseHost = () => (window.renderPayload?.apiBaseHost ? window.renderPayload.apiBaseHost : location.host);
-
 /**
  * Gets the base path for API requests.
  * Constructs the path using proxyPath and apiBasePath from renderPayload or defaults.
@@ -47,10 +40,7 @@ const getBaseHost = () => (window.renderPayload?.apiBaseHost ? window.renderPayl
  * @return {string} The constructed API base path.
  */
 const getApiBasePath = (options) =>
-  `${
-    options?.proxyPath ? `/${options.proxyPath}/` : getApiBaseProxyPath() || getProxyPath()
-  }${window.renderPayload?.apiBasePath ? window.renderPayload.apiBasePath : 'api'}/`;
-
+  `${options?.proxyPath ? `/${options.proxyPath}/` : getApiBaseProxyPath() || getProxyPath()}${window.renderPayload?.apiBasePath ? window.renderPayload.apiBasePath : 'api'}/`;
 /**
  * Constructs the full API base URL for making requests.
  * Combines protocol, host, base path, endpoint, and optional ID.
@@ -62,10 +52,7 @@ const getApiBasePath = (options) =>
  * @return {string} The full API base URL.
  */
 const getApiBaseUrl = (options = { id: '', endpoint: '', proxyPath: '' }) =>
-  `${location.protocol}//${getBaseHost()}${getApiBasePath(options)}${options?.endpoint ? options.endpoint : ''}${
-    options?.id ? `/${options.id}` : ''
-  }`;
-
+  `${location.protocol}//${getBaseHost()}${getApiBasePath(options)}${options?.endpoint ? options.endpoint : ''}${options?.id ? `/${options.id}` : ''}`;
 /**
  * Gets the base path for WebSocket connections.
  * Constructs the socket.io path using the proxy path.
@@ -77,7 +64,6 @@ const getWsBasePath = () => {
   if (proxyPath) return proxyPath !== '/' ? `${proxyPath}socket.io/` : '/socket.io/';
   return getProxyPath() !== '/' ? `${getProxyPath()}socket.io/` : '/socket.io/';
 };
-
 /**
  * Constructs the full WebSocket base URL for connections.
  * Uses wss: for HTTPS and ws: for HTTP protocols.
@@ -89,10 +75,7 @@ const getWsBasePath = () => {
  * @return {string} The full WebSocket base URL.
  */
 const getWsBaseUrl = (options = { id: '', endpoint: '', wsBasePath: '' }) =>
-  `${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${getBaseHost()}${
-    options?.wsBasePath !== undefined ? options.wsBasePath : getWsBasePath()
-  }${options?.endpoint ? options.endpoint : ''}${options?.id ? `/${options.id}` : ''}`;
-
+  `${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${getBaseHost()}${options?.wsBasePath !== undefined ? options.wsBasePath : getWsBasePath()}${options?.endpoint ? options.endpoint : ''}${options?.id ? `/${options.id}` : ''}`;
 /**
  * Creates HTTP headers for API requests.
  * Includes Authorization header with JWT token and Content-Type based on headerId.
@@ -102,18 +85,16 @@ const getWsBaseUrl = (options = { id: '', endpoint: '', wsBasePath: '' }) =>
  */
 const headersFactory = (headerId = '') => {
   const headers = {
-    Authorization: Auth.getJWT(),
+    Authorization: GuestService.getAuthorizationHeader() || Auth.getJWT(),
   };
   switch (headerId) {
     case 'file':
       return headers;
-
     default:
       headers['Content-Type'] = 'application/json';
       return headers;
   }
 };
-
 /**
  * Prepares the request body payload for API requests.
  * Returns FormData as-is, otherwise stringifies the body as JSON.
@@ -125,7 +106,6 @@ const payloadFactory = (body) => {
   if (body instanceof FormData) return body;
   return JSON.stringify(body);
 };
-
 /**
  * Builds a URL with query parameters for pagination, filtering, and sorting.
  * Supports AG Grid filterModel/sortModel as well as legacy simple sort params.
@@ -144,11 +124,9 @@ const payloadFactory = (body) => {
 const buildQueryUrl = (baseUrl, options = {}) => {
   const url = new URL(baseUrl);
   const { page, limit, filterModel, sortModel, sort, asc, order } = options;
-
   // Add pagination params
   if (page !== undefined) url.searchParams.set('page', page);
   if (limit !== undefined) url.searchParams.set('limit', limit);
-
   // Add filter model (AG Grid format) - send as JSON string
   if (filterModel) {
     const filterStr = typeof filterModel === 'string' ? filterModel : JSON.stringify(filterModel);
@@ -156,7 +134,6 @@ const buildQueryUrl = (baseUrl, options = {}) => {
       url.searchParams.set('filterModel', filterStr);
     }
   }
-
   // Add sort model (AG Grid format) - send as JSON string
   if (sortModel) {
     const sortStr = typeof sortModel === 'string' ? sortModel : JSON.stringify(sortModel);
@@ -164,20 +141,17 @@ const buildQueryUrl = (baseUrl, options = {}) => {
       url.searchParams.set('sortModel', sortStr);
     }
   }
-
   // Add simple sort params for backwards compatibility
   if (sort) url.searchParams.set('sort', sort);
   if (asc !== undefined) url.searchParams.set('asc', asc);
   if (order) url.searchParams.set('order', order);
-
   return url;
 };
-
 /**
  * Core Service object providing CRUD operations for the core API endpoint.
  * @memberof CoreServiceClient
  */
-const CoreService = {
+class CoreService {
   /**
    * Performs a raw GET request to fetch content as text.
    * @memberof CoreServiceClient.CoreService
@@ -185,7 +159,7 @@ const CoreService = {
    * @param {string} [options.url=''] - The full URL to fetch.
    * @return {Promise<string>} A promise that resolves with the response text.
    */
-  getRaw: (options = { url: '' }) =>
+  static getRaw = (options = { url: '' }) =>
     new Promise((resolve, reject) =>
       fetch(options.url, {
         method: 'GET',
@@ -201,8 +175,7 @@ const CoreService = {
           logger.error(error);
           return reject(error);
         }),
-    ),
-
+    );
   /**
    * Performs a POST request to create a new resource.
    * @memberof CoreServiceClient.CoreService
@@ -211,7 +184,7 @@ const CoreService = {
    * @param {Object} [options.body={}] - The request body payload.
    * @return {Promise<Object>} A promise that resolves with the JSON response.
    */
-  post: (options = { id: '', body: {} }) =>
+  static post = (options = { id: '', body: {} }) =>
     new Promise((resolve, reject) =>
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'POST',
@@ -230,8 +203,7 @@ const CoreService = {
           logger.error(error);
           return reject(error);
         }),
-    ),
-
+    );
   /**
    * Performs a PUT request to update an existing resource.
    * @memberof CoreServiceClient.CoreService
@@ -240,7 +212,7 @@ const CoreService = {
    * @param {Object} [options.body={}] - The request body payload with updated data.
    * @return {Promise<Object>} A promise that resolves with the JSON response.
    */
-  put: (options = { id: '', body: {} }) =>
+  static put = (options = { id: '', body: {} }) =>
     new Promise((resolve, reject) =>
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'PUT',
@@ -259,8 +231,7 @@ const CoreService = {
           logger.error(error);
           return reject(error);
         }),
-    ),
-
+    );
   /**
    * Performs a GET request to retrieve a resource.
    * @memberof CoreServiceClient.CoreService
@@ -269,7 +240,7 @@ const CoreService = {
    * @param {Object} [options.body={}] - Unused, kept for API consistency.
    * @return {Promise<Object>} A promise that resolves with the JSON response.
    */
-  get: (options = { id: '', body: {} }) =>
+  static get = (options = { id: '', body: {} }) =>
     new Promise((resolve, reject) =>
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'GET',
@@ -287,8 +258,7 @@ const CoreService = {
           logger.error(error);
           return reject(error);
         }),
-    ),
-
+    );
   /**
    * Performs a DELETE request to remove a resource.
    * @memberof CoreServiceClient.CoreService
@@ -297,7 +267,7 @@ const CoreService = {
    * @param {Object} [options.body={}] - Optional request body payload.
    * @return {Promise<Object>} A promise that resolves with the JSON response.
    */
-  delete: (options = { id: '', body: {} }) =>
+  static delete = (options = { id: '', body: {} }) =>
     new Promise((resolve, reject) =>
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'DELETE',
@@ -316,16 +286,14 @@ const CoreService = {
           logger.error(error);
           return reject(error);
         }),
-    ),
-};
-
+    );
+}
 /**
  * Alias for getApiBaseUrl function.
  * @memberof CoreServiceClient
  * @type {Function}
  */
 const ApiBase = getApiBaseUrl;
-
 export {
   CoreService,
   headersFactory,