@gofreego/tsutils 0.1.24 → 0.1.26

package/dist/index.d.mts

@@ -6,53 +6,6 @@ import { Highlighter } from 'shiki';
 
 declare function NotFoundPage(): react_jsx_runtime.JSX.Element;
 
-interface HttpClientConfig {
-    baseURL?: string;
-    timeout?: number;
-    headers?: Record<string, string>;
-    onUnauthorized?: (error: HttpError) => void;
-}
-interface RequestConfig extends Omit<RequestInit, 'body'> {
-    params?: Record<string, string | number | boolean>;
-    data?: any;
-    timeout?: number;
-}
-interface HttpResponse<T = any> {
-    data: T;
-    status: number;
-    statusText: string;
-    headers: Headers;
-}
-interface ErrorData {
-    code: number;
-    message: string;
-}
-interface HttpError extends Error {
-    status?: number;
-    statusText?: string;
-    data?: ErrorData;
-}
-
-declare class HttpClient {
-    private baseURL;
-    private timeout;
-    private defaultHeaders;
-    private onUnauthorized?;
-    constructor(config?: HttpClientConfig);
-    private buildURL;
-    private request;
-    setOnUnauthorized(handler: (error: HttpError) => void): void;
-    setDefaultHeader(key: string, value: string): void;
-    removeDefaultHeader(key: string): void;
-    getDefaultHeaders(): Record<string, string>;
-    get<T = any>(url: string, config?: RequestConfig): Promise<HttpResponse<T>>;
-    post<T = any>(url: string, data?: any, config?: RequestConfig): Promise<HttpResponse<T>>;
-    put<T = any>(url: string, data?: any, config?: RequestConfig): Promise<HttpResponse<T>>;
-    patch<T = any>(url: string, data?: any, config?: RequestConfig): Promise<HttpResponse<T>>;
-    delete<T = any>(url: string, config?: RequestConfig): Promise<HttpResponse<T>>;
-}
-declare function extractErrorMessage(error: any): string;
-
 interface User {
     id: string;
     uuid: string;
@@ -175,16 +128,13 @@ interface ISessionManager {
     getSessionId(): string | undefined;
     /** True when a non-expired access token is stored. */
     isAuthenticated(): boolean;
-    /** Called on app startup: restore the auth header or wipe an expired session. */
-    initialize(): void;
 }
 declare class SessionManager implements ISessionManager {
     private static instance;
     private readonly key;
-    private readonly client;
     private cache;
     private constructor();
-    static getInstance(client: HttpClient): SessionManager;
+    static getInstance(): SessionManager;
     save(session: SignInResponse): void;
     patch(updates: Partial<SignInResponse>): void;
     clear(): void;
@@ -193,11 +143,55 @@ declare class SessionManager implements ISessionManager {
     getRefreshToken(): string | undefined;
     getSessionId(): string | undefined;
     isAuthenticated(): boolean;
-    initialize(): void;
-    private setAuthToken;
-    private clearAuthToken;
 }
 
+interface HttpClientConfig {
+    baseURL?: string;
+    timeout?: number;
+    headers?: Record<string, string>;
+    onUnauthorized?: (error: HttpError) => void;
+}
+interface RequestConfig extends Omit<RequestInit, 'body'> {
+    params?: Record<string, string | number | boolean>;
+    data?: any;
+    timeout?: number;
+}
+interface HttpResponse<T = any> {
+    data: T;
+    status: number;
+    statusText: string;
+    headers: Headers;
+}
+interface ErrorData {
+    code: number;
+    message: string;
+}
+interface HttpError extends Error {
+    status?: number;
+    statusText?: string;
+    data?: ErrorData;
+}
+
+declare class HttpClient {
+    private baseURL;
+    private timeout;
+    private defaultHeaders;
+    private onUnauthorized?;
+    constructor(config?: HttpClientConfig);
+    private buildURL;
+    private request;
+    setOnUnauthorized(handler: (error: HttpError) => void): void;
+    setDefaultHeader(key: string, value: string): void;
+    removeDefaultHeader(key: string): void;
+    getDefaultHeaders(): Record<string, string>;
+    get<T = any>(url: string, config?: RequestConfig): Promise<HttpResponse<T>>;
+    post<T = any>(url: string, data?: any, config?: RequestConfig): Promise<HttpResponse<T>>;
+    put<T = any>(url: string, data?: any, config?: RequestConfig): Promise<HttpResponse<T>>;
+    patch<T = any>(url: string, data?: any, config?: RequestConfig): Promise<HttpResponse<T>>;
+    delete<T = any>(url: string, config?: RequestConfig): Promise<HttpResponse<T>>;
+}
+declare function extractErrorMessage(error: any): string;
+
 interface IAuthService {
     signIn(request: SignInRequest): Promise<SignInResponse>;
     refreshToken(request?: Partial<RefreshTokenRequest>): Promise<RefreshTokenResponse>;

package/dist/index.d.ts

@@ -6,53 +6,6 @@ import { Highlighter } from 'shiki';
 
 declare function NotFoundPage(): react_jsx_runtime.JSX.Element;
 
-interface HttpClientConfig {
-    baseURL?: string;
-    timeout?: number;
-    headers?: Record<string, string>;
-    onUnauthorized?: (error: HttpError) => void;
-}
-interface RequestConfig extends Omit<RequestInit, 'body'> {
-    params?: Record<string, string | number | boolean>;
-    data?: any;
-    timeout?: number;
-}
-interface HttpResponse<T = any> {
-    data: T;
-    status: number;
-    statusText: string;
-    headers: Headers;
-}
-interface ErrorData {
-    code: number;
-    message: string;
-}
-interface HttpError extends Error {
-    status?: number;
-    statusText?: string;
-    data?: ErrorData;
-}
-
-declare class HttpClient {
-    private baseURL;
-    private timeout;
-    private defaultHeaders;
-    private onUnauthorized?;
-    constructor(config?: HttpClientConfig);
-    private buildURL;
-    private request;
-    setOnUnauthorized(handler: (error: HttpError) => void): void;
-    setDefaultHeader(key: string, value: string): void;
-    removeDefaultHeader(key: string): void;
-    getDefaultHeaders(): Record<string, string>;
-    get<T = any>(url: string, config?: RequestConfig): Promise<HttpResponse<T>>;
-    post<T = any>(url: string, data?: any, config?: RequestConfig): Promise<HttpResponse<T>>;
-    put<T = any>(url: string, data?: any, config?: RequestConfig): Promise<HttpResponse<T>>;
-    patch<T = any>(url: string, data?: any, config?: RequestConfig): Promise<HttpResponse<T>>;
-    delete<T = any>(url: string, config?: RequestConfig): Promise<HttpResponse<T>>;
-}
-declare function extractErrorMessage(error: any): string;
-
 interface User {
     id: string;
     uuid: string;
@@ -175,16 +128,13 @@ interface ISessionManager {
     getSessionId(): string | undefined;
     /** True when a non-expired access token is stored. */
     isAuthenticated(): boolean;
-    /** Called on app startup: restore the auth header or wipe an expired session. */
-    initialize(): void;
 }
 declare class SessionManager implements ISessionManager {
     private static instance;
     private readonly key;
-    private readonly client;
     private cache;
     private constructor();
-    static getInstance(client: HttpClient): SessionManager;
+    static getInstance(): SessionManager;
     save(session: SignInResponse): void;
     patch(updates: Partial<SignInResponse>): void;
     clear(): void;
@@ -193,11 +143,55 @@ declare class SessionManager implements ISessionManager {
     getRefreshToken(): string | undefined;
     getSessionId(): string | undefined;
     isAuthenticated(): boolean;
-    initialize(): void;
-    private setAuthToken;
-    private clearAuthToken;
 }
 
+interface HttpClientConfig {
+    baseURL?: string;
+    timeout?: number;
+    headers?: Record<string, string>;
+    onUnauthorized?: (error: HttpError) => void;
+}
+interface RequestConfig extends Omit<RequestInit, 'body'> {
+    params?: Record<string, string | number | boolean>;
+    data?: any;
+    timeout?: number;
+}
+interface HttpResponse<T = any> {
+    data: T;
+    status: number;
+    statusText: string;
+    headers: Headers;
+}
+interface ErrorData {
+    code: number;
+    message: string;
+}
+interface HttpError extends Error {
+    status?: number;
+    statusText?: string;
+    data?: ErrorData;
+}
+
+declare class HttpClient {
+    private baseURL;
+    private timeout;
+    private defaultHeaders;
+    private onUnauthorized?;
+    constructor(config?: HttpClientConfig);
+    private buildURL;
+    private request;
+    setOnUnauthorized(handler: (error: HttpError) => void): void;
+    setDefaultHeader(key: string, value: string): void;
+    removeDefaultHeader(key: string): void;
+    getDefaultHeaders(): Record<string, string>;
+    get<T = any>(url: string, config?: RequestConfig): Promise<HttpResponse<T>>;
+    post<T = any>(url: string, data?: any, config?: RequestConfig): Promise<HttpResponse<T>>;
+    put<T = any>(url: string, data?: any, config?: RequestConfig): Promise<HttpResponse<T>>;
+    patch<T = any>(url: string, data?: any, config?: RequestConfig): Promise<HttpResponse<T>>;
+    delete<T = any>(url: string, config?: RequestConfig): Promise<HttpResponse<T>>;
+}
+declare function extractErrorMessage(error: any): string;
+
 interface IAuthService {
     signIn(request: SignInRequest): Promise<SignInResponse>;
     refreshToken(request?: Partial<RefreshTokenRequest>): Promise<RefreshTokenResponse>;

package/dist/index.js

@@ -1428,21 +1428,20 @@ function formatDate(date, options = {
 // src/auth/sessionManager.ts
 var SESSION_KEY = "session_details";
 var SessionManager = class _SessionManager {
-  constructor(client, key = SESSION_KEY) {
+  constructor(key = SESSION_KEY) {
+    // private readonly client: HttpClient
     this.cache = null;
-    this.client = client;
     this.key = key;
   }
-  static getInstance(client) {
+  static getInstance() {
     if (!_SessionManager.instance) {
-      _SessionManager.instance = new _SessionManager(client);
+      _SessionManager.instance = new _SessionManager();
     }
     return _SessionManager.instance;
   }
   save(session) {
     this.cache = session;
     LocalStorage.setItem(this.key, session);
-    this.setAuthToken(session.accessToken);
   }
   patch(updates) {
     const current = this.get();
@@ -1450,14 +1449,10 @@ var SessionManager = class _SessionManager {
     const updated = { ...current, ...updates };
     this.cache = updated;
     LocalStorage.setItem(this.key, updated);
-    if (updates.accessToken) {
-      this.setAuthToken(updates.accessToken);
-    }
   }
   clear() {
     this.cache = null;
     LocalStorage.removeItem(this.key);
-    this.clearAuthToken();
   }
   get() {
     if (this.cache !== null) return this.cache;
@@ -1478,20 +1473,6 @@ var SessionManager = class _SessionManager {
     if (!session?.accessToken) return false;
     return Number(session.expiresAt) > Date.now() / 1e3;
   }
-  initialize() {
-    const session = this.get();
-    if (session?.accessToken && Number(session.expiresAt) > Date.now() / 1e3) {
-      this.setAuthToken(session.accessToken);
-    } else {
-      this.clear();
-    }
-  }
-  setAuthToken(token) {
-    this.client.setDefaultHeader("Authorization", `Bearer ${token}`);
-  }
-  clearAuthToken() {
-    this.client.removeDefaultHeader("Authorization");
-  }
 };
 
 // src/auth/authService.ts
@@ -1499,7 +1480,7 @@ var BASE_URL = "/openauth/v1";
 var AuthService = class _AuthService {
   constructor(client) {
     this.client = client;
-    this.sessionManager = SessionManager.getInstance(client);
+    this.sessionManager = SessionManager.getInstance();
   }
   static getInstance(client) {
     if (!_AuthService.instance) {
@@ -1514,6 +1495,7 @@ var AuthService = class _AuthService {
     );
     if (response.data.accessToken) {
       this.sessionManager.save(response.data);
+      this.client.setDefaultHeader("Authorization", `Bearer ${response.data.accessToken}`);
     }
     return response.data;
   }
@@ -1531,6 +1513,7 @@ var AuthService = class _AuthService {
         accessToken: response.data.accessToken,
         refreshToken: response.data.refreshToken
       });
+      this.client.setDefaultHeader("Authorization", `Bearer ${response.data.accessToken}`);
     }
     return response.data;
   }
@@ -1544,6 +1527,7 @@ var AuthService = class _AuthService {
       return response.data;
     } finally {
       this.sessionManager.clear();
+      this.client.removeDefaultHeader("Authorization");
     }
   }
   async generateLoginToken(request) {
@@ -1560,6 +1544,7 @@ var AuthService = class _AuthService {
     );
     if (response.data.accessToken) {
       this.sessionManager.save(response.data);
+      this.client.setDefaultHeader("Authorization", `Bearer ${response.data.accessToken}`);
     }
     return response.data;
   }
@@ -1576,7 +1561,12 @@ var AuthService = class _AuthService {
     return this.sessionManager.getSessionId();
   }
   initializeAuth() {
-    this.sessionManager.initialize();
+    const session = this.sessionManager.get();
+    if (session?.accessToken && Number(session.expiresAt) > Date.now() / 1e3) {
+      this.client.setDefaultHeader("Authorization", `Bearer ${session.accessToken}`);
+    } else {
+      this.client.removeDefaultHeader("Authorization");
+    }
   }
 };