@iblai/web-utils 1.2.10 → 1.2.12

package/dist/index.js

@@ -2781,7 +2781,7 @@ async function isDmTokenExpired(storageService) {
     try {
         const dmTokenExpires = await storageService.getItem(LOCAL_STORAGE_KEYS.DM_TOKEN_EXPIRES);
         if (!dmTokenExpires) {
-            return true;
+            return false;
         }
         const expiryTime = new Date(dmTokenExpires).getTime();
         const currentTime = Date.now();
@@ -3011,14 +3011,23 @@ function useAuthProvider({ middleware = new Map(), onAuthSuccess, onAuthFailure,
             }
             // Check JWT token expiry and force logout for protected routes
             if (isProtectedRoute && storageService) {
+                const dmTokenInLocalStorage = await storageService.getItem(LOCAL_STORAGE_KEYS.DM_TOKEN_KEY);
                 const dmTokenExpired = await isDmTokenExpired(storageService);
-                if (dmTokenExpired) {
-                    console.log("[auth-redirect] DM token has expired, forcing logout");
+                if (!dmTokenInLocalStorage || dmTokenExpired) {
+                    console.log();
+                    if (!!dmTokenInLocalStorage) {
+                        console.log("[auth-redirect] DM token doesn't exists");
+                    }
+                    else {
+                        console.log("[auth-redirect] DM token doesn't exists, forcing logout");
+                    }
                     // Clear all auth-related storage keys
-                    clearAuthCookies();
+                    if (!!dmTokenInLocalStorage) {
+                        clearAuthCookies();
+                    }
                     const reason = "DM token expired";
                     onAuthFailure === null || onAuthFailure === void 0 ? void 0 : onAuthFailure(reason);
-                    safeRedirectToAuthSpa(undefined, undefined, true);
+                    safeRedirectToAuthSpa(undefined, undefined, !!dmTokenInLocalStorage); // with no dm token at all in storage, don't force logout
                     return;
                 }
                 // Validate JWT token user_id
@@ -16083,7 +16092,37 @@ createApi({
     tagTypes: ['reports', 'reportDetail'],
     endpoints: (builder) => ({
         getReports: builder.query({
-            ...buildEndpointFromDmService(iblaiApi.ReportsService.reportsPlatformsRetrieve),
+            async queryFn({ key, mentor_id }) {
+                var _a, _b;
+                try {
+                    const baseUrl = getServiceUrl(SERVICES.DM);
+                    const authHeaders = await getHeaders(SERVICES.DM);
+                    const url = new URL(`/dm/api/reports/platforms/${encodeURIComponent(key)}/`, baseUrl);
+                    if (mentor_id) {
+                        url.searchParams.set('mentor_id', mentor_id);
+                    }
+                    const response = await fetch(url.toString(), {
+                        method: 'GET',
+                        headers: {
+                            'Content-Type': 'application/json',
+                            ...(authHeaders !== null && authHeaders !== void 0 ? authHeaders : {}),
+                        },
+                    });
+                    const data = (await response.json());
+                    if (!response.ok) {
+                        return { error: { status: response.status, data } };
+                    }
+                    return { data };
+                }
+                catch (err) {
+                    return {
+                        error: {
+                            status: (_a = err === null || err === void 0 ? void 0 : err.status) !== null && _a !== void 0 ? _a : 500,
+                            data: (_b = err === null || err === void 0 ? void 0 : err.message) !== null && _b !== void 0 ? _b : 'Unknown error',
+                        },
+                    };
+                }
+            },
             providesTags: ['reports'],
         }),
         getReportDetail: builder.query({