@phygitallabs/tapquest-core 4.8.0 → 6.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phygitallabs/tapquest-core",
-  "version": "4.8.0",
+  "version": "6.1.0",
   "private": false,
   "publishConfig": {
     "access": "public"

package/src/modules/auth/hooks/index.ts

@@ -1,2 +1,6 @@
 export { useGoogleLogin } from "./useGoogleLogin";
-export type { UseGoogleLoginOptions, UseGoogleLoginReturn } from "./useGoogleLogin";
+export type {
+  UseGoogleLoginOptions,
+  UseGoogleLoginReturn,
+} from "./useGoogleLogin";
+export { useTokenRefresher } from "./useTokenRefresher";

package/src/modules/auth/hooks/useGoogleLogin.ts

@@ -1,4 +1,4 @@
-import { useRef, useCallback, useEffect } from "react";
+import { useRef, useCallback, useEffect, useState } from "react";
 import { useAuth } from "../store/authStore";
 import { tokenStorage } from "@phygitallabs/authentication";
 import { ALLOWED_ORIGINS } from "../constants";
@@ -12,14 +12,23 @@ export interface UseGoogleLoginOptions {
 }
 
 export interface UseGoogleLoginReturn {
-  signIn: () => Promise<void>;
+  signIn: () => void;
   isLoading: boolean;
   error: string | null;
 }
 
-export function useGoogleLogin(options: UseGoogleLoginOptions = {}): UseGoogleLoginReturn {
+export function useGoogleLogin(
+  options: UseGoogleLoginOptions = {}
+): UseGoogleLoginReturn {
   const { onSuccess, onError, onPopupBlocked, onPopupClosed } = options;
-  const { signInWithGoogle, refreshToken, setIsSignedIn, setIsLoading, isLoading } = useAuth();
+  const {
+    signInWithGoogle,
+    refreshToken,
+    setIsSignedIn,
+    setIsLoading,
+    isLoading,
+  } = useAuth();
+  const [googleLink, setGoogleLink] = useState<string | null>(null);
 
   const popupRef = useRef<Window | null>(null);
   const gotDataRef = useRef(false);
@@ -37,14 +46,15 @@ export function useGoogleLogin(options: UseGoogleLoginOptions = {}): UseGoogleLo
               refreshToken: newToken.data.refreshToken,
             });
 
-            const userData = decodeJWTToken(newToken.data.idToken);            
+            const userData = decodeJWTToken(newToken.data.idToken);
 
             setIsSignedIn(true);
             setIsLoading(false);
             onSuccess?.(userData);
           }
         } catch (error) {
-          const errorMessage = error instanceof Error ? error.message : "Token refresh failed";
+          const errorMessage =
+            error instanceof Error ? error.message : "Token refresh failed";
           errorRef.current = errorMessage;
           onError?.(errorMessage);
           setIsLoading(false);
@@ -59,6 +69,7 @@ export function useGoogleLogin(options: UseGoogleLoginOptions = {}): UseGoogleLo
       clearInterval(timerRef.current);
       timerRef.current = null;
     }
+
     gotDataRef.current = false;
   }, []);
 
@@ -68,7 +79,10 @@ export function useGoogleLogin(options: UseGoogleLoginOptions = {}): UseGoogleLo
       const allowedOrigins = ALLOWED_ORIGINS.concat(window?.location?.origin);
 
       // Allow wildcard origin from callback.html (but validate message structure)
-      if (event.origin !== "*" && !allowedOrigins.includes(event.origin as string)) {
+      if (
+        event.origin !== "*" &&
+        !allowedOrigins.includes(event.origin as string)
+      ) {
         console.warn("Rejected message from untrusted origin:", event.origin);
         return;
       }
@@ -78,7 +92,6 @@ export function useGoogleLogin(options: UseGoogleLoginOptions = {}): UseGoogleLo
         console.warn("Invalid message data received");
         return;
       }
-
       if (event.data.type === "LOGIN_SUCCESS") {
         const { refreshToken: refresh } = event.data;
 
@@ -100,19 +113,39 @@ export function useGoogleLogin(options: UseGoogleLoginOptions = {}): UseGoogleLo
     [handleTokenRefresh, setIsLoading, cleanup, onError]
   );
 
-  const signIn = useCallback(async (): Promise<void> => {
+  useEffect(() => {
+    const fetchGoogleLink = async () => {
+      try {
+        const response = await signInWithGoogle();
+        setGoogleLink(response.statusMessage || "");
+      } catch (error) {
+        console.error("error", error);
+        setGoogleLink("");
+      }
+    };
+    fetchGoogleLink();
+  }, []);
+
+  const signIn = useCallback((): void => {
     const width = 500;
     const height = 600;
     const left = window.screenX + (window.outerWidth - width) / 2;
     const top = window.screenY + (window.outerHeight - height) / 2;
 
     try {
+      if (googleLink === null) return;
+      if (googleLink === "") {
+        const error = "Google sign in failed. Please try again later.";
+        errorRef.current = error;
+        onError?.(error);
+        return;
+      }
+
       errorRef.current = null;
       setIsLoading(true);
-      const response = await signInWithGoogle();
 
       popupRef.current = window.open(
-        `${response.statusMessage}`,
+        googleLink,
         "oauthPopup",
         `width=${width},height=${height},left=${left},top=${top},resizable,scrollbars`
       );
@@ -143,12 +176,21 @@ export function useGoogleLogin(options: UseGoogleLoginOptions = {}): UseGoogleLo
         }
       }, 500);
     } catch (error: any) {
-      const errorMessage = error instanceof Error ? error.message : "Google sign in failed";
+      const errorMessage =
+        error instanceof Error ? error.message : "Google sign in failed";
       errorRef.current = errorMessage;
       onError?.(errorMessage);
       setIsLoading(false);
     }
-  }, [signInWithGoogle, setIsLoading, handleMessage, onError, onPopupBlocked, onPopupClosed]);
+  }, [
+    signInWithGoogle,
+    setIsLoading,
+    handleMessage,
+    onError,
+    onPopupBlocked,
+    onPopupClosed,
+    googleLink,
+  ]);
 
   useEffect(() => {
     window.addEventListener("message", handleMessage);
@@ -162,7 +204,7 @@ export function useGoogleLogin(options: UseGoogleLoginOptions = {}): UseGoogleLo
     return () => {
       cleanup();
     };
-  }, [cleanup, handleMessage]);
+  }, [cleanup]);
 
   return {
     signIn,

package/src/modules/auth/index.ts

@@ -9,18 +9,19 @@ export type {
   UseAuthReturn,
   AuthProviderProps,
   AuthCallbacks,
-} from './types';
+} from "./types";
 
 // Export hooks and providers
-export { AuthProvider } from './providers';
+export { AuthProvider } from "./providers";
 
 // Export auth hooks from store
-export { useAuth } from './store/authStore';
+export { useAuth, useAuthStore } from "./store/authStore";
 
 // Export auth hooks
-export { useGoogleLogin } from './hooks';
-export type { UseGoogleLoginOptions, UseGoogleLoginReturn } from './hooks';
+export { useGoogleLogin, useTokenRefresher } from "./hooks";
+export type { UseGoogleLoginOptions, UseGoogleLoginReturn } from "./hooks";
 
 // Export constants and helpers
-export * from './constants';
-export * from './helpers';
+export * from "./constants";
+export * from "./helpers";
+export * from "./utils/user";

package/src/modules/auth/utils/user.ts

@@ -1,6 +1,6 @@
 import { UserData, UserRole, UserType } from "../types/user-data";
 import { UserModel } from "@phygitallabs/api-core";
-import jwtDecode from "jwt-decode";
+import { jwtDecode } from "jwt-decode";
 
 export const transformProtoUserData = (user: UserModel, accessToken: string): UserData => {
   const userData = { ...user } as UserData;

package/src/providers/ServicesProvider.tsx

@@ -59,6 +59,7 @@ export const ServicesProvider: React.FC<ServicesProviderProps> = ({
 
                             setToLS(retryAttemptsRefreshToken, `${retryAttempts + 1}`);
                             originalRequest._retry = true;
+
                             if (token) {
                                 try {
                                     const result = await refreshToken();
@@ -67,7 +68,9 @@ export const ServicesProvider: React.FC<ServicesProviderProps> = ({
                                         return axios(originalRequest);
                                     }
                                 } catch (refreshError) {
-                                    console.log("Failed to refresh token:", refreshError);
+                                    console.error("Failed to refresh token:", refreshError);
+                                    await signOut();
+                                    return Promise.reject(refreshError);
                                 }
                             }
                         }