@dashadmin/dash-axios-hook 1.3.73 → 1.3.74-srcfree.1

package/dist/hooks/processAxiosErrorFunction.d.ts

@@ -0,0 +1,4 @@
+import { AxiosError } from 'axios';
+import { IDashAutoAdminBackendError, IDashAutoAdminDefaultBackendStructure } from '../interfaces/IDashAutoAdminBackendError';
+declare const processAxiosError: (error: AxiosError<IDashAutoAdminDefaultBackendStructure>, resource?: string, method?: string) => IDashAutoAdminBackendError;
+export default processAxiosError;

package/dist/hooks/useAxios.d.ts

@@ -0,0 +1,6 @@
+import { AxiosRequestConfig } from 'axios';
+export declare const initAxios: (options: Partial<AxiosRequestConfig<any>>, CSRFAuth?: boolean) => import("axios").AxiosInstance;
+declare const useAxios: (options?: Partial<AxiosRequestConfig<any>>) => import("axios").AxiosInstance;
+export declare const createAxiosInstance: (options?: Partial<AxiosRequestConfig<any>>) => import("axios").AxiosInstance;
+export default useAxios;
+export { useAxios };

package/dist/hooks/useAxiosWithStore.d.ts

@@ -0,0 +1,14 @@
+export interface IUseAxiosGetWithStore {
+    method?: string;
+    url: string;
+    payload?: any;
+    storeKey: string;
+    dataPath?: string;
+}
+declare const useAxiosGetWithStore: (options: IUseAxiosGetWithStore) => {
+    request: (ops: IUseAxiosGetWithStore) => Promise<void>;
+    results: any;
+    error: any;
+    loaded: boolean;
+};
+export default useAxiosGetWithStore;

package/{src/index.tsx → dist/index.d.ts}

@@ -1,4 +1,4 @@
 export { default as useAxios, createAxiosInstance } from "./hooks/useAxios";
 export { default as useAxiosGetWithStore } from "./hooks/useAxiosWithStore";
-export type { IDashAutoAdminBackendError,IDashAutoAdminDefaultBackendStructure } from "./interfaces/IDashAutoAdminBackendError";
+export type { IDashAutoAdminBackendError, IDashAutoAdminDefaultBackendStructure } from "./interfaces/IDashAutoAdminBackendError";
 export { default as processAxiosError } from "./hooks/processAxiosErrorFunction";

package/dist/interfaces/IDashAutoAdminBackendError.d.ts

@@ -0,0 +1,18 @@
+import { AxiosError } from 'axios';
+export interface IDashAutoAdminBackendError {
+    status: number;
+    body: Body;
+    resource: string;
+    originalError: AxiosError<IDashAutoAdminDefaultBackendStructure>;
+    message?: string;
+}
+export interface IDashAutoAdminDefaultBackendStructure {
+    message: string;
+    errors: {
+        [key: string]: string[];
+    };
+}
+interface Body {
+    [x: string]: any;
+}
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dashadmin/dash-axios-hook",
-	"version": "1.3.73",
+	"version": "1.3.74-srcfree.1",
 	"license": "MIT",
 	"main": "dist/index.js",
 	"devDependencies": {
@@ -26,11 +26,11 @@
 	},
 	"dependencies": {
 		"@mui/material": "^9.3.0",
-		"@dashadmin/dash-constants": "1.3.73",
-		"@dashadmin/dash-utils": "1.3.73"
+		"@dashadmin/dash-constants": "1.3.74-srcfree.1",
+		"@dashadmin/dash-utils": "1.3.74-srcfree.1"
 	},
 	"module": "dist/index.js",
-	"types": "./src/index.tsx",
+	"types": "./dist/index.d.ts",
 	"exports": {
 		".": "./dist/index.js",
 		"./*": "./dist/*.js",
@@ -41,22 +41,25 @@
 		"registry": "https://registry.npmjs.org"
 	},
 	"scripts": {
-		"build": "tsup"
+		"build": "tsup && pnpm run build:types",
+		"build:types": "tsc -p tsconfig.json --declaration --emitDeclarationOnly --noEmit false --outDir dist --rootDir src --skipLibCheck || true"
 	},
 	"type": "module",
 	"files": [
-		"dist",
-		"src"
+		"dist"
 	],
 	"typesVersions": {
 		"*": {
+			"dist/*": [
+				"dist/*"
+			],
 			"src/*": [
-				"src/*",
-				"src/*/index"
+				"dist/*",
+				"dist/*/index"
 			],
 			"*": [
-				"src/*",
-				"src/*/index"
+				"dist/*",
+				"dist/*/index"
 			]
 		}
 	}

package/src/hooks/processAxiosErrorFunction.tsx

@@ -1,73 +0,0 @@
-import { AxiosError } from 'axios';
-import { IDashAutoAdminBackendError,IDashAutoAdminDefaultBackendStructure } from '../interfaces/IDashAutoAdminBackendError';
-
-
-const processAxiosError = (error:AxiosError<IDashAutoAdminDefaultBackendStructure>,resource?:string,method:string='update') => {
-
-  if(!resource) resource = ""
-  // Map method to Spanish action words
-  const methodMap = {
-      'update': 'Actualizar',
-      'create': 'Crear',
-      'delete': 'Eliminar'
-  };
-
-  // Extract error details
-  const errorMessage = error.response?.data?.message ||  error.message ||  'Error al '+ (methodMap[method] || method) +' el recurso';
-  // Get HTTP status or fallback to 500
-  const status = error.response?.status || 500;
-
-  // If validation errors exist, format them for React Admin
-  let body = {
-      errors: {}
-  };
-
-  if (error.response?.data?.errors) {
-
-   
-      // Format Laravel validation errors for React Admin
-      const validationErrors = error.response.data.errors;
-      Object.keys(validationErrors).forEach(field => {
-          if (typeof validationErrors[field] === 'string') {
-              body.errors[field] = validationErrors[field];
-          } else if (Array.isArray(validationErrors[field])) {
-              body.errors[field] = validationErrors[field].join(', ');
-          } else if (typeof validationErrors[field] === 'object') {
-              body.errors[field] = validationErrors[field];
-          }
-      });
-
-      // Add global validation error if exists
-      if (errorMessage) {
-          body.errors["root"] = {
-              serverError: errorMessage
-          };
-      }
-  }
-
-  // Create an enhanced error object that React Admin can understand
-  const enhancedError = {
-      message: errorMessage,
-      status: status,
-      body: body,
-      resource: resource,
-      originalError: error,
-      name: 'Error'
-  } as IDashAutoAdminBackendError;
-
-    // Log for debugging
-    console.error('Update error:', {
-      resource,
-      errorMessage,
-      status,
-      validationErrors: body.errors,
-      originalError: error
-  });
-
-
-
-  return enhancedError;
-
-}
-
-export default processAxiosError;

package/src/hooks/useAxios.tsx

@@ -1,260 +0,0 @@
-import axios, { Axios, AxiosError, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
-
-import {DASHAdminSystemConstants} from  'dash-constants'
-
-import { dashStorage } from 'dash-utils';
-
-import processAxiosError from './processAxiosErrorFunction';
-import { IDashAutoAdminDefaultBackendStructure } from '../interfaces/IDashAutoAdminBackendError';
-
-//import { getCookie } from '../utils/cookies';
-
-// Flag to prevent multiple simultaneous refresh requests
-let isRefreshing = false;
-// Queue of requests waiting for token refresh
-let failedQueue: Array<{
-	resolve: (value?: unknown) => void;
-	reject: (reason?: any) => void;
-}> = [];
-
-const processQueue = (error: any, token: string | null = null) => {
-	failedQueue.forEach(prom => {
-		if (error) {
-			prom.reject(error);
-		} else {
-			prom.resolve(token);
-		}
-	});
-	failedQueue = [];
-};
-
-// Function to refresh the token
-const refreshAccessToken = async (axiosInstance: any): Promise<string | null> => {
-	const refreshToken = dashStorage.getItem('refreshToken');
-	
-	if (!refreshToken) {
-		console.log('[Axios] No refresh token available');
-		return null;
-	}
-
-	try {
-		console.log('[Axios] Attempting to refresh access token...');
-		
-		// Create a new axios instance without interceptors to avoid infinite loops
-		const refreshAxios = axios.create({
-			baseURL: DASHAdminSystemConstants.system.ADMIN_API_URL,
-			headers: {
-				'Content-Type': 'application/json',
-				'Accept': 'application/json',
-			},
-		});
-
-		const response = await refreshAxios.post('/auth/refresh', {
-			refresh_token: refreshToken,
-		});
-
-		if (response.status === 200 && response.data.token) {
-			const newToken = response.data.token;
-			const newRefreshToken = response.data.refresh_token;
-			
-			// Store new tokens
-			dashStorage.setItem('token', newToken);
-			if (newRefreshToken) {
-				dashStorage.setItem('refreshToken', newRefreshToken);
-			}
-			
-			console.log('[Axios] Token refresh successful');
-			return newToken;
-		}
-
-		return null;
-	} catch (error) {
-		console.error('[Axios] Token refresh failed:', error);
-		return null;
-	}
-};
-
-// Function to handle logout
-const handleLogout = () => {
-	console.log('[Axios] Logging out due to authentication failure');
-	debugger;
-	// Clear all auth data
-	//dashStorage.removeItem('token');
-	//dashStorage.removeItem('refreshToken');
-	//dashStorage.removeItem('authenticated');
-	//dashStorage.removeItem('user');
-	//dashStorage.removeItem('roles');
-    dashStorage.clear();
-	localStorage.clear();
-	// Dispatch logout event for the app to handle
-	window.dispatchEvent(new CustomEvent('auth:logout', { 
-		detail: { reason: 'token_refresh_failed' } 
-	}));
-};
-
-// Capacitor's CapacitorHttp plugin, when enabled (capacitor.config.ts's
-// plugins.CapacitorHttp.enabled), patches the WebView's global
-// XMLHttpRequest to route through its native HTTP bridge. That patched XHR
-// doesn't reach the OPENED state synchronously the way axios's default 'xhr'
-// adapter assumes - it calls setRequestHeader() immediately after open(),
-// which throws "Failed to execute 'setRequestHeader' on 'XMLHttpRequest':
-// The object's state must be OPENED" under the patch. Confirmed on an
-// Android build (kitchntabs-app, Capacitor 7, CapacitorHttp enabled) -
-// broke every axios call, login included, not just one endpoint.
-//
-// axios's 'fetch' adapter (1.7+) sidesteps this: Capacitor's fetch patch is
-// documented as more spec-compliant than its XHR one. Only selected when
-// actually running as a native Capacitor app - `window.Capacitor` is
-// injected into the WebView's global scope at runtime by Capacitor itself,
-// so this needs no @capacitor/core import (this package is consumed by
-// plain web apps too, which don't have that dependency at all). Web/Electron
-// builds keep axios's own default adapter selection, unaffected.
-const isCapacitorNative =
-  typeof window !== 'undefined' &&
-  !!(window as any).Capacitor?.isNativePlatform?.();
-
-export const initAxios = (
-	options: Partial<AxiosRequestConfig<any>>,
-	CSRFAuth?: boolean,
-) => {
-  const browserLanguage = typeof navigator !== 'undefined' && navigator.language ? navigator.language.split('-')[0] : 'es';
-  const _options = {
-    headers: {
-      'Content-Type': 'application/json',
-      //'Accept-Language': browserLanguage || 'es', // fallback to 'es' if not available
-      'Accept-Language':'es',
-      Accept: 'application/json',
-    },
-    ...(isCapacitorNative && { adapter: 'fetch' as const }),
-    ...options,
-  };
-
-	const instance = axios.create(_options);
-
-	if (CSRFAuth) {
-		instance.defaults.withCredentials = true;
-		instance.get('/csrf-cookie').then((response) => {
-			console.log('sanctum', response);
-		});
-	}
-
-	instance.interceptors.request.use(function (config) {
-		const token = dashStorage.getItem('token');
-		//console.log("axios Hook", axios, token);
-		if (token !== undefined && token !== 'undefined') {
-			config.headers.Authorization = 'Bearer ' + token;
-		}
-
-		// Inject X-Tenant-Id header when tenant impersonation is active
-		const activeTenantId = dashStorage.getItem('active_tenant_id');
-		if (activeTenantId) {
-			config.headers['X-Tenant-Id'] = activeTenantId;
-		}
-
-		return config;
-	});
-
-	instance.interceptors.response.use(
-		(response) => {
-			//console.log("Axios Success", response);
-			return response;
-		},
-		async (error: AxiosError<IDashAutoAdminDefaultBackendStructure, any>) => {
-			const originalRequest = error.config as InternalAxiosRequestConfig & { _retry?: boolean };
-
-			// Handle 401 Unauthorized errors
-			if (error.response?.status === 401 && !originalRequest._retry) {
-				// Skip refresh for auth endpoints to prevent infinite loops
-				const isAuthEndpoint = originalRequest.url?.includes('/login') || 
-					originalRequest.url?.includes('/auth/refresh') ||
-					originalRequest.url?.includes('/logout');
-
-				if (isAuthEndpoint) {
-					return Promise.reject(error);
-				}
-
-				if (isRefreshing) {
-					// If already refreshing, queue this request
-					return new Promise((resolve, reject) => {
-						failedQueue.push({ resolve, reject });
-					}).then(token => {
-						if (token && originalRequest.headers) {
-							originalRequest.headers.Authorization = `Bearer ${token}`;
-						}
-						return instance(originalRequest);
-					}).catch(err => {
-						return Promise.reject(err);
-					});
-				}
-
-				originalRequest._retry = true;
-				isRefreshing = true;
-
-				try {
-					const newToken = await refreshAccessToken(instance);
-					
-					if (newToken) {
-						// Update the authorization header
-						if (originalRequest.headers) {
-							originalRequest.headers.Authorization = `Bearer ${newToken}`;
-						}
-						
-						// Process queued requests
-						processQueue(null, newToken);
-						
-						// Retry the original request
-						return instance(originalRequest);
-					} else {
-						// Refresh failed - logout user
-						processQueue(error, null);
-						handleLogout();
-						return Promise.reject(error);
-					}
-				} catch (refreshError) {
-					processQueue(refreshError, null);
-					handleLogout();
-					return Promise.reject(refreshError);
-				} finally {
-					isRefreshing = false;
-				}
-			}
-
-			// Dispatch global error event for non-401 errors
-			window.dispatchEvent(
-				new MessageEvent('DASHGlobalError', {
-					data: processAxiosError(error, null, "list"),
-					origin: "AxiosInterceptor"
-				}),
-			);
-
-			return Promise.reject(error);
-		},
-	);
-
-	return instance;
-};
-
-// Hook version (for use in React components)
-const useAxios = (options?: Partial<AxiosRequestConfig<any>>) => {
-	const a = initAxios({
-		baseURL: DASHAdminSystemConstants.system.ADMIN_API_URL,
-		...(options && {...options})
-	});
-	return a;
-};
-
-// Non-hook version (for use in classes and regular functions)
-export const createAxiosInstance = (options?: Partial<AxiosRequestConfig<any>>) => {
-	console.log('Creating Axios instance with options:', options);
-	console.log('Base URL:', DASHAdminSystemConstants.system.ADMIN_API_URL);
-	return initAxios({
-		baseURL: DASHAdminSystemConstants.system.ADMIN_API_URL,
-		...(options && {...options})
-	});
-};
-
-// Default export is the hook
-export default useAxios;
-
-// Named export for non-hook usage
-export { useAxios };

package/src/hooks/useAxiosWithStore.tsx

@@ -1,66 +0,0 @@
-
-import { useEffect, useState } from 'react';
-//import queryString from 'query-string';
-import { useStore } from 'react-admin';
-import useAxios from './useAxios';
-
-export interface IUseAxiosGetWithStore {
-	method?: string;
-	url: string;
-	payload?: any;
-	storeKey: string;
-	dataPath?: string;
-}
-
-const resolveObjectPath = (object, path, defaultValue) =>
-	path.split('.').reduce((o, p) => (o ? o[p] : defaultValue), object);
-
-const useAxiosGetWithStore = (options: IUseAxiosGetWithStore) => {
-	const {
-		/*method = 'GET',
-		url,
-		payload = null,*/
-		storeKey,
-		dataPath = 'data',
-	} = options;
-	const axios = useAxios();
-
-	const [error, setError] = useState(null);
-	const [loaded, setLoaded] = useState(false);
-
-	const [results, setResults] = useStore(storeKey, null);
-
-	const request = async (ops: IUseAxiosGetWithStore) => {
-		//const payload = queryString.stringify(ops.payload, { arrayFormat: 'bracket' });
-
-		try {
-			//console.log('useAxiosGetWithStore performing query:', ops);
-			const response = await axios({
-				method: ops.method,
-				url: `${ops.url}${ops.payload ? '?' + ops.payload : ''}`,
-			});
-
-			if (response.status >= 200 || response.status < 300) {
-				setResults(resolveObjectPath(response, dataPath, null));
-			}
-		} catch (e:any) {
-			setError(e);
-		} finally {
-			setLoaded(true);
-		}
-	};
-
-	useEffect(() => {
-		//console.log('useAxiosGetWithStore results:', results);
-		if (!results) {
-			//console.log('Therefore, performing request');
-			request(options);
-		} else {
-			//console.log('returning stored results');
-		}
-	}, []);
-
-	return { request, results, error, loaded };
-};
-
-export default useAxiosGetWithStore;

package/src/interfaces/IDashAutoAdminBackendError.ts

@@ -1,21 +0,0 @@
-import  { AxiosError } from 'axios';
-
-export interface IDashAutoAdminBackendError {
-  status:        number;
-  body:          Body;
-  resource:      string;
-  originalError: AxiosError<IDashAutoAdminDefaultBackendStructure>;
-  message?:       string;
-}
-
-export interface IDashAutoAdminDefaultBackendStructure {
-  message: string;
-  errors:  {
-    [key: string]: string[];
-  };
-}
-
-interface Body {
-  [x:string]: any
-}
-