@arex95/vue-core 1.1.30 → 1.1.33

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

@@ -1,4 +1,4 @@
-import { AuthParams, AuthResponse, AuthTokenPaths, SessionPreference } from "@/types";
+import { AuthParams, AuthResponse, AuthTokenPaths, LocationPreference } from "@/types";
 /**
  * @typedef {object} AuthHook
  * @property {function(): Promise<number | null>} getTokenExpiry - Retrieves the expiration time of the current token in milliseconds.
@@ -18,6 +18,6 @@ import { AuthParams, AuthResponse, AuthTokenPaths, SessionPreference } from "@/t
  */
 export declare function useAuth(secretKey?: string): {
     logout: (params?: AuthParams) => Promise<void>;
-    login: (params: AuthParams, persistence: SessionPreference, tokenPaths?: AuthTokenPaths) => Promise<AuthResponse>;
+    login: (params: AuthParams, persistence: LocationPreference, tokenPaths?: AuthTokenPaths) => Promise<AuthResponse>;
     refresh: (tokenPaths?: AuthTokenPaths) => Promise<AuthResponse>;
 };

package/dist/config/global/sessionConfig.d.ts

@@ -1,4 +1,4 @@
-import { SessionPreference, SessionConfigObject, SessionConfig } from "@/types/SessionConfig";
+import { LocationPreference, SessionConfigObject, SessionConfig } from "@/types/SessionConfig";
 /**
  * Configures the session identifier and/or data persistence preference
  * for the active browser session.
@@ -24,7 +24,7 @@ export declare function getSessionId(): Promise<string>;
  *
  * @returns {Promise<SessionPreference>} A promise that resolves with the configured persistence preference ('local' or 'session').
  */
-export declare function getSessionPersistence(): Promise<SessionPreference>;
+export declare function getSessionPersistence(): Promise<LocationPreference>;
 /**
  * Retrieves the complete session configuration.
  * Always attempts to load the configuration from storage. If it fails, it uses the internal state.

package/dist/index.mjs

@@ -623,7 +623,7 @@ class AxiosService {
             timeout: 300000,
             headers: {
                 'Accept': 'application/json',
-                'Cache-Control': 'no-store, no-cache, must-revalidate, proxy-revalidate',
+                'Cache-Control': 'no-cache',
                 'Pragma': 'no-cache',
                 'Expires': '0',
                 ...headers,
@@ -866,14 +866,14 @@ async function decrypt(encryptedValue, secretKey) {
  * @param key The key under which to store the value.
  * @param value The value to encrypt and store.
  * @param secretKey The secret key for encryption.
- * @param persistent If true, uses localStorage; otherwise, uses sessionStorage.
+ * @param location Determines where the item is stored: 'local' for localStorage, 'session' for sessionStorage.
  * @returns A promise that resolves when the item is stored. Throws an error if it fails.
  */
-async function storeEncryptedItem(key, value, secretKey, persistent) {
+async function storeEncryptedItem(key, value, secretKey, location) {
     if (typeof window === "undefined") {
         throw new Error("Cannot access storage: window is not defined.");
     }
-    const storage = persistent ? window.localStorage : window.sessionStorage;
+    const storage = location === "local" ? window.localStorage : window.sessionStorage;
     const encryptedValue = await encrypt(value, secretKey);
     storage.setItem(key, encryptedValue);
 }
@@ -882,15 +882,20 @@ async function storeEncryptedItem(key, value, secretKey, persistent) {
  * Assumes the `window` environment is available.
  * @param key The key of the item to retrieve.
  * @param secretKey The secret key for decryption.
- * @param persistent If true, searches localStorage; otherwise, sessionStorage.
+ * @param location Specifies where to search for the item: 'local' for localStorage, 'session' for sessionStorage, or 'any' to check both (session first).
  * @returns A promise that resolves with the decrypted value or null if not found or decryption fails.
  */
-async function getDecryptedItem(key, secretKey, persistent) {
+async function getDecryptedItem(key, secretKey, location) {
     if (typeof window === "undefined") {
         return null;
     }
-    const storage = persistent ? window.localStorage : window.sessionStorage;
-    const encryptedData = storage.getItem(key);
+    let encryptedData = null;
+    if (location === "session" || location === "any") {
+        encryptedData = window.sessionStorage.getItem(key);
+    }
+    if (!encryptedData && (location === "local" || location === "any")) {
+        encryptedData = window.localStorage.getItem(key);
+    }
     if (!encryptedData) {
         return null;
     }
@@ -957,9 +962,9 @@ function updateSessionConfig() {
  * @returns {Promise<void>} A promise that resolves when the session configuration has been saved.
  */
 async function saveSessionConfig() {
-    const isPersistent = internalSessionState.persistencePreference === "local";
+    const location = internalSessionState.persistencePreference;
     try {
-        await storeEncryptedItem(SESSION_KEY, JSON.stringify(_sessionConfig), getAppKey(), isPersistent);
+        await storeEncryptedItem(SESSION_KEY, JSON.stringify(_sessionConfig), getAppKey(), location);
     }
     catch (error) {
         console.error("Error saving session configuration to storage:", error);
@@ -973,8 +978,9 @@ async function saveSessionConfig() {
  * @returns {Promise<void>} A promise that resolves when the state has been loaded and updated.
  */
 async function loadSessionConfig() {
+    const location = internalSessionState.persistencePreference;
     try {
-        const storedConfig = await getDecryptedItem(SESSION_KEY, getAppKey(), true);
+        const storedConfig = await getDecryptedItem(SESSION_KEY, getAppKey(), location);
         if (storedConfig) {
             const parsedConfig = JSON.parse(storedConfig);
             internalSessionState.sessionId = parsedConfig.SESSION_ID;
@@ -2702,16 +2708,21 @@ function isValidHexNumber(hex) {
 
 /**
  * Clears all stored authentication data (access and refresh tokens)
- * from either sessionStorage or localStorage based on the provided preference.
+ * from either sessionStorage, localStorage, or both based on the provided location preference.
  *
- * @param {SessionPreference} preference - The storage preference ('local' for localStorage, 'session' for sessionStorage).
+ * @param {LocationPreference} location - The storage preference ('local' for localStorage, 'session' for sessionStorage, 'any' for both).
  * @returns {Promise<void>} A promise that resolves when all relevant storage items are removed.
  */
-const cleanCredentials = async (preference) => {
+const cleanCredentials = async (location) => {
     const tokensConfig = getTokenConfig();
     Object.keys(tokensConfig).forEach((key) => {
-        const storage = preference === "local" ? localStorage : sessionStorage;
-        storage.removeItem(tokensConfig[key]);
+        const itemKey = tokensConfig[key];
+        if (location === "local" || location === "any") {
+            localStorage.removeItem(itemKey);
+        }
+        if (location === "session" || location === "any") {
+            sessionStorage.removeItem(itemKey);
+        }
     });
 };
 /**
@@ -2722,9 +2733,9 @@ const cleanCredentials = async (preference) => {
  * @param {SessionPreference} preference - The storage preference ('local' for localStorage, 'session' for sessionStorage).
  * @returns {Promise<string | null>} A promise that resolves with the decrypted access token, or null if not found.
  */
-const getAuthToken = async (secretKey, preference) => {
+const getAuthToken = async (secretKey, location) => {
     const tokensConfig = getTokenConfig();
-    return await getDecryptedItem(tokensConfig.ACCESS_TOKEN, secretKey, preference === "local");
+    return await getDecryptedItem(tokensConfig.ACCESS_TOKEN, secretKey, location);
 };
 /**
  * Retrieves the authentication refresh token from storage, decrypting it
@@ -2734,9 +2745,9 @@ const getAuthToken = async (secretKey, preference) => {
  * @param {SessionPreference} preference - The storage preference ('local' for localStorage, 'session' for sessionStorage).
  * @returns {Promise<string | null>} A promise that resolves with the decrypted refresh token, or null if not found.
  */
-const getAuthRefreshToken = async (secretKey, preference) => {
+const getAuthRefreshToken = async (secretKey, location) => {
     const tokensConfig = getTokenConfig();
-    return await getDecryptedItem(tokensConfig.REFRESH_TOKEN, secretKey, preference === "local");
+    return await getDecryptedItem(tokensConfig.REFRESH_TOKEN, secretKey, location);
 };
 /**
  * Stores the authentication token (access token) in storage after encrypting it,
@@ -2747,9 +2758,9 @@ const getAuthRefreshToken = async (secretKey, preference) => {
  * @param {SessionPreference} preference - The storage preference ('local' for localStorage, 'session' for sessionStorage).
  * @returns {Promise<void>} A promise that resolves when the token is successfully stored.
  */
-const storeAuthToken = async (token, secretKey, preference) => {
+const storeAuthToken = async (token, secretKey, location) => {
     const tokensConfig = getTokenConfig();
-    await storeEncryptedItem(tokensConfig.ACCESS_TOKEN, token, secretKey, preference === "local");
+    await storeEncryptedItem(tokensConfig.ACCESS_TOKEN, token, secretKey, location);
 };
 /**
  * Stores the authentication refresh token in storage after encrypting it,
@@ -2760,9 +2771,9 @@ const storeAuthToken = async (token, secretKey, preference) => {
  * @param {SessionPreference} preference - The storage preference ('local' for localStorage, 'session' for sessionStorage).
  * @returns {Promise<void>} A promise that resolves when the token is successfully stored.
  */
-const storeAuthRefreshToken = async (token, secretKey, preference) => {
+const storeAuthRefreshToken = async (token, secretKey, location) => {
     const tokensConfig = getTokenConfig();
-    await storeEncryptedItem(tokensConfig.REFRESH_TOKEN, token, secretKey, preference === "local");
+    await storeEncryptedItem(tokensConfig.REFRESH_TOKEN, token, secretKey, location);
 };
 /**
  * Verifies the validity and expiration of the current authentication token.
@@ -2773,7 +2784,7 @@ const storeAuthRefreshToken = async (token, secretKey, preference) => {
  * "TOKEN_INVALID" if the token format is invalid.
  */
 const verifyAuth = async () => {
-    const sessionPersistence = await getSessionPersistence();
+    const sessionPersistence = 'any';
     const handleAuthError = async (message, shouldClean = true) => {
         handleError(message, false);
         if (shouldClean) {

package/dist/types/SessionConfig.d.ts

@@ -1,13 +1,13 @@
-export type SessionPreference = "local" | "session";
+export type LocationPreference = "local" | "session" | "any";
 export type SessionConfig = {
     SESSION_ID: string;
-    PERSISTENCE: SessionPreference;
+    PERSISTENCE: LocationPreference;
 };
 export interface InternalSessionState {
     sessionId: string;
-    persistencePreference: SessionPreference;
+    persistencePreference: LocationPreference;
 }
 export interface SessionConfigObject {
     sessionId?: string;
-    persistencePreference?: SessionPreference;
+    persistencePreference?: LocationPreference;
 }

package/dist/utils/credentials.d.ts

@@ -1,12 +1,12 @@
-import { SessionPreference } from "@/types/SessionConfig";
+import { LocationPreference } from "@/types/SessionConfig";
 /**
  * Clears all stored authentication data (access and refresh tokens)
- * from either sessionStorage or localStorage based on the provided preference.
+ * from either sessionStorage, localStorage, or both based on the provided location preference.
  *
- * @param {SessionPreference} preference - The storage preference ('local' for localStorage, 'session' for sessionStorage).
+ * @param {LocationPreference} location - The storage preference ('local' for localStorage, 'session' for sessionStorage, 'any' for both).
  * @returns {Promise<void>} A promise that resolves when all relevant storage items are removed.
  */
-export declare const cleanCredentials: (preference: SessionPreference) => Promise<void>;
+export declare const cleanCredentials: (location: LocationPreference) => Promise<void>;
 /**
  * Retrieves the authentication token (access token) from storage, decrypting it
  * using the provided secret key and based on the specified session preference.
@@ -15,7 +15,7 @@ export declare const cleanCredentials: (preference: SessionPreference) => Promis
  * @param {SessionPreference} preference - The storage preference ('local' for localStorage, 'session' for sessionStorage).
  * @returns {Promise<string | null>} A promise that resolves with the decrypted access token, or null if not found.
  */
-export declare const getAuthToken: (secretKey: string, preference: SessionPreference) => Promise<string | null>;
+export declare const getAuthToken: (secretKey: string, location: LocationPreference) => Promise<string | null>;
 /**
  * Retrieves the authentication refresh token from storage, decrypting it
  * using the provided secret key and based on the specified session preference.
@@ -24,7 +24,7 @@ export declare const getAuthToken: (secretKey: string, preference: SessionPrefer
  * @param {SessionPreference} preference - The storage preference ('local' for localStorage, 'session' for sessionStorage).
  * @returns {Promise<string | null>} A promise that resolves with the decrypted refresh token, or null if not found.
  */
-export declare const getAuthRefreshToken: (secretKey: string, preference: SessionPreference) => Promise<string | null>;
+export declare const getAuthRefreshToken: (secretKey: string, location: LocationPreference) => Promise<string | null>;
 /**
  * Stores the authentication token (access token) in storage after encrypting it,
  * based on the specified session preference.
@@ -34,7 +34,7 @@ export declare const getAuthRefreshToken: (secretKey: string, preference: Sessio
  * @param {SessionPreference} preference - The storage preference ('local' for localStorage, 'session' for sessionStorage).
  * @returns {Promise<void>} A promise that resolves when the token is successfully stored.
  */
-export declare const storeAuthToken: (token: string, secretKey: string, preference: SessionPreference) => Promise<void>;
+export declare const storeAuthToken: (token: string, secretKey: string, location: LocationPreference) => Promise<void>;
 /**
  * Stores the authentication refresh token in storage after encrypting it,
  * based on the specified session preference.
@@ -44,7 +44,7 @@ export declare const storeAuthToken: (token: string, secretKey: string, preferen
  * @param {SessionPreference} preference - The storage preference ('local' for localStorage, 'session' for sessionStorage).
  * @returns {Promise<void>} A promise that resolves when the token is successfully stored.
  */
-export declare const storeAuthRefreshToken: (token: string, secretKey: string, preference: SessionPreference) => Promise<void>;
+export declare const storeAuthRefreshToken: (token: string, secretKey: string, location: LocationPreference) => Promise<void>;
 /**
  * Verifies the validity and expiration of the current authentication token.
  * If the token is missing, invalid, or expired, appropriate errors are thrown and credentials are cleaned.

package/dist/utils/storage.d.ts

@@ -1,19 +1,20 @@
+import { LocationPreference } from "@/types";
 /**
  * Encrypts and stores an item in local or session storage.
  * Assumes the `window` environment is available.
  * @param key The key under which to store the value.
  * @param value The value to encrypt and store.
  * @param secretKey The secret key for encryption.
- * @param persistent If true, uses localStorage; otherwise, uses sessionStorage.
+ * @param location Determines where the item is stored: 'local' for localStorage, 'session' for sessionStorage.
  * @returns A promise that resolves when the item is stored. Throws an error if it fails.
  */
-export declare function storeEncryptedItem(key: string, value: string, secretKey: string, persistent: boolean): Promise<void>;
+export declare function storeEncryptedItem(key: string, value: string, secretKey: string, location: LocationPreference): Promise<void>;
 /**
  * Retrieves and decrypts a value from local or session storage.
  * Assumes the `window` environment is available.
  * @param key The key of the item to retrieve.
  * @param secretKey The secret key for decryption.
- * @param persistent If true, searches localStorage; otherwise, sessionStorage.
+ * @param location Specifies where to search for the item: 'local' for localStorage, 'session' for sessionStorage, or 'any' to check both (session first).
  * @returns A promise that resolves with the decrypted value or null if not found or decryption fails.
  */
-export declare function getDecryptedItem(key: string, secretKey: string, persistent: boolean): Promise<string | null>;
+export declare function getDecryptedItem(key: string, secretKey: string, location: LocationPreference): Promise<string | null>;

package/package.json

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