fix reviews

Author: demolaf

auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/EmailAuthProvider+FirebaseAuthUI.kt

@@ -57,7 +57,9 @@ internal suspend fun FirebaseAuthUI.signInOrReauth(
     credential: AuthCredential,
     config: AuthUIConfiguration,
 ): AuthResult? = if (config.isReauthenticationMode) {
-    auth.currentUser!!.reauthenticate(credential).await()
+    val currentUser = auth.currentUser
+        ?: throw AuthException.UserNotFoundException(message = "No user is currently signed in for reauthentication")
+    currentUser.reauthenticate(credential).await()
     null
 } else {
     auth.signInWithCredential(credential).await()

auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/OAuthProvider+FirebaseAuthUI.kt

@@ -169,8 +169,11 @@ internal suspend fun FirebaseAuthUI.signInWithProvider(
         val authResult = when {
             canUpgradeAnonymous(config, auth) ->
                 auth.currentUser?.startActivityForLinkWithProvider(activity, oauthProvider)?.await()
-            config.isReauthenticationMode ->
-                auth.currentUser!!.startActivityForReauthenticateWithProvider(activity, oauthProvider).await()
+            config.isReauthenticationMode -> {
+                val currentUser = auth.currentUser
+                    ?: throw AuthException.UserNotFoundException(message = "No user is currently signed in for reauthentication")
+                currentUser.startActivityForReauthenticateWithProvider(activity, oauthProvider).await()
+            }
             else ->
                 auth.startActivityForSignInWithProvider(activity, oauthProvider).await()
         }

auth/src/main/java/com/firebase/ui/auth/ui/screens/FirebaseAuthScreen.kt

@@ -446,7 +446,15 @@ fun FirebaseAuthScreen(
                             // Lock the state to Loading before launching the retry so no
                             // intermediate Success emission can navigate to AuthRoute.Success.
                             authUI.updateAuthState(AuthState.Loading())
-                            coroutineScope.launch { retry(context) }
+                            coroutineScope.launch {
+                                try {
+                                    retry(context)
+                                } catch (e: kotlinx.coroutines.CancellationException) {
+                                    throw e
+                                } catch (e: Exception) {
+                                    authUI.updateAuthState(AuthState.Error(e))
+                                }
+                            }
                             return@LaunchedEffect
                         }