@alba-cars/common-modules 1.4.7 → 1.4.9

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

@@ -41,7 +41,7 @@ const refreshTokens = async () => {
     var _a, _b, _c, _d;
     try {
         const tokens = (0, exports.getTokens)();
-        if ((!isServer && !(tokens === null || tokens === void 0 ? void 0 : tokens.refreshToken))) {
+        if (!isServer && !(tokens === null || tokens === void 0 ? void 0 : tokens.refreshToken)) {
             // only throw this error if we are on the client and there are no refresh token available
             throw new Error("No refresh token available");
         }
@@ -77,7 +77,7 @@ const buildUrl = (endpoint, query) => {
     return url;
 };
 async function apiRequest(endpoint, options = {}) {
-    var _a, _b, _c, _d;
+    var _a;
     const headers = {
         Accept: "application/json",
         "Content-Type": "application/json",
@@ -95,77 +95,86 @@ async function apiRequest(endpoint, options = {}) {
         ...options,
     };
     try {
-        const url = buildUrl(endpoint, options.query);
-        const response = await fetch(url, config);
-        const contentType = response.headers.get("content-type");
-        const responseData = (contentType === null || contentType === void 0 ? void 0 : contentType.includes("application/json"))
-            ? await response.json()
-            : await response.text();
-        if (!response.ok) {
-            const error = new Error(typeof responseData === "object"
-                ? responseData.message || "API Error"
-                : "API Error");
-            error.status = response.status;
-            error.data = responseData;
-            // Handle token expired error
-            if (!isServer &&
-                response.status === enums_1.HttpStatusCodes.UNAUTHORIZED &&
-                ((_b = responseData === null || responseData === void 0 ? void 0 : responseData.error) === null || _b === void 0 ? void 0 : _b.type) === "AUTHENTICATION_ERROR" &&
-                ((_c = responseData === null || responseData === void 0 ? void 0 : responseData.error) === null || _c === void 0 ? void 0 : _c.message) === "Token expired" &&
-                !options.skipAuth) {
-                if (isRefreshing) {
-                    // Wait for token refresh if already in progress
-                    return new Promise((resolve, reject) => {
-                        subscribeTokenRefresh(async (newToken) => {
-                            try {
-                                // Retry the original request with new token
-                                const retriedResponse = await apiRequest(endpoint, {
-                                    ...options,
-                                    headers: {
-                                        ...options.headers,
-                                        Authorization: `Bearer ${newToken}`,
-                                    },
-                                });
-                                resolve(retriedResponse);
-                            }
-                            catch (error) {
-                                reject(error);
-                            }
-                        });
-                    });
-                }
-                isRefreshing = true;
+        const response = await makeRequest(endpoint, config, options);
+        return response;
+    }
+    catch (error) {
+        console.error("API Request Error:", error);
+        return Promise.reject(error);
+    }
+}
+exports.apiRequest = apiRequest;
+async function makeRequest(endpoint, config, options = {}) {
+    var _a;
+    const url = buildUrl(endpoint, options.query);
+    const response = await fetch(url, config);
+    const contentType = response.headers.get("content-type");
+    const responseData = (contentType === null || contentType === void 0 ? void 0 : contentType.includes("application/json"))
+        ? await response.json()
+        : await response.text();
+    if (response.ok) {
+        if (!isServer && !options.skipAuth && ((_a = responseData === null || responseData === void 0 ? void 0 : responseData.data) === null || _a === void 0 ? void 0 : _a.token)) {
+            (0, exports.setTokens)({
+                accessToken: responseData.data.token,
+                refreshToken: responseData.data.refreshToken,
+            });
+        }
+        return responseData;
+    }
+    // Handle unauthorized error and token refresh
+    if (!isServer &&
+        response.status === enums_1.HttpStatusCodes.UNAUTHORIZED &&
+        !options.skipAuth) {
+        return handleUnauthorizedError(endpoint, options);
+    }
+    // Handle other errors
+    throw createApiError(response.status, responseData);
+}
+async function handleUnauthorizedError(endpoint, options) {
+    if (isRefreshing) {
+        return new Promise((resolve, reject) => {
+            subscribeTokenRefresh(async (newToken) => {
                 try {
-                    const newToken = await refreshTokens();
-                    onTokenRefreshed(newToken);
-                    isRefreshing = false;
-                    // Retry the original request with new token
-                    return apiRequest(endpoint, {
+                    const response = await apiRequest(endpoint, {
                         ...options,
                         headers: {
                             ...options.headers,
                             Authorization: `Bearer ${newToken}`,
                         },
                     });
+                    resolve(response);
                 }
-                catch (refreshError) {
-                    isRefreshing = false;
-                    throw refreshError;
+                catch (error) {
+                    reject(error);
                 }
-            }
-            throw error;
-        }
-        if (!isServer && !options.skipAuth && ((_d = responseData === null || responseData === void 0 ? void 0 : responseData.data) === null || _d === void 0 ? void 0 : _d.token)) {
-            (0, exports.setTokens)({
-                accessToken: responseData.data.token,
-                refreshToken: responseData.data.refreshToken,
             });
-        }
-        return responseData;
+        });
     }
-    catch (error) {
-        console.error("API Request Error:", error);
-        return Promise.reject(error);
+    isRefreshing = true;
+    try {
+        const newToken = await refreshTokens();
+        onTokenRefreshed(newToken);
+        return apiRequest(endpoint, {
+            ...options,
+            headers: {
+                ...options.headers,
+                Authorization: `Bearer ${newToken}`,
+            },
+        });
+    }
+    catch (refreshError) {
+        (0, exports.removeTokens)();
+        throw refreshError;
+    }
+    finally {
+        isRefreshing = false;
     }
 }
-exports.apiRequest = apiRequest;
+function createApiError(status, responseData) {
+    const error = new Error(typeof responseData === "object"
+        ? responseData.message || "API Error"
+        : "API Error");
+    error.status = status;
+    error.data = responseData;
+    return error;
+}

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

@@ -34,6 +34,7 @@ export declare class SalesAgentUpdateDTO {
     designation?: Designation;
     agentIntro?: string;
     name?: string;
+    languageIds?: string[];
     email?: string;
     phone?: string;
     photo?: string;

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

@@ -150,6 +150,12 @@ __decorate([
     (0, class_validator_1.IsString)(),
     __metadata("design:type", String)
 ], SalesAgentUpdateDTO.prototype, "name", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsArray)(),
+    (0, class_validator_1.IsUUID)("4", { each: true }),
+    __metadata("design:type", Array)
+], SalesAgentUpdateDTO.prototype, "languageIds", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsEmail)(),

package/package.json

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