@go-avro/avro-js 0.0.2-beta.76 → 0.0.2-beta.78

package/dist/auth/AuthManager.d.ts

@@ -3,6 +3,7 @@ export declare class AuthManager {
     private storages;
     private baseUrl;
     private tokenRefreshedCallbacks;
+    private tokenRefreshFailedCallbacks;
     constructor({ baseUrl, storage, }: {
         baseUrl: string;
         storage: TokenStorage | TokenStorage[];
@@ -11,6 +12,7 @@ export declare class AuthManager {
     fetchNewTokens(): Promise<Tokens>;
     accessToken(): Promise<string | undefined>;
     onTokenRefreshed(callback: (accessToken: string) => void): void;
+    onTokenRefreshFailed(callback: () => void): void;
     refreshTokens(): Promise<Tokens | null>;
     setTokens(tokens: Tokens): Promise<void>;
     clearTokens(): Promise<void>;

package/dist/auth/AuthManager.js

@@ -1,6 +1,7 @@
 export class AuthManager {
     constructor({ baseUrl, storage, }) {
         this.tokenRefreshedCallbacks = [];
+        this.tokenRefreshFailedCallbacks = [];
         this.storages = Array.isArray(storage) ? storage : [storage];
         if (this.storages.length === 0) {
             throw new Error('At least one token storage must be provided');
@@ -92,6 +93,9 @@ export class AuthManager {
     onTokenRefreshed(callback) {
         this.tokenRefreshedCallbacks.push(callback);
     }
+    onTokenRefreshFailed(callback) {
+        this.tokenRefreshFailedCallbacks.push(callback);
+    }
     async refreshTokens() {
         try {
             const newToken = await this.fetchNewTokens();
@@ -103,6 +107,7 @@ export class AuthManager {
             return newToken;
         }
         catch (error) {
+            this.tokenRefreshFailedCallbacks.forEach(cb => cb());
             console.error('Failed to refresh tokens:', error);
             return null;
         }

package/dist/client/QueryClient.d.ts

@@ -246,6 +246,7 @@ declare module '../client/QueryClient' {
 export declare class AvroQueryClient {
     protected config: Required<AvroQueryClientConfig>;
     readonly socket: Socket;
+    _isAuthenticated: boolean;
     constructor(config: AvroQueryClientConfig);
     emit(eventName: string, data: unknown): void;
     on<T>(eventName: string, callback: (data: T) => void): void;
@@ -254,13 +255,16 @@ export declare class AvroQueryClient {
     post<T>(path: string, data: any, cancelToken?: CancelToken, headers?: Record<string, string>, progressUpdateCallback?: (loaded: number, total: number) => void): Promise<T>;
     put<T>(path: string, data: any, cancelToken?: CancelToken, headers?: Record<string, string>, progressUpdateCallback?: (loaded: number, total: number) => void): Promise<T>;
     delete<T>(path: string, cancelToken?: CancelToken, headers?: Record<string, string>, progressUpdateCallback?: (loaded: number, total: number) => void): Promise<T>;
-    login(data: {
+    useLogin(): ReturnType<typeof useMutation<LoginResponse, StandardError, {
         username: string;
         password: string;
         code?: string;
-    }, cancelToken?: CancelToken): Promise<LoginResponse>;
+        cancelToken?: CancelToken;
+    }>>;
     setTokens(tokens: Tokens): Promise<void>;
     clearTokens(): Promise<void>;
+    isAuthenticated(): boolean;
+    isAuthenticatedAsync(): Promise<boolean>;
     useLogout(): ReturnType<typeof useMutation<void, StandardError, CancelToken | undefined>>;
     fetchJobs(companyGuid: string, body?: {
         amt?: number;

package/dist/client/QueryClient.js

@@ -4,6 +4,7 @@ import { LoginResponse } from '../types/api';
 import { StandardError } from '../types/error';
 export class AvroQueryClient {
     constructor(config) {
+        this._isAuthenticated = false;
         this.config = {
             baseUrl: config.baseUrl,
             authManager: config.authManager,
@@ -11,6 +12,9 @@ export class AvroQueryClient {
             retryStrategy: config.retryStrategy ?? 'fixed',
             timeout: config.timeout ?? 0,
         };
+        config.authManager.isAuthenticated().then(isAuth => {
+            this._isAuthenticated = isAuth;
+        });
         this.socket = io(config.baseUrl, { autoConnect: false, transports: ["websocket"], });
         if (!this.socket.connected) {
             this.config.authManager.accessToken().then(token => {
@@ -20,6 +24,7 @@ export class AvroQueryClient {
             });
         }
         this.socket.on('connect', () => {
+            this._isAuthenticated = true;
             console.log(`Socket connected with ID: ${this.socket?.id}`);
         });
         this.socket.on('disconnect', (reason) => {
@@ -30,11 +35,18 @@ export class AvroQueryClient {
         });
         this.config.authManager.onTokenRefreshed((newAccessToken) => {
             if (this.socket && newAccessToken) {
+                this._isAuthenticated = true;
                 console.log('Access token refreshed, updating socket auth...');
                 this.socket.auth = { token: newAccessToken };
                 this.socket.disconnect().connect();
             }
         });
+        config.authManager.onTokenRefreshFailed(() => {
+            this._isAuthenticated = false;
+            if (this.socket && this.socket.connected) {
+                this.socket.disconnect();
+            }
+        });
     }
     emit(eventName, data) {
         if (!this.socket?.connected) {
@@ -61,26 +73,32 @@ export class AvroQueryClient {
     delete(path, cancelToken, headers = {}, progressUpdateCallback) {
         return this._xhr('DELETE', path, null, cancelToken, headers, false, this.config.maxRetries, progressUpdateCallback);
     }
-    login(data, cancelToken) {
-        return this._fetch('POST', '/login', data, cancelToken)
-            .then(resp => {
-            if (!resp || !('access_token' in resp)) {
-                if (resp.msg === "TOTP email sent") {
-                    return LoginResponse.NEEDS_TOTP;
+    useLogin() {
+        const queryClient = useQueryClient();
+        return useMutation({
+            mutationFn: async ({ username, password, code, cancelToken }) => {
+                const resp = await this._fetch('POST', '/login', { username, password, code }, cancelToken);
+                if (!resp || !('access_token' in resp)) {
+                    if (resp.msg === "TOTP email sent") {
+                        return LoginResponse.NEEDS_TOTP;
+                    }
+                    throw new StandardError(401, 'Invalid login response');
                 }
-                throw new StandardError(401, 'Invalid login response');
-            }
-            this.socket.auth = { token: resp.access_token };
-            if (!this.socket.connected) {
-                this.socket.connect();
-            }
-            return this.config.authManager.setTokens({ access_token: resp.access_token, refresh_token: resp.refresh_token }).then(() => {
+                this.socket.auth = { token: resp.access_token };
+                if (!this.socket.connected) {
+                    this.socket.connect();
+                }
+                await this.config.authManager.setTokens({ access_token: resp.access_token, refresh_token: resp.refresh_token });
                 return LoginResponse.SUCCESS;
-            });
-        })
-            .catch(err => {
-            console.error('Login failed:', err);
-            throw new StandardError(401, 'Login failed');
+            },
+            onSettled: () => {
+                queryClient.invalidateQueries();
+            },
+            onError: (err) => {
+                this.config.authManager.clearTokens();
+                console.error('Login failed:', err);
+                throw new StandardError(401, 'Login failed');
+            }
         });
     }
     setTokens(tokens) {
@@ -89,6 +107,12 @@ export class AvroQueryClient {
     clearTokens() {
         return this.config.authManager.clearTokens();
     }
+    isAuthenticated() {
+        return this._isAuthenticated;
+    }
+    isAuthenticatedAsync() {
+        return this.config.authManager.isAuthenticated();
+    }
     useLogout() {
         const queryClient = useQueryClient();
         return useMutation({
@@ -100,6 +124,7 @@ export class AvroQueryClient {
                 }
             },
             onSettled: () => {
+                this._isAuthenticated = false;
                 queryClient.invalidateQueries();
             },
             onError: (err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-avro/avro-js",
-  "version": "0.0.2-beta.76",
+  "version": "0.0.2-beta.78",
   "description": "JS client for Avro backend integration.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",