@umituz/react-native-auth 3.4.19 → 3.4.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-auth",
-  "version": "3.4.19",
+  "version": "3.4.20",
   "description": "Authentication service for React Native apps - Secure, type-safe, and production-ready. Provider-agnostic design with dependency injection, configurable validation, and comprehensive error handling.",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/presentation/components/AuthBottomSheet.tsx

@@ -63,13 +63,6 @@ export const AuthBottomSheet: React.FC<AuthBottomSheetProps> = ({
     }
   }, [isVisible]);
 
-  useEffect(() => {
-    if (isAuthenticated && !isAnonymous && isVisible) {
-      hideAuthModal();
-      executePendingCallback();
-    }
-  }, [isAuthenticated, isAnonymous, isVisible, hideAuthModal, executePendingCallback]);
-
   const handleDismiss = useCallback(() => {
     hideAuthModal();
     clearPendingCallback();
@@ -80,6 +73,26 @@ export const AuthBottomSheet: React.FC<AuthBottomSheetProps> = ({
     handleDismiss();
   }, [handleDismiss]);
 
+  const prevIsAuthenticatedRef = useRef(isAuthenticated);
+  const prevIsVisibleRef = useRef(isVisible);
+
+  useEffect(() => {
+    // Only close the modal if the user was NOT authenticated and then BECOMES authenticated 
+    // while the modal is visible.
+    if (!prevIsAuthenticatedRef.current && isAuthenticated && isVisible && !isAnonymous) {
+      if (typeof __DEV__ !== "undefined" && __DEV__) {
+        // eslint-disable-next-line no-console
+        console.log("[AuthBottomSheet] Auto-closing due to successful authentication transition");
+      }
+      handleClose();
+      executePendingCallback();
+    }
+    
+    // Update ref for next render
+    prevIsAuthenticatedRef.current = isAuthenticated;
+    prevIsVisibleRef.current = isVisible;
+  }, [isAuthenticated, isVisible, isAnonymous, executePendingCallback, handleClose]);
+
   const handleNavigateToRegister = useCallback(() => {
     setMode("register");
   }, [setMode]);

package/src/presentation/hooks/useGoogleAuth.ts

@@ -14,51 +14,10 @@ import {
   type SocialAuthResult,
 } from "@umituz/react-native-firebase";
 
-// Type declarations for expo-auth-session
-interface GoogleAuthRequestConfig {
-  iosClientId: string;
-  webClientId: string;
-  androidClientId: string;
-}
-
-interface AuthSessionAuthentication {
-  idToken?: string;
-  accessToken?: string;
-}
-
-interface AuthSessionResult {
-  type: "success" | "cancel" | "dismiss" | "error" | "locked";
-  authentication?: AuthSessionAuthentication;
-}
-
-interface AuthRequest {
-  promptAsync: () => Promise<AuthSessionResult>;
-}
+import * as Google from "expo-auth-session/providers/google";
+import * as WebBrowser from "expo-web-browser";
 
-type UseAuthRequestReturn = [
-  AuthRequest | null,
-  AuthSessionResult | null,
-  () => Promise<AuthSessionResult>,
-];
-
-// Dynamic imports to handle optional dependencies
-type GoogleModule = { useAuthRequest: (config: GoogleAuthRequestConfig) => UseAuthRequestReturn };
-type WebBrowserModule = { maybeCompleteAuthSession: () => void };
-
-let Google: GoogleModule | null = null;
-let WebBrowser: WebBrowserModule | null = null;
-
-try {
-  // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
-  Google = require("expo-auth-session/providers/google") as GoogleModule;
-  // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
-  WebBrowser = require("expo-web-browser") as WebBrowserModule;
-  if (WebBrowser) {
-    WebBrowser.maybeCompleteAuthSession();
-  }
-} catch {
-  // expo-auth-session not available - silent fallback
-}
+WebBrowser.maybeCompleteAuthSession();
 
 export interface GoogleAuthConfig {
   iosClientId?: string;
@@ -123,7 +82,7 @@ export function useGoogleAuth(config?: GoogleAuthConfig): UseGoogleAuthResult {
   }, [googleResponse, signInWithGoogleToken]);
 
   const signInWithGoogle = useCallback(async (): Promise<SocialAuthResult> => {
-    if (!Google || !promptGoogleAsync) {
+    if (!promptGoogleAsync) {
       return { success: false, error: "expo-auth-session is not available" };
     }