datastake-daf 0.6.497 → 0.6.499

package/dist/services/index.js

@@ -6540,6 +6540,39 @@ class ErrorService {
 // In datastake-daf - src/services/BaseService.js
 class BaseService extends BaseHTTPService {
   constructor() {
+    getConfig();
+    const errorHandler = createErrorHandler({
+      getStorageManager: () => StorageManager,
+      handleError: ({
+        status,
+        statusText,
+        data
+      }) => {
+        console.error('[BaseService] Error:', {
+          status,
+          statusText,
+          data
+        });
+        ErrorService.handle({
+          status,
+          statusText,
+          data
+        });
+      },
+      onUnauthorized: () => {
+        console.warn('[BaseService] 401 Unauthorized - Token cleared, redirecting to /');
+        console.trace('[BaseService] Unauthorized call stack:');
+        StorageManager.clearOne('token');
+        if (typeof window !== 'undefined') {
+          window.location.href = '/';
+        }
+      },
+      tokenStorageKey: 'token',
+      unauthorizedRedirect: '/',
+      checkTokenValidity: true,
+      handleNetworkError: true
+    });
+
     // Call super with lazy getters that fetch config at runtime
     super({
       getToken: () => getToken(),
@@ -6556,55 +6589,20 @@ class BaseService extends BaseHTTPService {
         if (options?.isStore) return config.storeUrl;
         return config.mainApiUrl;
       },
-      onError: error => {
-        // Create error handler lazily
-        const errorHandler = createErrorHandler({
-          getStorageManager: () => StorageManager,
-          handleError: ({
-            status,
-            statusText,
-            data
-          }) => {
-            ErrorService.handle({
-              status,
-              statusText,
-              data
-            });
-          },
-          tokenStorageKey: 'token',
-          unauthorizedRedirect: '/',
-          checkTokenValidity: true,
-          handleNetworkError: true
-        });
-        return errorHandler(error);
-      },
+      onError: errorHandler,
       timeout: 300000
     });
   }
   apiGet(options) {
-    const token = getToken();
     const config = getConfig();
-    if (token !== this.token || !token) {
-      this.reloadAxios();
+
+    // Add custom baseURL handling for isStore
+    if (options.isStore) {
+      options.baseURL = config.storeUrl;
     }
-    const {
-      url,
-      ...restConfig
-    } = options;
-    const baseURL = options.isStore ? config.storeUrl : config.mainApiUrl;
-    return this.formatResponse(this.api.get(url, {
-      ...restConfig,
-      baseURL,
-      headers: options.isStore ? {
-        Authorization: `Bearer ${getToken()}`,
-        ...(restConfig?.headers || {})
-      } : {
-        Authorization: `Bearer ${getToken()}`,
-        Language: config.language || StorageManager.get('datastakeLng') || 'en',
-        Application: config.application,
-        ...(restConfig?.headers || {})
-      }
-    }).catch(err => this.onError(err)));
+
+    // Call parent's apiGet
+    return super.apiGet(options);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.497",
+	"version": "0.6.499",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/services/BaseService.js

@@ -8,6 +8,28 @@ import { ErrorService } from './ErrorService.js';
 
 export class BaseService extends BaseHTTPService {
   constructor() {
+    const config = getConfig();
+    
+    const errorHandler = createErrorHandler({
+      getStorageManager: () => StorageManager,
+      handleError: ({ status, statusText, data }) => {
+        console.error('[BaseService] Error:', { status, statusText, data });
+        ErrorService.handle({ status, statusText, data });
+      },
+      onUnauthorized: () => {
+        console.warn('[BaseService] 401 Unauthorized - Token cleared, redirecting to /');
+        console.trace('[BaseService] Unauthorized call stack:');
+        StorageManager.clearOne('token');
+        if (typeof window !== 'undefined') {
+          window.location.href = '/';
+        }
+      },
+      tokenStorageKey: 'token',
+      unauthorizedRedirect: '/',
+      checkTokenValidity: true,
+      handleNetworkError: true,
+    });
+
     // Call super with lazy getters that fetch config at runtime
     super({
       getToken: () => getToken(),
@@ -24,50 +46,20 @@ export class BaseService extends BaseHTTPService {
         if (options?.isStore) return config.storeUrl;
         return config.mainApiUrl;
       },
-      onError: (error) => {
-        // Create error handler lazily
-        const errorHandler = createErrorHandler({
-          getStorageManager: () => StorageManager,
-          handleError: ({ status, statusText, data }) => {
-            ErrorService.handle({ status, statusText, data });
-          },
-          tokenStorageKey: 'token',
-          unauthorizedRedirect: '/',
-          checkTokenValidity: true,
-          handleNetworkError: true,
-        });
-        return errorHandler(error);
-      },
+      onError: errorHandler,
       timeout: 300000,
     });
   }
 
   apiGet(options) {
-    const token = getToken();
     const config = getConfig();
     
-    if (token !== this.token || !token) {
-      this.reloadAxios();
+    // Add custom baseURL handling for isStore
+    if (options.isStore) {
+      options.baseURL = config.storeUrl;
     }
     
-    const { url, ...restConfig } = options;
-    const baseURL = options.isStore ? config.storeUrl : config.mainApiUrl;
-
-    return this.formatResponse(
-      this.api.get(url, {
-        ...restConfig,
-        baseURL,
-        headers: options.isStore ? {
-          Authorization: `Bearer ${getToken()}`,
-          ...(restConfig?.headers || {}),
-        } : {
-          Authorization: `Bearer ${getToken()}`,
-          Language: config.language || StorageManager.get('datastakeLng') || 'en',
-          Application: config.application,
-          ...(restConfig?.headers || {}),
-        }
-      })
-      .catch((err) => this.onError(err))
-    );
+    // Call parent's apiGet
+    return super.apiGet(options);
   }
 }