flysoft-react-ui 1.0.4 → 1.0.6

package/dist/contexts/AuthContext.d.ts

@@ -1,5 +1,5 @@
 export interface AuthContextUserInterface {
-    id?: number;
+    id?: number | string;
     name?: string;
     aditionalData?: any;
     token?: AuthTokenInterface;
@@ -9,6 +9,7 @@ export interface AuthTokenInterface {
     expires?: string;
     tokenType?: string;
     refreshToken?: string;
+    aditionalData?: any;
 }
 export interface AuthContextType {
     user: AuthContextUserInterface | null;
@@ -21,8 +22,10 @@ export declare const AuthContext: import("react").Context<AuthContextType>;
 interface AuthProviderProps {
     children: React.ReactNode;
     getToken: (username: string, password: string) => Promise<AuthTokenInterface>;
-    getUserData: (token: string) => Promise<AuthContextUserInterface>;
-    removeToken?: (token: string) => Promise<void>;
+    getUserData: (auth: AuthTokenInterface) => Promise<AuthContextUserInterface>;
+    refreshToken?: (auth: AuthTokenInterface) => Promise<AuthTokenInterface>;
+    removeToken?: (auth: AuthTokenInterface) => Promise<void>;
+    showLog?: boolean;
 }
 export declare const AuthProvider: React.FC<AuthProviderProps>;
 export {};

package/dist/contexts/AuthContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AuthContext.d.ts","sourceRoot":"","sources":["../../src/contexts/AuthContext.tsx"],"names":[],"mappings":"AAEA,MAAM,WAAW,wBAAwB;IACvC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,KAAK,CAAC,EAAE,kBAAkB,CAAC;CAC5B;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,wBAAwB,GAAG,IAAI,CAAC;IACtC,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,WAAW,0CAMtB,CAAC;AAiEH,UAAU,iBAAiB;IACzB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC9E,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAClE,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAChD;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAmHpD,CAAC"}
+{"version":3,"file":"AuthContext.d.ts","sourceRoot":"","sources":["../../src/contexts/AuthContext.tsx"],"names":[],"mappings":"AAEA,MAAM,WAAW,wBAAwB;IACvC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,KAAK,CAAC,EAAE,kBAAkB,CAAC;CAC5B;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,GAAG,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,wBAAwB,GAAG,IAAI,CAAC;IACtC,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,WAAW,0CAMtB,CAAC;AAkEH,UAAU,iBAAiB;IACzB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC9E,WAAW,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC7E,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACzE,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA8LpD,CAAC"}

package/dist/contexts/AuthContext.js

@@ -60,40 +60,62 @@ const isUserTokenValid = (user) => {
     }
     return !isTokenExpired(user.token.expires);
 };
-export const AuthProvider = ({ children, getToken, getUserData, removeToken, }) => {
+export const AuthProvider = ({ children, getToken, getUserData, refreshToken, removeToken, showLog = false, }) => {
     const [user, setUser] = useState(null);
     const [isAuthenticated, setIsAuthenticated] = useState(false);
-    const [isLoading, setIsLoading] = useState(false);
+    const [isLoading, setIsLoading] = useState(true);
+    const log = (action, data, isError = false) => {
+        if (isError) {
+            console.error(`[AuthContext] ${action}: `, data);
+        }
+        else if (showLog) {
+            console.log(`[AuthContext] ${action}: `, data);
+        }
+    };
     useEffect(() => {
         const auth = initAuth();
+        log("Init Auth - Retrieved from storage", auth);
         // Verificar que el usuario tenga un token válido y vigente
-        if (isUserTokenValid(auth)) {
+        const isValid = isUserTokenValid(auth);
+        log("Init Auth - Token valid check", { isValid, auth });
+        if (isValid) {
             setUser(auth);
             setIsAuthenticated(true);
+            log("Init Auth - User authenticated restored", auth);
         }
         else {
             // Si el token está expirado o es inválido, limpiar el almacenamiento
             if (auth.id && isTokenExpired(auth.token?.expires)) {
+                log("Init Auth - Token expired or invalid, cleaning storage", auth);
                 removeStoredAuth();
             }
+            else {
+                log("Init Auth - No valid session found", auth);
+            }
             setUser(null);
             setIsAuthenticated(false);
         }
+        setIsLoading(false);
     }, []);
     const login = async (username, password) => {
         setIsLoading(true);
+        log("Login - Start", { username });
         try {
             const token = await getToken(username, password);
+            log("Login - Token received", token);
             if (token.accessToken) {
-                // Verificar que el token recibido no esté expirado antes de continuar
-                if (isTokenExpired(token.expires)) {
-                    console.warn("El token recibido ya está expirado");
+                // Verificar que el token recibido no esté expirado antes de continuar      
+                const expired = isTokenExpired(token.expires);
+                log("Login - Token expiration check", { expires: token.expires, expired });
+                if (expired) {
+                    log("Login - Token expired upon receipt", token, true);
                     setUser(null);
                     setIsAuthenticated(false);
                     setIsLoading(false);
                     return;
                 }
-                const { id, name, aditionalData } = await getUserData(token.accessToken);
+                const { id, name, aditionalData } = await getUserData(token);
+                log("Login - User data received", { id, name, aditionalData });
                 const userData = {
                     id,
                     name,
@@ -101,24 +123,30 @@ export const AuthProvider = ({ children, getToken, getUserData, removeToken, })
                     token,
                 };
                 // Validar nuevamente antes de establecer el estado
-                if (isUserTokenValid(userData)) {
+                const isValid = isUserTokenValid(userData);
+                log("Login - Final validation", { isValid, userData });
+                if (isValid) {
                     setUser(userData);
                     storeAuth(userData);
                     setIsAuthenticated(true);
+                    log("Login - Success", userData);
                 }
                 else {
                     setUser(null);
                     setIsAuthenticated(false);
+                    log("Login - Validation failed", userData, true);
                 }
             }
             else {
                 setUser(null);
                 setIsAuthenticated(false);
+                log("Login - No access token in response", token, true);
             }
         }
         catch (error) {
             setUser(null);
             setIsAuthenticated(false);
+            log("Login - Error", error, true);
             throw error;
         }
         finally {
@@ -126,23 +154,63 @@ export const AuthProvider = ({ children, getToken, getUserData, removeToken, })
         }
     };
     const logout = async () => {
+        log("Logout - Start", { user });
         removeStoredAuth();
         setUser(null);
-        if (removeToken && user?.token?.accessToken) {
-            await removeToken(user.token.accessToken);
+        if (removeToken && user?.token) {
+            try {
+                await removeToken(user.token);
+                log("Logout - Token removed from server");
+            }
+            catch (e) {
+                log("Logout - Error removing token", e, true);
+            }
         }
         setIsAuthenticated(false);
+        log("Logout - Completed");
     };
     // Validar el token periódicamente o cuando cambia el usuario
     // Esto asegura que si el token expira durante la sesión, se actualice el estado
     useEffect(() => {
         if (user && user.token?.expires) {
-            const checkTokenExpiration = () => {
-                if (isTokenExpired(user.token?.expires)) {
-                    // Token expirado, cerrar sesión
-                    removeStoredAuth();
-                    setUser(null);
-                    setIsAuthenticated(false);
+            const checkTokenExpiration = async () => {
+                const expired = isTokenExpired(user.token?.expires);
+                log("Token Check - Checking expiration", { expires: user.token?.expires, expired });
+                if (expired) {
+                    let refreshed = false;
+                    // Si existe la función de refresco, intentar renovar el token antes de cerrar sesión
+                    if (refreshToken && user.token) {
+                        try {
+                            log("Token Check - Attempting refresh", { oldToken: user.token });
+                            const newToken = await refreshToken(user.token);
+                            log("Token Check - Refresh response", newToken);
+                            // Verificar que el nuevo token sea válido y no esté expirado
+                            if (newToken && newToken.accessToken && !isTokenExpired(newToken.expires)) {
+                                const newUser = { ...user, token: newToken };
+                                setUser(newUser);
+                                storeAuth(newUser);
+                                refreshed = true;
+                                log("Token Check - Refresh success", newUser);
+                            }
+                            else {
+                                log("Token Check - Refreshed token invalid or expired", newToken, true);
+                            }
+                        }
+                        catch (error) {
+                            console.error("Error al intentar refrescar el token:", error);
+                            log("Token Check - Refresh error", error, true);
+                        }
+                    }
+                    else {
+                        log("Token Check - No refresh logic available or token missing", { refreshToken: !!refreshToken, token: !!user.token });
+                    }
+                    if (!refreshed) {
+                        // Token expirado y no se pudo renovar, cerrar sesión
+                        log("Token Check - Session expired, logging out");
+                        removeStoredAuth();
+                        setUser(null);
+                        setIsAuthenticated(false);
+                    }
                 }
             };
             // Verificar inmediatamente
@@ -151,6 +219,6 @@ export const AuthProvider = ({ children, getToken, getUserData, removeToken, })
             const interval = setInterval(checkTokenExpiration, 60000);
             return () => clearInterval(interval);
         }
-    }, [user]);
+    }, [user, refreshToken]);
     return (_jsx(AuthContext.Provider, { value: { user, isAuthenticated, isLoading, login, logout }, children: children }));
 };

package/dist/docs/AuthDocs.tsx/AuthDocs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AuthDocs.d.ts","sourceRoot":"","sources":["../../../src/docs/AuthDocs.tsx/AuthDocs.tsx"],"names":[],"mappings":"AAQA;;;;;;;;;;GAUG;AACH,eAAO,MAAM,QAAQ,+CAUpB,CAAC"}
+{"version":3,"file":"AuthDocs.d.ts","sourceRoot":"","sources":["../../../src/docs/AuthDocs.tsx/AuthDocs.tsx"],"names":[],"mappings":"AAQA;;;;;;;;;;GAUG;AAGH,eAAO,MAAM,QAAQ,+CAWpB,CAAC"}

package/dist/docs/AuthDocs.tsx/AuthDocs.js

@@ -14,5 +14,5 @@ import { mockGetToken, mockGetUserData, mockRemoveToken, } from "./mockAuthServi
  * - removeToken: Revoca/invalida un token (opcional)
  */
 export const AuthDocs = () => {
-    return (_jsx(AuthProvider, { getToken: mockGetToken, getUserData: mockGetUserData, removeToken: mockRemoveToken, children: _jsx(AuthDocsContent, {}) }));
+    return (_jsx(AuthProvider, { getToken: mockGetToken, getUserData: mockGetUserData, removeToken: mockRemoveToken, showLog: true, children: _jsx(AuthDocsContent, {}) }));
 };

package/dist/docs/AuthDocs.tsx/mockAuthService.d.ts

@@ -13,12 +13,12 @@ export declare const mockGetToken: (username: string, password: string) => Promi
  * @param token - Token de acceso
  * @returns Promise con los datos del usuario
  */
-export declare const mockGetUserData: (token: string) => Promise<AuthContextUserInterface>;
+export declare const mockGetUserData: (auth: AuthTokenInterface) => Promise<AuthContextUserInterface>;
 /**
  * Mock de removeToken - Revoca/invalida un token
  *
  * @param token - Token a revocar
  * @returns Promise que se resuelve cuando el token es revocado
  */
-export declare const mockRemoveToken: (token: string) => Promise<void>;
+export declare const mockRemoveToken: (auth: AuthTokenInterface) => Promise<void>;
 //# sourceMappingURL=mockAuthService.d.ts.map

package/dist/docs/AuthDocs.tsx/mockAuthService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mockAuthService.d.ts","sourceRoot":"","sources":["../../../src/docs/AuthDocs.tsx/mockAuthService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,wBAAwB,EACzB,MAAM,4BAA4B,CAAC;AAgBpC;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GACvB,UAAU,MAAM,EAChB,UAAU,MAAM,KACf,OAAO,CAAC,kBAAkB,CAqB5B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,OAAO,MAAM,KACZ,OAAO,CAAC,wBAAwB,CAoBlC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAU,OAAO,MAAM,KAAG,OAAO,CAAC,IAAI,CAWjE,CAAC"}
+{"version":3,"file":"mockAuthService.d.ts","sourceRoot":"","sources":["../../../src/docs/AuthDocs.tsx/mockAuthService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,wBAAwB,EACzB,MAAM,4BAA4B,CAAC;AAgBpC;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GACvB,UAAU,MAAM,EAChB,UAAU,MAAM,KACf,OAAO,CAAC,kBAAkB,CAqB5B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM,kBAAkB,KACvB,OAAO,CAAC,wBAAwB,CAoBlC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAU,MAAM,kBAAkB,KAAG,OAAO,CAAC,IAAI,CAW5E,CAAC"}

package/dist/docs/AuthDocs.tsx/mockAuthService.js

@@ -42,9 +42,9 @@ export const mockGetToken = async (username, password) => {
  * @param token - Token de acceso
  * @returns Promise con los datos del usuario
  */
-export const mockGetUserData = async (token) => {
+export const mockGetUserData = async (auth) => {
     await simulateNetworkDelay();
-    if (!token) {
+    if (!auth.accessToken) {
         throw new Error("Token es requerido");
     }
     // Simular datos de usuario
@@ -66,13 +66,13 @@ export const mockGetUserData = async (token) => {
  * @param token - Token a revocar
  * @returns Promise que se resuelve cuando el token es revocado
  */
-export const mockRemoveToken = async (token) => {
+export const mockRemoveToken = async (auth) => {
     await simulateNetworkDelay();
-    if (!token) {
+    if (!auth.accessToken) {
         throw new Error("Token es requerido");
     }
     // Simular revocación del token
     // En una implementación real, aquí se haría una llamada al servidor
     // para invalidar el token
-    console.log(`Token revocado: ${token.substring(0, 20)}...`);
+    console.log(`Token revocado: ${auth.accessToken.substring(0, 20)}...`);
 };