@alba-cars/common-modules 1.10.6 → 1.10.8

package/dist/core/network/fetch-api.d.ts

@@ -3,6 +3,7 @@ interface ApiRequestOptions extends RequestInit {
     query?: Record<string, any>;
     timeout?: number;
     signal?: AbortSignal;
+    isRetry?: boolean;
 }
 type RequestInterceptor = (config: RequestInit & {
     url: string;
@@ -16,10 +17,12 @@ type RequestInterceptor = (config: RequestInit & {
 });
 type ResponseInterceptor = (response: Response, requestConfig: RequestInit & {
     url: string;
+    options: ApiRequestOptions;
 }) => Promise<Response> | Response;
 type ResponseErrorInterceptor = (error: any, requestConfig: RequestInit & {
     url: string;
-}) => Promise<Response> | Response | Promise<any> | any;
+    options: ApiRequestOptions;
+}) => Promise<any> | any;
 declare class InterceptorManager {
     private requestInterceptors;
     private responseInterceptors;
@@ -43,12 +46,15 @@ declare class InterceptorManager {
     }>;
     applyResponseInterceptors(response: Response, requestConfig: RequestInit & {
         url: string;
+        options: ApiRequestOptions;
     }): Promise<Response>;
     applyResponseErrorInterceptors(error: any, requestConfig: RequestInit & {
         url: string;
+        options: ApiRequestOptions;
     }): Promise<any>;
     retryRequest<T>(config: RequestInit & {
         url: string;
+        options: ApiRequestOptions;
     }): Promise<T>;
 }
 export declare const interceptors: InterceptorManager;

package/dist/core/network/fetch-api.js

@@ -69,30 +69,30 @@ class InterceptorManager {
         return modifiedResponse;
     }
     async applyResponseErrorInterceptors(error, requestConfig) {
-        let modifiedError = error;
+        // Create a chain of error interceptors that can potentially resolve the error
+        let promise = Promise.reject(error);
         for (const interceptor of this.responseErrorInterceptors) {
-            try {
-                // If an interceptor resolves the error, return the resolved value
-                const result = await interceptor(modifiedError, requestConfig);
-                if (result instanceof Response) {
-                    return result;
-                }
-                modifiedError = result;
-            }
-            catch (newError) {
-                // If an interceptor rejects, continue with the new error
-                modifiedError = newError;
-            }
+            promise = promise.catch((currentError) => interceptor(currentError, requestConfig));
         }
-        // If no interceptor handled the error, throw it
-        throw modifiedError;
+        return promise;
     }
     async retryRequest(config) {
+        // Mark this as a retry request to avoid infinite loops
+        const retryConfig = {
+            ...config,
+            options: {
+                ...config.options,
+                isRetry: true,
+            },
+        };
         try {
+            // Apply request interceptors before retrying
+            const interceptedConfig = await this.applyRequestInterceptors(retryConfig);
             // Make a new request with the updated config
-            const response = await fetch(config.url, config);
+            const response = await fetch(interceptedConfig.url, interceptedConfig);
             // Apply response interceptors
-            const interceptedResponse = await this.applyResponseInterceptors(response, config);
+            const interceptedResponse = await this.applyResponseInterceptors(response, interceptedConfig);
+            // Process the response
             const contentType = interceptedResponse.headers.get("content-type");
             const responseData = (contentType === null || contentType === void 0 ? void 0 : contentType.includes("application/json"))
                 ? await interceptedResponse.json()
@@ -105,8 +105,12 @@ class InterceptorManager {
             throw apiError;
         }
         catch (error) {
+            // For retry requests, don't apply error interceptors again to avoid loops
+            if (config.options.isRetry) {
+                throw error;
+            }
             // Apply response error interceptors
-            return this.applyResponseErrorInterceptors(error, config);
+            return this.applyResponseErrorInterceptors(error, retryConfig);
         }
     }
 }
@@ -146,14 +150,12 @@ async function apiRequest(endpoint, options = {}) {
         headers,
         ...(signal && { signal }),
         ...options,
+        options, // Keep a reference to the original options
     };
     try {
-        const response = await makeRequest(endpoint, config, options);
+        const response = await makeRequest(endpoint, config);
         return response;
     }
-    catch (error) {
-        return Promise.reject(error);
-    }
     finally {
         if (timeoutId) {
             clearTimeout(timeoutId);
@@ -161,20 +163,19 @@ async function apiRequest(endpoint, options = {}) {
     }
 }
 exports.apiRequest = apiRequest;
-async function makeRequest(endpoint, config, options = {}) {
-    const url = buildUrl(endpoint, options.query);
-    // Apply request interceptors
+async function makeRequest(endpoint, config) {
+    const url = buildUrl(endpoint, config.options.query);
+    // Apply request interceptors with the full context including options
     let requestConfig = await exports.interceptors.applyRequestInterceptors({
         ...config,
         url,
-        options,
     });
     // Extract the URL after interceptors may have modified it
     const interceptedUrl = requestConfig.url;
     try {
         // Make the actual request
         const response = await fetch(interceptedUrl, requestConfig);
-        // Apply response interceptors
+        // Apply response interceptors with the full context
         const interceptedResponse = await exports.interceptors.applyResponseInterceptors(response, { ...requestConfig, url: interceptedUrl });
         const contentType = interceptedResponse.headers.get("content-type");
         const responseData = (contentType === null || contentType === void 0 ? void 0 : contentType.includes("application/json"))
@@ -188,7 +189,7 @@ async function makeRequest(endpoint, config, options = {}) {
         throw apiError;
     }
     catch (error) {
-        // Apply response error interceptors
+        // Apply response error interceptors with the full context
         return exports.interceptors.applyResponseErrorInterceptors(error, {
             ...requestConfig,
             url: interceptedUrl,

package/dist/features/sales-team/data/dto/SalesAgentDTO.d.ts

@@ -1,14 +1,14 @@
 import { UserCreateDTO, UserGetDTO, UserUpdateDTO } from "../../../auth";
 export declare enum Designation {
-    MANAGER = "sales-manager",
-    EXECUTIVE = "sales-executive",
+    SALES_MANAGER = "sales-manager",
+    SALES_EXECUTIVE = "sales-executive",
     CO_FOUNDER = "co-founder",
     CSO = "cso",
     PURCHASE_MANAGER = "Purchase Manager"
 }
 export declare enum TeamCategory {
-    SALES = "salesteam",
-    PURCHASE = "managementteam"
+    SALES = "sales",
+    MANAGEMENT = "management"
 }
 export declare enum Languages {
     ARABIC = "Arabic",

package/dist/features/sales-team/data/dto/SalesAgentDTO.js

@@ -15,16 +15,16 @@ const class_transformer_1 = require("class-transformer");
 const auth_1 = require("../../../auth");
 var Designation;
 (function (Designation) {
-    Designation["MANAGER"] = "sales-manager";
-    Designation["EXECUTIVE"] = "sales-executive";
+    Designation["SALES_MANAGER"] = "sales-manager";
+    Designation["SALES_EXECUTIVE"] = "sales-executive";
     Designation["CO_FOUNDER"] = "co-founder";
     Designation["CSO"] = "cso";
     Designation["PURCHASE_MANAGER"] = "Purchase Manager";
 })(Designation = exports.Designation || (exports.Designation = {}));
 var TeamCategory;
 (function (TeamCategory) {
-    TeamCategory["SALES"] = "salesteam";
-    TeamCategory["PURCHASE"] = "managementteam";
+    TeamCategory["SALES"] = "sales";
+    TeamCategory["MANAGEMENT"] = "management";
 })(TeamCategory = exports.TeamCategory || (exports.TeamCategory = {}));
 var Languages;
 (function (Languages) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.10.6",
+  "version": "1.10.8",
   "description": "A package containing DTOs, validation classes and common modules and interfaces for Alba Cars",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",