rn-swiftauth-sdk 1.0.1 → 1.0.3

package/src/components/LoginForm.tsx

@@ -22,17 +22,19 @@ export const LoginForm = ({ styles: userStyles }: LoginFormProps) => {
     signInWithEmail,
     signInWithGoogle,
     signInWithApple,
-    isLoading, // ✅ Using the simplified boolean we added to context
+    isLoading,
     error,
-    config // ✅ We need this to check if social buttons are enabled
+    config
   } = useAuth();
 
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   
-  // ✅ Validation Error State
   const [validationErrors, setValidationErrors] = useState<{ email?: string; password?: string }>({});
 
+  //Check if form is filled to enable button
+  const isFormFilled = email.length > 0 && password.length > 0;
+
   const handleLogin = async () => {
     // 1. Reset previous errors
     setValidationErrors({});
@@ -46,14 +48,17 @@ export const LoginForm = ({ styles: userStyles }: LoginFormProps) => {
         email: emailErr || undefined,
         password: passErr || undefined
       });
-      return; // 🛑 Stop if invalid
+      return; //Stop if invalid
     }
 
     // 3. Attempt Login
     try {
-      await signInWithEmail(email, password);
+      //UPDATED: Clean Object Syntax
+      await signInWithEmail({ email, password });
     } catch (e) { 
       // Auth errors handled by global state
+      // DX: Log it for the developer (Optional but helpful for debugging)
+      console.log('Login failed:', e);
     }
   };
 
@@ -87,7 +92,7 @@ export const LoginForm = ({ styles: userStyles }: LoginFormProps) => {
         style={[
           defaultStyles.input, 
           userStyles?.input,
-          validationErrors.email ? { borderColor: 'red' } : {} // Highlight on error
+          validationErrors.email ? { borderColor: 'red' } : {} 
         ]}
         placeholder="Email"
         value={email}
@@ -100,7 +105,6 @@ export const LoginForm = ({ styles: userStyles }: LoginFormProps) => {
         placeholderTextColor="#999"
         editable={!isLoading}
       />
-      {/* Validation Message */}
       {validationErrors.email && (
         <Text style={defaultStyles.validationText}>{validationErrors.email}</Text>
       )}
@@ -124,11 +128,13 @@ export const LoginForm = ({ styles: userStyles }: LoginFormProps) => {
       <TouchableOpacity
         style={[
           defaultStyles.button,
-          isLoading && defaultStyles.buttonDisabled,
+          // Disable style if loading OR form is incomplete
+          (isLoading || !isFormFilled) && defaultStyles.buttonDisabled,
           userStyles?.button
         ]}
         onPress={handleLogin}
-        disabled={isLoading}
+        // Disable interaction if loading OR form is incomplete
+        disabled={isLoading || !isFormFilled}
       >
         {isLoading ? (
           <ActivityIndicator color={userStyles?.loadingIndicatorColor || "#fff"} />
@@ -139,7 +145,7 @@ export const LoginForm = ({ styles: userStyles }: LoginFormProps) => {
         )}
       </TouchableOpacity>
 
-      {/* OAuth Section - Conditionally Rendered based on Config */}
+      {/* OAuth Section */}
       {(config.enableGoogle || config.enableApple) && !isLoading && (
         <>
           <View style={defaultStyles.dividerContainer}>
@@ -190,7 +196,7 @@ const defaultStyles = StyleSheet.create({
     backgroundColor: '#f5f5f5',
     padding: 15,
     borderRadius: 8,
-    marginBottom: 8, // Reduced slightly to make room for validation text
+    marginBottom: 8,
     borderWidth: 1,
     borderColor: '#e0e0e0',
     fontSize: 16,
@@ -203,7 +209,10 @@ const defaultStyles = StyleSheet.create({
     alignItems: 'center',
     marginTop: 8,
   },
-  buttonDisabled: { backgroundColor: '#a0cfff' },
+  buttonDisabled: { 
+    backgroundColor: '#a0cfff',
+    opacity: 0.7 
+  },
   buttonText: { color: '#fff', fontWeight: '600', fontSize: 16 },
   
   errorText: { color: 'red', marginBottom: 12, fontSize: 14, textAlign: 'center' },

package/src/components/SignUpForm.tsx

@@ -6,7 +6,7 @@ import {
   TouchableOpacity,
   StyleSheet,
   ActivityIndicator,
-  Platform
+  Platform,
 } from 'react-native';
 
 import { useAuth } from '../hooks/useAuth';
@@ -24,19 +24,20 @@ export const SignUpForm = ({ styles: userStyles, showHints = true }: SignUpFormP
     signUpWithEmail,
     signInWithGoogle,
     signInWithApple,
-    isLoading, // ✅ Use boolean loading state
+    isLoading,
     error,
-    config // ✅ Use config for conditional rendering
+    config
   } = useAuth();
 
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   const [confirmPassword, setConfirmPassword] = useState('');
-  
-  // ✅ Proper Validation State
   const [validationErrors, setValidationErrors] = useState<{ email?: string; password?: string; confirm?: string }>({});
 
-  // Password Requirements Logic for Visual Hints
+  // 1. Smart Button Logic: Check if all fields have content
+  const isFormFilled = email.length > 0 && password.length > 0 && confirmPassword.length > 0;
+
+  // Password Requirements Logic
   const requirements = [
     { label: "At least 6 characters", met: password.length >= 6 },
     { label: "Contains a number", met: /\d/.test(password) },
@@ -44,19 +45,16 @@ export const SignUpForm = ({ styles: userStyles, showHints = true }: SignUpFormP
   ];
 
   const handleSignUp = async () => {
-    // 1. Reset Errors
     setValidationErrors({});
 
     // 2. Validate Inputs
     const emailErr = validateEmail(email);
     const passErr = validatePasswordSignup(password);
-    
     let confirmErr;
     if (password !== confirmPassword) {
       confirmErr = "Passwords do not match.";
     }
 
-    // 3. Check if any errors exist
     if (emailErr || passErr || confirmErr) {
       setValidationErrors({
         email: emailErr || undefined,
@@ -66,11 +64,11 @@ export const SignUpForm = ({ styles: userStyles, showHints = true }: SignUpFormP
       return;
     }
 
-    // 4. Attempt Sign Up
     try {
-      await signUpWithEmail(email, password);
+      // ✅ UPDATED: New Object Syntax
+      await signUpWithEmail({ email, password });
     } catch (e) {
-      // Global error handled by useAuth
+      console.error('Sign Up Failed:', e);
     }
   };
 
@@ -92,7 +90,6 @@ export const SignUpForm = ({ styles: userStyles, showHints = true }: SignUpFormP
 
   return (
     <View style={[defaultStyles.container, userStyles?.container]}>
-      {/* Global API Error */}
       {error && (
         <Text style={[defaultStyles.globalError, userStyles?.errorText]}>
           {error.message}
@@ -177,11 +174,13 @@ export const SignUpForm = ({ styles: userStyles, showHints = true }: SignUpFormP
       <TouchableOpacity
         style={[
           defaultStyles.button,
-          isLoading && defaultStyles.buttonDisabled,
+          // Disable style if loading OR form incomplete
+          (isLoading || !isFormFilled) && defaultStyles.buttonDisabled,
           userStyles?.button
         ]}
         onPress={handleSignUp}
-        disabled={isLoading}
+        // Disable interaction if loading OR form incomplete
+        disabled={isLoading || !isFormFilled}
       >
         {isLoading ? (
           <ActivityIndicator color={userStyles?.loadingIndicatorColor || "#fff"} />
@@ -192,7 +191,7 @@ export const SignUpForm = ({ styles: userStyles, showHints = true }: SignUpFormP
         )}
       </TouchableOpacity>
 
-      {/* OAuth Section - Conditional Rendering */}
+      {/* OAuth Section */}
       {(config.enableGoogle || config.enableApple) && !isLoading && (
         <>
           <View style={defaultStyles.dividerContainer}>
@@ -201,7 +200,6 @@ export const SignUpForm = ({ styles: userStyles, showHints = true }: SignUpFormP
             <View style={defaultStyles.divider} />
           </View>
 
-          {/* Google */}
           {config.enableGoogle && (
             <TouchableOpacity
               style={[defaultStyles.oauthButton, defaultStyles.googleButton]}
@@ -213,7 +211,6 @@ export const SignUpForm = ({ styles: userStyles, showHints = true }: SignUpFormP
             </TouchableOpacity>
           )}
 
-          {/* Apple */}
           {config.enableApple && Platform.OS === 'ios' && (
             <TouchableOpacity
               style={[defaultStyles.oauthButton, defaultStyles.appleButton]}
@@ -232,17 +229,15 @@ export const SignUpForm = ({ styles: userStyles, showHints = true }: SignUpFormP
 
 const defaultStyles = StyleSheet.create({
   container: { width: '100%', marginVertical: 10 },
-
   input: {
     backgroundColor: '#f5f5f5',
     padding: 15,
     borderRadius: 8,
-    marginBottom: 8, // Reduced for validation text space
+    marginBottom: 8,
     borderWidth: 1,
     borderColor: '#e0e0e0',
     fontSize: 16,
   },
-
   button: {
     backgroundColor: '#34C759',
     padding: 15,
@@ -250,15 +245,13 @@ const defaultStyles = StyleSheet.create({
     alignItems: 'center',
     marginTop: 8,
   },
-
-  buttonDisabled: { backgroundColor: '#9ce4ae' },
-
+  buttonDisabled: { 
+    backgroundColor: '#9ce4ae',
+    opacity: 0.7
+  },
   buttonText: { color: '#fff', fontWeight: '600', fontSize: 16 },
-
   globalError: { color: 'red', marginBottom: 12, fontSize: 14, textAlign: 'center' },
   validationText: { color: 'red', fontSize: 12, marginBottom: 10, marginLeft: 4, marginTop: -4 },
-
-  // OAuth Styles
   dividerContainer: {
     flexDirection: 'row',
     alignItems: 'center',
@@ -266,7 +259,6 @@ const defaultStyles = StyleSheet.create({
   },
   divider: { flex: 1, height: 1, backgroundColor: '#e0e0e0' },
   dividerText: { marginHorizontal: 16, color: '#666', fontSize: 14 },
-
   oauthButton: {
     padding: 15,
     borderRadius: 8,
@@ -281,11 +273,8 @@ const defaultStyles = StyleSheet.create({
     borderColor: '#e0e0e0',
   },
   googleButtonText: { color: '#000', fontSize: 16, fontWeight: '500' },
-
   appleButton: { backgroundColor: '#000' },
   appleButtonText: { color: '#fff', fontSize: 16, fontWeight: '600' },
-
-  // Password Hint Styles
   hintContainer: { marginBottom: 15, paddingLeft: 5 },
   hintRow: { flexDirection: 'row', alignItems: 'center', marginBottom: 4 },
   hintText: { color: '#666', fontSize: 12 },

package/src/core/AuthProvider.tsx

@@ -1,39 +1,30 @@
 import React, { useEffect, useState, ReactNode, useMemo } from 'react';
 import { Platform } from 'react-native';
 import { initializeApp, getApps, getApp, FirebaseApp } from 'firebase/app';
-
-// Firebase Auth
-import {
-  getAuth,
-  initializeAuth,
-  onAuthStateChanged,
-  inMemoryPersistence,
-  User as FirebaseUser,
-  Auth as FirebaseAuth,
-  createUserWithEmailAndPassword,
-  signInWithEmailAndPassword,
-  GoogleAuthProvider,
-  OAuthProvider,
-  signInWithCredential,
-} from 'firebase/auth';
-
-// The Hack: Import for getReactNativePersistence
-import * as firebaseAuth from 'firebase/auth';
-// @ts-ignore
-const getReactNativePersistence = (firebaseAuth as any).getReactNativePersistence;
-
+import * as FirebaseAuth from 'firebase/auth';
 import ReactNativeAsyncStorage from '@react-native-async-storage/async-storage';
-
-// PROPER GOOGLE SIGN-IN
 import { GoogleSignin } from '@react-native-google-signin/google-signin';
-
-// Apple Sign-In (Expo)
 import * as AppleAuthentication from 'expo-apple-authentication';
 import * as Crypto from 'expo-crypto';
-
-import { mapFirebaseError } from '../errors';
+import {
+  AuthException,
+  mapFirebaseError,
+  ConfigurationException,
+  AppleSignInNotSupportedException,
+  AppleSignInCancelledException,
+  GoogleSignInCancelledException,
+} from '../errors';
 import { AuthContext } from './AuthContext';
-import { AuthConfig, AuthStatus, User, AuthError, AuthErrorCode } from '../types';
+import {
+  AuthConfig,
+  AuthStatus,
+  User,
+  ProviderErrorCodes,
+  EmailSignInOptions,
+  EmailSignUpOptions
+} from '../types';
+
+const getReactNativePersistence = (FirebaseAuth as any).getReactNativePersistence;
 
 interface AuthProviderProps {
   config: AuthConfig;
@@ -43,18 +34,16 @@ interface AuthProviderProps {
 export const AuthProvider: React.FC<AuthProviderProps> = ({ config, children }) => {
   const [user, setUser] = useState<User | null>(null);
   const [status, setStatus] = useState<AuthStatus>(AuthStatus.LOADING);
-  const [error, setError] = useState<AuthError | null>(null);
-  const [firebaseAuthInstance, setFirebaseAuthInstance] = useState<FirebaseAuth | null>(null);
-
-  // ✅ NEW: Explicit loading state for initial app load vs action loading
+  const [error, setError] = useState<AuthException | null>(null);
+  const [firebaseAuthInstance, setFirebaseAuthInstance] = useState<FirebaseAuth.Auth | null>(null);
   const [isDataLoading, setIsDataLoading] = useState(true);
 
+  // --- INITIALIZATION ---
   useEffect(() => {
     let app: FirebaseApp;
-    let auth: FirebaseAuth;
+    let auth: FirebaseAuth.Auth;
 
     if (!getApps().length) {
-      // 1. Initialize App
       app = initializeApp({
         apiKey: config.apiKey,
         authDomain: config.authDomain,
@@ -64,42 +53,37 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ config, children })
         appId: config.appId,
       });
 
-      // 2. Select Persistence Strategy
       const selectedPersistence = config.persistence === 'memory'
-        ? inMemoryPersistence
+        ? FirebaseAuth.inMemoryPersistence
         : getReactNativePersistence(ReactNativeAsyncStorage);
 
-      // 3. Initialize Auth
-      auth = initializeAuth(app, {
+      auth = FirebaseAuth.initializeAuth(app, {
         persistence: selectedPersistence
       });
-
     } else {
       app = getApp();
-      auth = getAuth(app);
+      auth = FirebaseAuth.getAuth(app);
     }
 
     setFirebaseAuthInstance(auth);
 
-    // 4. Configure Google Sign-In if enabled
     if (config.enableGoogle && config.googleWebClientId) {
       try {
         GoogleSignin.configure({
           webClientId: config.googleWebClientId,
           offlineAccess: true,
-          iosClientId: config.googleIOSClientId, // Optional
+          iosClientId: config.googleIOSClientId,
         });
-        console.log('✅ Google Sign-In configured successfully');
+        console.log('Google Sign-In configured successfully');
       } catch (err) {
-        console.error('❌ Google Sign-In configuration failed:', err);
+        console.error('Google Sign-In configuration failed:', err);
       }
     }
 
-    const unsubscribe = onAuthStateChanged(auth, async (fbUser: FirebaseUser | null) => {
+    const unsubscribe = FirebaseAuth.onAuthStateChanged(auth, async (fbUser) => {
       try {
         if (fbUser) {
           try {
-            // Force token refresh to ensure validity on load
             const token = await fbUser.getIdToken(true);
             setUser({
               uid: fbUser.uid,
@@ -112,10 +96,13 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ config, children })
             setStatus(AuthStatus.AUTHENTICATED);
           } catch (tokenError: any) {
             console.error('Token retrieval error:', tokenError);
-            if (tokenError.code === 'auth/user-token-expired' || tokenError.code === 'auth/null-user') {
+            if (tokenError.code === ProviderErrorCodes.USER_TOKEN_EXPIRED ||
+                tokenError.code === ProviderErrorCodes.NULL_USER) {
               setStatus(AuthStatus.TOKEN_EXPIRED);
+              setError(mapFirebaseError(tokenError));
             } else {
               setStatus(AuthStatus.UNAUTHENTICATED);
+              setError(mapFirebaseError(tokenError));
             }
             setUser(null);
           }
@@ -126,60 +113,51 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ config, children })
       } catch (err) {
         console.error("Auth State Error:", err);
         setStatus(AuthStatus.UNAUTHENTICATED);
+        setError(mapFirebaseError(err));
       } finally {
-        // ✅ Stop initial loading spinner once Firebase has checked storage
         setIsDataLoading(false);
       }
-    }, (err) => {
-      console.error("Auth State Error:", err);
-      setStatus(AuthStatus.UNAUTHENTICATED);
-      setIsDataLoading(false);
     });
 
     return () => unsubscribe();
   }, [config]);
 
-  // Email/Password Sign In
-  const signInWithEmail = async (email: string, pass: string) => {
+  // --- ACTIONS ---
+
+  const signInWithEmail = async ({ email, password }: EmailSignInOptions) => {
     if (!firebaseAuthInstance) return;
     try {
       setError(null);
       setStatus(AuthStatus.LOADING);
-      await signInWithEmailAndPassword(firebaseAuthInstance, email, pass);
-    } catch (err) {
-      const mappedError = mapFirebaseError(err);
-      setError(mappedError);
+      await FirebaseAuth.signInWithEmailAndPassword(firebaseAuthInstance, email, password);
+    } catch (err: any) {
+      const mappedException = mapFirebaseError(err);
+      setError(mappedException);
       setStatus(AuthStatus.UNAUTHENTICATED);
-      throw mappedError;
+      throw mappedException;
     }
   };
 
-  // Email/Password Sign Up
-  const signUpWithEmail = async (email: string, pass: string) => {
+  const signUpWithEmail = async ({ email, password }: EmailSignUpOptions) => {
     if (!firebaseAuthInstance) return;
     try {
       setError(null);
       setStatus(AuthStatus.LOADING);
-      await createUserWithEmailAndPassword(firebaseAuthInstance, email, pass);
-    } catch (err) {
-      const mappedError = mapFirebaseError(err);
-      setError(mappedError);
+      await FirebaseAuth.createUserWithEmailAndPassword(firebaseAuthInstance, email, password);
+    } catch (err: any) {
+      const mappedException = mapFirebaseError(err);
+      setError(mappedException);
       setStatus(AuthStatus.UNAUTHENTICATED);
-      throw mappedError;
+      throw mappedException;
     }
   };
 
-  // PROPER GOOGLE SIGN-IN using @react-native-google-signin/google-signin
   const signInWithGoogle = async () => {
-    if (!firebaseAuthInstance) {
-      throw new Error('Firebase not initialized');
-    }
-
+    if (!firebaseAuthInstance) throw new Error('Firebase not initialized');
     if (!config.enableGoogle || !config.googleWebClientId) {
-      const configError: AuthError = {
-        code: AuthErrorCode.CONFIG_ERROR,
-        message: 'Google Sign-In is not enabled or configured. Please add googleWebClientId to your AuthConfig.',
-      };
+      const configError = new ConfigurationException(
+        'Google Auth not configured. Missing googleWebClientId.'
+      );
       setError(configError);
       throw configError;
     }
@@ -192,71 +170,41 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ config, children })
       const userInfo = await GoogleSignin.signIn();
       const idToken = userInfo.data?.idToken;
 
-      if (!idToken) {
-        throw new Error('No ID token received from Google Sign-In');
-      }
-
-      const credential = GoogleAuthProvider.credential(idToken);
-      await signInWithCredential(firebaseAuthInstance, credential);
+      if (!idToken) throw new Error('No ID token received from Google Sign-In');
 
-      console.log('✅ Google Sign-In successful');
+      const credential = FirebaseAuth.GoogleAuthProvider.credential(idToken);
+      await FirebaseAuth.signInWithCredential(firebaseAuthInstance, credential);
+      console.log('Google Sign-In successful');
 
     } catch (err: any) {
-      console.error('❌ Google Sign-In Error:', err);
-      let mappedError: AuthError;
-
-      if (err.code === 'SIGN_IN_CANCELLED') {
-        mappedError = {
-          code: AuthErrorCode.GOOGLE_SIGN_IN_CANCELLED,
-          message: 'Google Sign-In was cancelled',
-          originalError: err
-        };
-        // Reset status if cancelled, don't leave it loading
+      console.error('Google Sign-In Error:', err);
+
+      if (err.code === ProviderErrorCodes.GOOGLE_CANCELLED) {
+        const cancelError = new GoogleSignInCancelledException(err);
+        setError(cancelError);
         setStatus(AuthStatus.UNAUTHENTICATED);
         return;
-      } else if (err.code === 'IN_PROGRESS') {
-        mappedError = {
-          code: AuthErrorCode.GOOGLE_SIGN_IN_IN_PROGRESS,
-          message: 'Google Sign-In is already in progress',
-          originalError: err
-        };
-      } else if (err.code === 'PLAY_SERVICES_NOT_AVAILABLE') {
-        mappedError = {
-          code: AuthErrorCode.GOOGLE_PLAY_SERVICES_NOT_AVAILABLE,
-          message: 'Google Play Services are not available. Please update Google Play Services.',
-          originalError: err
-        };
-      } else {
-        mappedError = mapFirebaseError(err);
       }
 
-      setError(mappedError);
+      const mappedException = mapFirebaseError(err);
+      setError(mappedException);
       setStatus(AuthStatus.UNAUTHENTICATED);
-      throw mappedError;
+      throw mappedException;
     }
   };
 
-  // Apple Sign-In using expo-apple-authentication
   const signInWithApple = async () => {
-    if (!firebaseAuthInstance) {
-      throw new Error('Firebase not initialized');
-    }
+    if (!firebaseAuthInstance) throw new Error('Firebase not initialized');
 
     if (Platform.OS !== 'ios') {
-      const platformError: AuthError = {
-        code: AuthErrorCode.APPLE_SIGN_IN_NOT_SUPPORTED,
-        message: 'Apple Sign-In is only available on iOS devices',
-      };
+      const platformError = new AppleSignInNotSupportedException();
       setError(platformError);
       throw platformError;
     }
 
     const isAvailable = await AppleAuthentication.isAvailableAsync();
     if (!isAvailable) {
-      const availabilityError: AuthError = {
-        code: AuthErrorCode.APPLE_SIGN_IN_NOT_SUPPORTED,
-        message: 'Apple Sign-In is not available on this device (requires iOS 13+)',
-      };
+      const availabilityError = new AppleSignInNotSupportedException();
       setError(availabilityError);
       throw availabilityError;
     }
@@ -266,10 +214,7 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ config, children })
       setStatus(AuthStatus.LOADING);
 
       const nonce = Math.random().toString(36).substring(2, 10);
-      const hashedNonce = await Crypto.digestStringAsync(
-        Crypto.CryptoDigestAlgorithm.SHA256,
-        nonce
-      );
+      const hashedNonce = await Crypto.digestStringAsync(Crypto.CryptoDigestAlgorithm.SHA256, nonce);
 
       const appleCredential = await AppleAuthentication.signInAsync({
         requestedScopes: [
@@ -281,41 +226,34 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ config, children })
 
       const { identityToken } = appleCredential;
 
-      if (!identityToken) {
-        throw new Error('No identity token received from Apple');
-      }
+      if (!identityToken) throw new Error('No identity token received from Apple');
 
-      const provider = new OAuthProvider('apple.com');
+      const provider = new FirebaseAuth.OAuthProvider('apple.com');
       const credential = provider.credential({
         idToken: identityToken,
         rawNonce: nonce,
       });
 
-      await signInWithCredential(firebaseAuthInstance, credential);
-      console.log('✅ Apple Sign-In successful');
+      await FirebaseAuth.signInWithCredential(firebaseAuthInstance, credential);
+      console.log('Apple Sign-In successful');
 
     } catch (err: any) {
-      console.error('❌ Apple Sign-In Error:', err);
-
-      if (err.code === 'ERR_REQUEST_CANCELED') {
-        const cancelError: AuthError = {
-          code: AuthErrorCode.APPLE_SIGN_IN_CANCELLED,
-          message: 'Apple Sign-In was cancelled',
-          originalError: err
-        };
+      console.error('Apple Sign-In Error:', err);
+
+      if (err.code === ProviderErrorCodes.APPLE_CANCELLED) {
+        const cancelError = new AppleSignInCancelledException(err);
         setError(cancelError);
         setStatus(AuthStatus.UNAUTHENTICATED);
         return;
       }
 
-      const mappedError = mapFirebaseError(err);
-      setError(mappedError);
+      const mappedException = mapFirebaseError(err);
+      setError(mappedException);
       setStatus(AuthStatus.UNAUTHENTICATED);
-      throw mappedError;
+      throw mappedException;
     }
   };
 
-  // Sign Out
   const signOut = async () => {
     try {
       if (firebaseAuthInstance) {
@@ -328,9 +266,11 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ config, children })
           console.log('Google sign-out skipped or failed:', googleSignOutError);
         }
       }
-      console.log('✅ Sign out successful');
+      console.log('Sign out successful');
     } catch (err) {
-      console.error('❌ Sign out error:', err);
+      console.error('Sign out error:', err);
+      const signOutError = mapFirebaseError(err);
+      setError(signOutError);
       setUser(null);
       setStatus(AuthStatus.UNAUTHENTICATED);
     }
@@ -341,10 +281,8 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ config, children })
   const value = useMemo(() => ({
     user,
     status,
-    // ✅ NEW: Combine internal loading with AuthStatus
     isLoading: isDataLoading || status === AuthStatus.LOADING,
     error,
-    // ✅ NEW: Expose config for UI to read
     config,
     signInWithEmail,
     signUpWithEmail,