@umituz/react-native-auth 3.4.21 → 3.4.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-auth",
-  "version": "3.4.21",
+  "version": "3.4.22",
   "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/index.ts

@@ -173,7 +173,7 @@ export { useAppleAuth } from './presentation/hooks/useAppleAuth';
 export type { UseAppleAuthResult } from './presentation/hooks/useAppleAuth';
 
 export { useAuthBottomSheet } from './presentation/hooks/useAuthBottomSheet';
-export { useAuthBottomSheetWrapper } from './presentation/hooks/useAuthBottomSheetWrapper';
+export type { SocialAuthConfiguration } from './presentation/hooks/useAuthBottomSheet';
 
 export type { UserProfile, UpdateProfileParams } from './domain/entities/UserProfile';
 
@@ -219,9 +219,6 @@ export { PasswordMatchIndicator } from './presentation/components/PasswordMatchI
 export type { PasswordMatchIndicatorProps } from './presentation/components/PasswordMatchIndicator';
 export { AuthBottomSheet } from './presentation/components/AuthBottomSheet';
 export type { AuthBottomSheetProps } from './presentation/components/AuthBottomSheet';
-export { AuthBottomSheetWrapper } from './presentation/components/AuthBottomSheetWrapper';
-export type { AuthBottomSheetWrapperProps } from './presentation/components/AuthBottomSheetWrapper';
-export type { SocialAuthConfiguration } from './presentation/hooks/useAuthBottomSheetWrapper';
 export { SocialLoginButtons } from './presentation/components/SocialLoginButtons';
 export type { SocialLoginButtonsProps } from './presentation/components/SocialLoginButtons';
 export { ProfileSection } from './presentation/components/ProfileSection';

package/src/presentation/components/AuthBottomSheet.tsx

@@ -13,23 +13,22 @@ import {
   BottomSheetModal,
 } from "@umituz/react-native-design-system";
 import { useLocalization } from "@umituz/react-native-localization";
-import { useAuthBottomSheet } from "../hooks/useAuthBottomSheet";
+import { useAuthBottomSheet, type SocialAuthConfiguration } from "../hooks/useAuthBottomSheet";
 import { LoginForm } from "./LoginForm";
 import { RegisterForm } from "./RegisterForm";
 import { SocialLoginButtons } from "./SocialLoginButtons";
 import { styles } from "./AuthBottomSheet.styles";
-import type { SocialAuthProvider } from "../../domain/value-objects/AuthConfig";
 
 export interface AuthBottomSheetProps {
   termsUrl?: string;
   privacyUrl?: string;
   onTermsPress?: () => void;
   onPrivacyPress?: () => void;
-  /** Enabled social auth providers */
-  socialProviders?: SocialAuthProvider[];
-  /** Called when Google sign-in is requested */
+  /** Social auth configuration */
+  socialConfig?: SocialAuthConfiguration;
+  /** Called when Google sign-in is requested (overrides internal behavior) */
   onGoogleSignIn?: () => Promise<void>;
-  /** Called when Apple sign-in is requested */
+  /** Called when Apple sign-in is requested (overrides internal behavior) */
   onAppleSignIn?: () => Promise<void>;
 }
 
@@ -38,7 +37,7 @@ export const AuthBottomSheet: React.FC<AuthBottomSheetProps> = ({
   privacyUrl,
   onTermsPress,
   onPrivacyPress,
-  socialProviders = [],
+  socialConfig,
   onGoogleSignIn,
   onAppleSignIn,
 }) => {
@@ -50,13 +49,14 @@ export const AuthBottomSheet: React.FC<AuthBottomSheetProps> = ({
     googleLoading,
     appleLoading,
     mode,
+    providers,
     handleDismiss,
     handleClose,
     handleNavigateToRegister,
     handleNavigateToLogin,
     handleGoogleSignIn,
     handleAppleSignIn,
-  } = useAuthBottomSheet({ onGoogleSignIn, onAppleSignIn });
+  } = useAuthBottomSheet({ socialConfig, onGoogleSignIn, onAppleSignIn });
 
   return (
     <BottomSheetModal
@@ -106,9 +106,9 @@ export const AuthBottomSheet: React.FC<AuthBottomSheetProps> = ({
             />
           )}
 
-          {socialProviders.length > 0 && (
+          {providers.length > 0 && (
             <SocialLoginButtons
-              enabledProviders={socialProviders}
+              enabledProviders={providers}
               onGooglePress={() => { void handleGoogleSignIn(); }}
               onApplePress={() => { void handleAppleSignIn(); }}
               googleLoading={googleLoading}

package/src/presentation/hooks/useAuthBottomSheet.ts

@@ -1,14 +1,28 @@
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { Platform } from "react-native";
 import type { BottomSheetModalRef } from "@umituz/react-native-design-system";
 import { useAuthModalStore } from "../stores/authModalStore";
 import { useAuth } from "../hooks/useAuth";
+import { useGoogleAuth, type GoogleAuthConfig } from "./useGoogleAuth";
+import { useAppleAuth } from "./useAppleAuth";
+import type { SocialAuthProvider } from "../../domain/value-objects/AuthConfig";
 
-interface UseAuthBottomSheetProps {
+declare const __DEV__: boolean;
+
+export interface SocialAuthConfiguration {
+  google?: GoogleAuthConfig;
+  apple?: { enabled: boolean };
+}
+
+interface UseAuthBottomSheetParams {
+  socialConfig?: SocialAuthConfiguration;
   onGoogleSignIn?: () => Promise<void>;
   onAppleSignIn?: () => Promise<void>;
 }
 
-export function useAuthBottomSheet({ onGoogleSignIn, onAppleSignIn }: UseAuthBottomSheetProps) {
+export function useAuthBottomSheet(params: UseAuthBottomSheetParams = {}) {
+  const { socialConfig, onGoogleSignIn, onAppleSignIn } = params;
+  
   const modalRef = useRef<BottomSheetModalRef>(null);
   const [googleLoading, setGoogleLoading] = useState(false);
   const [appleLoading, setAppleLoading] = useState(false);
@@ -17,6 +31,25 @@ export function useAuthBottomSheet({ onGoogleSignIn, onAppleSignIn }: UseAuthBot
     useAuthModalStore();
   const { isAuthenticated, isAnonymous } = useAuth();
 
+  // Social Auth Hooks
+  const { signInWithGoogle, googleConfigured } = useGoogleAuth(socialConfig?.google);
+  const { signInWithApple, appleAvailable } = useAppleAuth();
+
+  // Determine enabled providers
+  const providers = useMemo<SocialAuthProvider[]>(() => {
+    const result: SocialAuthProvider[] = [];
+
+    if (Platform.OS === "ios" && socialConfig?.apple?.enabled && appleAvailable) {
+      result.push("apple");
+    }
+
+    if (googleConfigured) {
+      result.push("google");
+    }
+
+    return result;
+  }, [socialConfig?.apple?.enabled, appleAvailable, googleConfigured]);
+
   // Handle visibility sync with modalRef
   useEffect(() => {
     if (isVisible) {
@@ -41,14 +74,13 @@ export function useAuthBottomSheet({ onGoogleSignIn, onAppleSignIn }: UseAuthBot
   const prevIsAnonymousRef = useRef(isAnonymous);
 
   useEffect(() => {
-    // Determine if user just successfully authenticated (either A: were not authed at all, or B: were anonymous and now aren't)
     const justAuthenticated = !prevIsAuthenticatedRef.current && isAuthenticated;
     const justConvertedFromAnonymous = prevIsAnonymousRef.current && !isAnonymous && isAuthenticated;
 
     if ((justAuthenticated || justConvertedFromAnonymous) && isVisible && !isAnonymous) {
       if (typeof __DEV__ !== "undefined" && __DEV__) {
         // eslint-disable-next-line no-console
-        console.log("[AuthBottomSheet] Auto-closing due to successful authentication transition", {
+        console.log("[useAuthBottomSheet] Auto-closing due to successful authentication transition", {
           justAuthenticated,
           justConvertedFromAnonymous,
         });
@@ -57,7 +89,6 @@ export function useAuthBottomSheet({ onGoogleSignIn, onAppleSignIn }: UseAuthBot
       executePendingCallback();
     }
     
-    // Update refs for next render
     prevIsAuthenticatedRef.current = isAuthenticated;
     prevIsVisibleRef.current = isVisible;
     prevIsAnonymousRef.current = isAnonymous;
@@ -71,36 +102,43 @@ export function useAuthBottomSheet({ onGoogleSignIn, onAppleSignIn }: UseAuthBot
     setMode("login");
   }, [setMode]);
 
-  const handleGoogleSignIn = useCallback(async () => {
-    if (!onGoogleSignIn) return;
+  const handleGoogleSignInInternal = useCallback(async () => {
     setGoogleLoading(true);
     try {
-      await onGoogleSignIn();
+      if (onGoogleSignIn) {
+        await onGoogleSignIn();
+      } else if (signInWithGoogle) {
+        await signInWithGoogle();
+      }
     } finally {
       setGoogleLoading(false);
     }
-  }, [onGoogleSignIn]);
+  }, [onGoogleSignIn, signInWithGoogle]);
 
-  const handleAppleSignIn = useCallback(async () => {
-    if (!onAppleSignIn) return;
+  const handleAppleSignInInternal = useCallback(async () => {
     setAppleLoading(true);
     try {
-      await onAppleSignIn();
+      if (onAppleSignIn) {
+        await onAppleSignIn();
+      } else if (signInWithApple) {
+        await signInWithApple();
+      }
     } finally {
       setAppleLoading(false);
     }
-  }, [onAppleSignIn]);
+  }, [onAppleSignIn, signInWithApple]);
 
   return {
     modalRef,
     googleLoading,
     appleLoading,
     mode,
+    providers,
     handleDismiss,
     handleClose,
     handleNavigateToRegister,
     handleNavigateToLogin,
-    handleGoogleSignIn,
-    handleAppleSignIn,
+    handleGoogleSignIn: handleGoogleSignInInternal,
+    handleAppleSignIn: handleAppleSignInInternal,
   };
 }

package/src/presentation/components/AuthBottomSheetWrapper.tsx

@@ -1,63 +0,0 @@
-/**
- * AuthBottomSheetWrapper Component
- * Self-contained auth modal with integrated social login
- *
- * This wrapper component combines AuthBottomSheet with social auth hooks,
- * providing a complete authentication solution for apps.
- *
- * Usage:
- * ```tsx
- * <AuthBottomSheetWrapper
- *   termsUrl="https://myapp.com/terms"
- *   privacyUrl="https://myapp.com/privacy"
- *   socialConfig={{
- *     google: { webClientId: '...', iosClientId: '...' },
- *     apple: { enabled: true }
- *   }}
- * />
- * ```
- */
-
-import React from "react";
-import { AuthBottomSheet } from "./AuthBottomSheet";
-import { useAuthBottomSheetWrapper, type SocialAuthConfiguration } from "../hooks/useAuthBottomSheetWrapper";
-
-export interface AuthBottomSheetWrapperProps {
-  /** Terms of Service URL */
-  termsUrl?: string;
-  /** Privacy Policy URL */
-  privacyUrl?: string;
-  /** Called when Terms link is pressed (overrides default behavior) */
-  onTermsPress?: () => void;
-  /** Called when Privacy link is pressed (overrides default behavior) */
-  onPrivacyPress?: () => void;
-  /** Social auth configuration */
-  socialConfig?: SocialAuthConfiguration;
-}
-
-/**
- * Self-contained auth bottom sheet with integrated social login
- */
-export const AuthBottomSheetWrapper: React.FC<AuthBottomSheetWrapperProps> = ({
-  termsUrl,
-  privacyUrl,
-  onTermsPress,
-  onPrivacyPress,
-  socialConfig,
-}) => {
-  const { providers, handleGoogleSignIn, handleAppleSignIn } = useAuthBottomSheetWrapper({
-    socialConfig,
-  });
-
-  return (
-    <AuthBottomSheet
-      termsUrl={termsUrl}
-      privacyUrl={privacyUrl}
-      onTermsPress={onTermsPress}
-      onPrivacyPress={onPrivacyPress}
-      socialProviders={providers}
-      onGoogleSignIn={handleGoogleSignIn}
-      onAppleSignIn={handleAppleSignIn}
-    />
-  );
-};

package/src/presentation/hooks/useAuthBottomSheetWrapper.ts

@@ -1,70 +0,0 @@
-import { useCallback, useMemo } from "react";
-import { Platform } from "react-native";
-import { useGoogleAuth, type GoogleAuthConfig } from "./useGoogleAuth";
-import { useAppleAuth } from "./useAppleAuth";
-import type { SocialAuthProvider } from "../../domain/value-objects/AuthConfig";
-
-declare const __DEV__: boolean;
-
-export interface SocialAuthConfiguration {
-  google?: GoogleAuthConfig;
-  apple?: { enabled: boolean };
-}
-
-interface UseAuthBottomSheetWrapperProps {
-  socialConfig?: SocialAuthConfiguration;
-}
-
-export function useAuthBottomSheetWrapper({ socialConfig }: UseAuthBottomSheetWrapperProps) {
-  const { signInWithGoogle, googleConfigured } = useGoogleAuth(socialConfig?.google);
-  const { signInWithApple, appleAvailable } = useAppleAuth();
-
-  const providers = useMemo<SocialAuthProvider[]>(() => {
-    const result: SocialAuthProvider[] = [];
-
-    if (Platform.OS === "ios" && socialConfig?.apple?.enabled && appleAvailable) {
-      result.push("apple");
-    }
-
-    if (googleConfigured) {
-      result.push("google");
-    }
-
-    if (__DEV__) {
-      // eslint-disable-next-line no-console
-      console.log("[useAuthBottomSheetWrapper] Enabled providers:", result);
-    }
-
-    return result;
-  }, [socialConfig?.apple?.enabled, appleAvailable, googleConfigured]);
-
-  const handleGoogleSignIn = useCallback(async () => {
-    if (__DEV__) {
-      // eslint-disable-next-line no-console
-      console.log("[useAuthBottomSheetWrapper] Google sign-in requested");
-    }
-    const result = await signInWithGoogle();
-    if (__DEV__) {
-      // eslint-disable-next-line no-console
-      console.log("[useAuthBottomSheetWrapper] Google result:", result);
-    }
-  }, [signInWithGoogle]);
-
-  const handleAppleSignIn = useCallback(async () => {
-    if (__DEV__) {
-      // eslint-disable-next-line no-console
-      console.log("[useAuthBottomSheetWrapper] Apple sign-in requested");
-    }
-    const result = await signInWithApple();
-    if (__DEV__) {
-      // eslint-disable-next-line no-console
-      console.log("[useAuthBottomSheetWrapper] Apple result:", result);
-    }
-  }, [signInWithApple]);
-
-  return {
-    providers,
-    handleGoogleSignIn,
-    handleAppleSignIn,
-  };
-}