@apptimate/core-lib 1.0.0 → 1.1.0

package/src/utils/httpClient.ts

@@ -1,161 +1,185 @@
-import { IApiResponse } from "../common/interfaces/ICommon";
-import Cookies from 'js-cookie';
-import { cookie } from '../constants/storageKeys';
-import { decrypt, replacePlaceholders } from './commonService';
-
-/**
- * Handles 401 Unauthorized responses globally.
- * Clears the auth cookie and localStorage, then redirects to the login page.
- */
-export function handleUnauthorized(): void {
-    // Clear auth cookie explicitly to avoid clearing cookies from other apps on localhost
-    const cookieName = replacePlaceholders(
-        cookie.access_token.encrypted ? cookie.access_token.secretName : cookie.access_token.name,
-        {}
-    );
-    Cookies.remove(cookieName, { path: '/' });
-
-    // Clear localStorage
-    if (typeof window !== 'undefined') {
-        localStorage.clear();
-        window.location.href = '/auth/login';
-    }
-}
-
-
-export interface RequestOptions {
-    url: string;
-    method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
-    data?: any;
-    params?: Record<string, any>;
-    headers?: Record<string, string>;
-    signal?: AbortSignal;
-}
-
-export interface ClientResponse<T = any> {
-    ok: boolean;
-    status: number;
-    responseData: IApiResponse<T>;
-}
-
-export async function sendRequest<T = any>({ url, method, data, params, headers, signal }: RequestOptions): Promise<ClientResponse<T>> {
-    const defaultHeaders: Record<string, string> = {
-        'Accept': 'application/json',
-    };
-
-    // Serialize params into query string
-    let finalUrl = url;
-    if (params) {
-        const queryParams = new URLSearchParams();
-        Object.entries(params).forEach(([key, value]) => {
-            if (value !== undefined && value !== null && value !== '') {
-                queryParams.append(key, String(value));
-            }
-        });
-        const queryString = queryParams.toString();
-        if (queryString) {
-            finalUrl += (url.includes('?') ? '&' : '?') + queryString;
-        }
-    }
-
-    // Automatically add Authorization header on the client side
-    if (typeof window !== 'undefined') {
-        const name = replacePlaceholders(
-            cookie.access_token.encrypted ? cookie.access_token.secretName : cookie.access_token.name,
-            {}
-        );
-        const tokenValue = Cookies.get(name);
-        
-        if (tokenValue) {
-            try {
-                const token = cookie.access_token.encrypted ? decrypt(tokenValue) : tokenValue;
-                if (token) {
-                    defaultHeaders['Authorization'] = `Bearer ${token}`;
-                }
-            } catch (error) {
-                console.error("Failed to process auth token:", error);
-            }
-        }
-    }
-
-    if (data && !(data instanceof FormData)) {
-        defaultHeaders['Content-Type'] = 'application/json';
-    }
-
-    try {
-        const response = await fetch(finalUrl, {
-            method,
-            headers: { ...defaultHeaders, ...headers },
-            body: data instanceof FormData ? data : (data ? JSON.stringify(data) : undefined),
-            signal,
-        });
-
-        // Handle 401 Unauthorized globally — clear auth and redirect to login
-        const isAuthEndpoint = finalUrl.includes('/auth/login') || finalUrl.includes('/auth/register');
-        
-        if (response.status === 401 && typeof window !== 'undefined' && !isAuthEndpoint) {
-            handleUnauthorized();
-            return {
-                ok: false,
-                status: 401,
-                responseData: {
-                    is_success: false,
-                    message: 'Unauthenticated.',
-                    result: null,
-                    system_code: 'unauthenticated'
-                } as IApiResponse<T>,
-            };
-        }
-
-        let responseData: any;
-        const contentType = response.headers.get('content-type');
-        
-        if (contentType && contentType.includes('application/json')) {
-            responseData = await response.json();
-        } else {
-            responseData = {
-                is_success: response.ok,
-                message: response.statusText,
-                result: null,
-                system_code: ''
-            };
-        }
-
-        // Handle inactive user — force logout and redirect to login
-        // Skip for auth endpoints so the login form can display the error
-        if (responseData?.system_code === 'user_inactive' && typeof window !== 'undefined' && !isAuthEndpoint) {
-            handleUnauthorized();
-            return {
-                ok: false,
-                status: 403,
-                responseData: {
-                    is_success: false,
-                    message: responseData.message || 'Your account has been deactivated.',
-                    result: null,
-                    system_code: 'user_inactive'
-                } as IApiResponse<T>,
-            };
-        }
-
-        return {
-            ok: response.ok,
-            status: response.status,
-            responseData: responseData as IApiResponse<T>,
-        };
-    } catch (error: any) {
-        if (error.name === 'AbortError') {
-            throw error; // Rethrow to be caught by specific timeout handling
-        }
-        
-        return {
-            ok: false,
-            status: 0,
-            responseData: {
-                is_success: false,
-                message: error.message || 'Network error',
-                result: null,
-                system_code: 'network_failure'
-            },
-        };
-    }
-}
+import { IApiResponse } from "../common/interfaces/ICommon";
+import Cookies from 'js-cookie';
+import { cookie } from '../constants/storageKeys';
+import { decrypt, replacePlaceholders } from './commonService';
+
+/**
+ * Handles 401 Unauthorized responses globally.
+ * Clears the auth cookie and localStorage, then redirects to the login page.
+ */
+export function handleUnauthorized(): void {
+    // Clear auth cookie explicitly to avoid clearing cookies from other apps on localhost
+    const cookieName = replacePlaceholders(
+        cookie.access_token.encrypted ? cookie.access_token.secretName : cookie.access_token.name,
+        {}
+    );
+    Cookies.remove(cookieName, { path: '/' });
+
+    // Clear only app-owned localStorage keys instead of wiping the entire origin
+    if (typeof window !== 'undefined') {
+        const appKeys = ['selected_organization'];
+        // Also clear any key from our storageKeys registry
+        try {
+            const allKeys = Object.keys(localStorage);
+            allKeys.forEach(key => {
+                if (appKeys.includes(key) || key.startsWith('apptimate_') || key.startsWith('app_')) {
+                    localStorage.removeItem(key);
+                }
+            });
+        } catch {
+            // Silently ignore storage access errors
+        }
+        window.location.href = '/auth/login';
+    }
+}
+
+
+export interface RequestOptions {
+    url: string;
+    method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
+    data?: any;
+    params?: Record<string, any>;
+    headers?: Record<string, string>;
+    signal?: AbortSignal;
+}
+
+export interface ClientResponse<T = any> {
+    ok: boolean;
+    status: number;
+    responseData: IApiResponse<T>;
+}
+
+export async function sendRequest<T = any>({ url, method, data, params, headers, signal }: RequestOptions): Promise<ClientResponse<T>> {
+    const defaultHeaders: Record<string, string> = {
+        'Accept': 'application/json',
+    };
+
+    // Serialize params into query string
+    let finalUrl = url;
+    if (params) {
+        const queryParams = new URLSearchParams();
+        Object.entries(params).forEach(([key, value]) => {
+            if (value !== undefined && value !== null && value !== '') {
+                queryParams.append(key, String(value));
+            }
+        });
+        const queryString = queryParams.toString();
+        if (queryString) {
+            finalUrl += (url.includes('?') ? '&' : '?') + queryString;
+        }
+    }
+
+    // Automatically add Authorization header on the client side
+    if (typeof window !== 'undefined') {
+        const name = replacePlaceholders(
+            cookie.access_token.encrypted ? cookie.access_token.secretName : cookie.access_token.name,
+            {}
+        );
+        const tokenValue = Cookies.get(name);
+
+        if (tokenValue) {
+            try {
+                const token = cookie.access_token.encrypted ? decrypt(tokenValue) : tokenValue;
+                if (token) {
+                    defaultHeaders['Authorization'] = `Bearer ${token}`;
+                }
+            } catch (error) {
+                console.error("Failed to process auth token:", error);
+            }
+        }
+
+        // Automatically inject selected organization ID into every request
+        try {
+            const orgRaw = localStorage.getItem('selected_organization');
+            if (orgRaw) {
+                const org = JSON.parse(orgRaw);
+                if (org?.id) {
+                    defaultHeaders['X-Organization-Id'] = String(org.id);
+                }
+            }
+        } catch {
+            // silently ignore parse errors
+        }
+    }
+
+    if (data && !(data instanceof FormData)) {
+        defaultHeaders['Content-Type'] = 'application/json';
+    }
+
+    try {
+        const response = await fetch(finalUrl, {
+            method,
+            headers: { ...defaultHeaders, ...headers },
+            body: data instanceof FormData ? data : (data ? JSON.stringify(data) : undefined),
+            signal,
+        });
+
+        // Handle 401 Unauthorized globally — clear auth and redirect to login
+        const isAuthEndpoint = finalUrl.includes('/auth/login') || finalUrl.includes('/auth/register') || finalUrl.includes('/auth/me');
+
+        if (response.status === 401 && typeof window !== 'undefined' && !isAuthEndpoint) {
+            handleUnauthorized();
+            return {
+                ok: false,
+                status: 401,
+                responseData: {
+                    is_success: false,
+                    message: 'Unauthenticated.',
+                    result: null,
+                    system_code: 'unauthenticated'
+                } as IApiResponse<T>,
+            };
+        }
+
+        let responseData: any;
+        const contentType = response.headers.get('content-type');
+
+        if (contentType && contentType.includes('application/json')) {
+            responseData = await response.json();
+        } else {
+            responseData = {
+                is_success: response.ok,
+                message: response.statusText,
+                result: null,
+                system_code: ''
+            };
+        }
+
+        // Handle inactive user — force logout and redirect to login
+        // Skip for auth endpoints so the login form can display the error
+        if (responseData?.system_code === 'user_inactive' && typeof window !== 'undefined' && !isAuthEndpoint) {
+            handleUnauthorized();
+            return {
+                ok: false,
+                status: 403,
+                responseData: {
+                    is_success: false,
+                    message: responseData.message || 'Your account has been deactivated.',
+                    result: null,
+                    system_code: 'user_inactive'
+                } as IApiResponse<T>,
+            };
+        }
+
+        return {
+            ok: response.ok,
+            status: response.status,
+            responseData: responseData as IApiResponse<T>,
+        };
+    } catch (error: any) {
+        if (error.name === 'AbortError') {
+            throw error; // Rethrow to be caught by specific timeout handling
+        }
+
+        return {
+            ok: false,
+            status: 0,
+            responseData: {
+                is_success: false,
+                message: error.message || 'Network error',
+                result: null,
+                system_code: 'network_failure'
+            },
+        };
+    }
+}

package/src/utils/localStorageHandler.ts

@@ -1,49 +1,59 @@
-'use client';
-
-import { IStorageOptions } from '../constants/storageKeys';
-import { decrypt, encrypt, replacePlaceholders } from './commonService';
-
-export function getLocalStorage<T = any>(storageKey: IStorageOptions, options?: { replacements?: Record<string, string | number> }): T | null {
-    if (typeof window === 'undefined') return null;
-
-    const name = replacePlaceholders(storageKey.encrypted ? storageKey.secretName : storageKey.name, options?.replacements || {});
-    const value = localStorage.getItem(name);
-
-    if (!value) return null;
-
-    if (storageKey.encrypted) {
-        return decrypt(value) as T;
-    }
-
-    try {
-        return JSON.parse(value) as T;
-    } catch {
-        return value as unknown as T;
-    }
-}
-
-export function setLocalStorage(storageKey: IStorageOptions, value: any, options?: { replacements?: Record<string, string | number> }): void {
-    if (typeof window === 'undefined') return;
-
-    const name = replacePlaceholders(storageKey.encrypted ? storageKey.secretName : storageKey.name, options?.replacements || {});
-    
-    let finalValue = typeof value === 'string' ? value : JSON.stringify(value);
-    if (storageKey.encrypted) {
-        finalValue = encrypt(value);
-    }
-
-    localStorage.setItem(name, finalValue);
-}
-
-export function clearLocalStorage(storageKey: IStorageOptions, options?: { replacements?: Record<string, string | number> }): void {
-    if (typeof window === 'undefined') return;
-
-    const name = replacePlaceholders(storageKey.encrypted ? storageKey.secretName : storageKey.name, options?.replacements || {});
-    localStorage.removeItem(name);
-}
-
-export function clearAllLocalStorage(): void {
-    if (typeof window !== 'undefined') {
-        localStorage.clear();
-    }
-}
+'use client';
+
+import { IStorageOptions } from '../constants/storageKeys';
+import { decrypt, encrypt, replacePlaceholders } from './commonService';
+
+export function getLocalStorage<T = any>(storageKey: IStorageOptions, options?: { replacements?: Record<string, string | number> }): T | null {
+    if (typeof window === 'undefined') return null;
+
+    const name = replacePlaceholders(storageKey.encrypted ? storageKey.secretName : storageKey.name, options?.replacements || {});
+    const value = localStorage.getItem(name);
+
+    if (!value) return null;
+
+    if (storageKey.encrypted) {
+        return decrypt(value) as T;
+    }
+
+    try {
+        return JSON.parse(value) as T;
+    } catch {
+        return value as unknown as T;
+    }
+}
+
+export function setLocalStorage(storageKey: IStorageOptions, value: any, options?: { replacements?: Record<string, string | number> }): void {
+    if (typeof window === 'undefined') return;
+
+    const name = replacePlaceholders(storageKey.encrypted ? storageKey.secretName : storageKey.name, options?.replacements || {});
+    
+    let finalValue = typeof value === 'string' ? value : JSON.stringify(value);
+    if (storageKey.encrypted) {
+        finalValue = encrypt(value);
+    }
+
+    localStorage.setItem(name, finalValue);
+}
+
+export function clearLocalStorage(storageKey: IStorageOptions, options?: { replacements?: Record<string, string | number> }): void {
+    if (typeof window === 'undefined') return;
+
+    const name = replacePlaceholders(storageKey.encrypted ? storageKey.secretName : storageKey.name, options?.replacements || {});
+    localStorage.removeItem(name);
+}
+
+export function clearAllLocalStorage(): void {
+    if (typeof window !== 'undefined') {
+        const appKeys = ['selected_organization'];
+        try {
+            const allKeys = Object.keys(localStorage);
+            allKeys.forEach(key => {
+                if (appKeys.includes(key) || key.startsWith('apptimate_') || key.startsWith('app_')) {
+                    localStorage.removeItem(key);
+                }
+            });
+        } catch {
+            // Silently ignore storage access errors
+        }
+    }
+}