@arex95/vue-core 1.1.26 → 1.1.27

package/dist/composables/auth/useAuth.d.ts

@@ -1,12 +1,12 @@
-import { AuthParams, AuthResponse } from "@/types";
+import { AuthParams, AuthResponse, AuthTokenPaths } from "@/types";
 import { SessionPreference } from "@config/global/sessionConfig";
 /**
  * @typedef {object} AuthHook
  * @property {function(): Promise<number | null>} getTokenExpiry - Retrieves the expiration time of the current token in milliseconds.
  * @property {function(): Promise<void>} cleanCredentials - Clears authentication credentials from storage.
  * @property {(params?: AuthParams) => Promise<void>} logout - Logs out the user, clears credentials, and reloads the page.
- * @property {(params: AuthParams, persistence: SessionPreference) => Promise<AuthResponse>} login - Logs in the user and stores tokens.
- * @property {function(): Promise<AuthResponse>} refresh - Refreshes authentication tokens.
+ * @property {(params: AuthParams, persistence: SessionPreference, tokenPaths?: AuthTokenPaths) => Promise<AuthResponse>} login - Logs in the user and stores tokens.
+ * @property {(tokenPaths?: AuthTokenPaths) => Promise<AuthResponse>} refresh - Refreshes authentication tokens.
  * @property {function(): Promise<boolean>} verifyAuth - Verifies the validity and expiration of the current authentication token.
  * @property {(preference: SessionPreference) => void} setSessionPersistencePreference - Sets the user's preferred storage for authentication data.
  * @property {function(): SessionPreference} getSessionPersistencePreference - Retrieves the user's current preferred storage for authentication data.
@@ -19,6 +19,6 @@ import { SessionPreference } from "@config/global/sessionConfig";
  */
 export declare function useAuth(secretKey?: string): {
     logout: (params?: AuthParams) => Promise<void>;
-    login: (params: AuthParams, persistence: SessionPreference) => Promise<AuthResponse>;
-    refresh: () => Promise<AuthResponse>;
+    login: (params: AuthParams, persistence: SessionPreference, tokenPaths?: AuthTokenPaths) => Promise<AuthResponse>;
+    refresh: (tokenPaths?: AuthTokenPaths) => Promise<AuthResponse>;
 };

package/dist/index.mjs

@@ -3305,8 +3305,8 @@ function useSorter(items, criteriaList, selectedCriteria) {
  * @property {function(): Promise<number | null>} getTokenExpiry - Retrieves the expiration time of the current token in milliseconds.
  * @property {function(): Promise<void>} cleanCredentials - Clears authentication credentials from storage.
  * @property {(params?: AuthParams) => Promise<void>} logout - Logs out the user, clears credentials, and reloads the page.
- * @property {(params: AuthParams, persistence: SessionPreference) => Promise<AuthResponse>} login - Logs in the user and stores tokens.
- * @property {function(): Promise<AuthResponse>} refresh - Refreshes authentication tokens.
+ * @property {(params: AuthParams, persistence: SessionPreference, tokenPaths?: AuthTokenPaths) => Promise<AuthResponse>} login - Logs in the user and stores tokens.
+ * @property {(tokenPaths?: AuthTokenPaths) => Promise<AuthResponse>} refresh - Refreshes authentication tokens.
  * @property {function(): Promise<boolean>} verifyAuth - Verifies the validity and expiration of the current authentication token.
  * @property {(preference: SessionPreference) => void} setSessionPersistencePreference - Sets the user's preferred storage for authentication data.
  * @property {function(): SessionPreference} getSessionPersistencePreference - Retrieves the user's current preferred storage for authentication data.
@@ -3347,26 +3347,33 @@ function useAuth(secretKey = getSecretKey()) {
      *
      * @param {AuthParams} params - The authentication parameters (e.g., username, password).
      * @param {SessionPreference} persistence - The storage preference: 'local' for localStorage, 'session' for sessionStorage.
-     * @returns {Promise<AuthResponse>} The authentication response containing tokens and user information.
-     * @throws {Error} If the login request fails.
+     * @param {AuthTokenPaths} [tokenPaths] - Configuración opcional para las rutas (en notación de punto) donde se encuentran los tokens en la respuesta de la API.
+     * @returns {Promise<AuthResponse>} La respuesta de autenticación que contiene los tokens e información del usuario.
+     * @throws {Error} Si la solicitud de login falla, o si los tokens de acceso/refresco no se encuentran o no son válidos en la respuesta.
      */
-    const login = async (params, persistence) => {
+    const login = async (params, persistence, tokenPaths) => {
         try {
             const { data } = await axiosInstance.post(endpoints.LOGIN, params);
+            const accessTokenPath = tokenPaths?.accessTokenPath || "access_token";
+            const refreshTokenPath = tokenPaths?.refreshTokenPath || "refresh_token";
+            const accessTokenPathArray = accessTokenPath.split(".");
+            const refreshTokenPathArray = refreshTokenPath.split(".");
             if (!data) {
                 throw new Error("LOGIN_ERROR: No data received from login endpoint.");
             }
-            if (!data.access_token) {
-                throw new Error("LOGIN_ERROR: Access token not found in response.");
+            const accessToken = safeGet(data, accessTokenPathArray);
+            const refreshToken = safeGet(data, refreshTokenPathArray);
+            if (!accessToken || typeof accessToken !== "string") {
+                throw new Error(`LOGIN_ERROR: Access token not found or invalid at path '${accessTokenPath}' in response.`);
             }
-            if (!data.refresh_token) {
-                throw new Error("LOGIN_ERROR: Refresh token not found in response.");
+            if (!refreshToken || typeof refreshToken !== "string") {
+                throw new Error(`LOGIN_ERROR: Refresh token not found or invalid at path '${refreshTokenPath}' in response.`);
             }
             configSession({
                 persistencePreference: persistence,
             });
-            await storeAuthToken(data.access_token, secretKey, persistence);
-            await storeAuthRefreshToken(data.refresh_token, secretKey, persistence);
+            await storeAuthToken(accessToken, secretKey, persistence);
+            await storeAuthRefreshToken(refreshToken, secretKey, persistence);
             return data;
         }
         catch (error) {
@@ -3376,20 +3383,40 @@ function useAuth(secretKey = getSecretKey()) {
     };
     /**
      * Refreshes the authentication tokens using the stored refresh token.
+     * This function can also accept optional token paths if the refresh endpoint
+     * returns tokens with a different structure than the default login.
      * If no refresh token is found, it throws an error and initiates a logout.
      *
+     * @param {AuthTokenPaths} [tokenPaths] - Configuración opcional para las rutas (en notación de punto) de los tokens de acceso y refresco en la respuesta del endpoint de refresco.
      * @returns {Promise<AuthResponse>} The new authentication response with refreshed tokens.
      * @throws {Error} If the refresh token is missing or the refresh request fails.
      */
-    const refresh = async () => {
+    const refresh = async (tokenPaths) => {
         try {
-            const refreshToken = await getAuthRefreshToken(secretKey, currentPersistencePreference);
-            if (!refreshToken) {
-                throw new Error("TOKEN_MISSING: No refresh token found");
+            const refreshTokenFromStorage = await getAuthRefreshToken(secretKey, currentPersistencePreference);
+            if (!refreshTokenFromStorage) {
+                throw new Error("TOKEN_MISSING: No refresh token found in storage.");
             }
-            const { data } = await axiosInstance.post(endpoints.REFRESH, { refresh_token: refreshToken });
-            await storeAuthToken(data.access_token, secretKey, currentPersistencePreference);
-            await storeAuthRefreshToken(data.refresh_token, secretKey, currentPersistencePreference);
+            const { data } = await axiosInstance.post(endpoints.REFRESH, { refresh_token: refreshTokenFromStorage });
+            const accessTokenPath = tokenPaths?.accessTokenPath || "access_token";
+            const refreshTokenPath = tokenPaths?.refreshTokenPath || "refresh_token";
+            const accessTokenPathArray = accessTokenPath.split(".");
+            const refreshTokenPathArray = refreshTokenPath.split(".");
+            if (!data) {
+                throw new Error("REFRESH_ERROR: No data received from refresh endpoint.");
+            }
+            const accessTokenAfterRefresh = safeGet(data, accessTokenPathArray);
+            const refreshTokenAfterRefresh = safeGet(data, refreshTokenPathArray);
+            if (!accessTokenAfterRefresh ||
+                typeof accessTokenAfterRefresh !== "string") {
+                throw new Error(`REFRESH_ERROR: Access token not found or invalid at path '${accessTokenPath}' in refresh response.`);
+            }
+            if (!refreshTokenAfterRefresh ||
+                typeof refreshTokenAfterRefresh !== "string") {
+                throw new Error(`REFRESH_ERROR: Refresh token not found or invalid at path '${refreshTokenPath}' in refresh response.`);
+            }
+            await storeAuthToken(accessTokenAfterRefresh, secretKey, currentPersistencePreference);
+            await storeAuthRefreshToken(refreshTokenAfterRefresh, secretKey, currentPersistencePreference);
             return data;
         }
         catch (error) {
@@ -3401,7 +3428,7 @@ function useAuth(secretKey = getSecretKey()) {
     return {
         logout,
         login,
-        refresh
+        refresh,
     };
 }
 

package/dist/types/Auth.d.ts

@@ -0,0 +1,16 @@
+import { TokensConfig, EndpointsConfig } from "@/types";
+export type AuthConfig = {
+    endpoints: EndpointsConfig;
+    storageKeys: TokensConfig;
+};
+export interface AuthParams {
+    username?: string;
+    password?: string;
+}
+export interface AuthTokenPaths {
+    accessTokenPath?: string;
+    refreshTokenPath?: string;
+}
+export interface AuthResponse {
+    [key: string]: any;
+}

package/dist/types/index.d.ts

@@ -3,9 +3,7 @@ export * from './ExtendedQueryOptions';
 export * from './ErrorType';
 export * from './EndpointsConfig';
 export * from './TokenConfig';
-export * from './AuthConfig';
+export * from './Auth';
 export * from './SessionConfig';
 export * from './DecodedJwtPayload';
-export * from './AuthResponse';
-export * from './AuthParams';
 export * from './ArexVueCoreOptions';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arex95/vue-core",
-  "version": "1.1.26",
+  "version": "1.1.27",
   "description": "Opinionated Vue Core",
   "main": "dist/index.js",
   "module": "dist/index.mjs",