Version 10.0.0 beta03 #2315
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,7 +14,10 @@ | |
|
|
||
| package com.firebase.ui.auth | ||
|
|
||
| import android.content.Context | ||
| import com.firebase.ui.auth.AuthException.Companion.from | ||
| import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider | ||
| import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider | ||
| import com.google.firebase.FirebaseException | ||
| import com.google.firebase.auth.AuthCredential | ||
| import com.google.firebase.auth.FirebaseAuthException | ||
|
|
@@ -341,41 +344,56 @@ abstract class AuthException( | |
| * @return An appropriate [AuthException] subtype | ||
| */ | ||
| @JvmStatic | ||
| fun from(firebaseException: Exception, context: Context): AuthException = | ||
| from(firebaseException, DefaultAuthUIStringProvider(context)) | ||
|
|
||
| @JvmStatic | ||
| @JvmOverloads | ||
| fun from(firebaseException: Exception, stringProvider: AuthUIStringProvider? = null): AuthException { | ||
| return when (firebaseException) { | ||
| // If already an AuthException, return it directly | ||
| is AuthException -> firebaseException | ||
|
|
||
| // Handle specific Firebase Auth exceptions first (before general FirebaseException) | ||
| is FirebaseAuthInvalidCredentialsException -> { | ||
| InvalidCredentialsException( | ||
| message = stringProvider?.errorInvalidCredentials.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "Invalid credentials provided", | ||
| cause = firebaseException | ||
| ) | ||
| } | ||
|
|
||
| is FirebaseAuthInvalidUserException -> { | ||
| when (firebaseException.errorCode) { | ||
| "ERROR_USER_NOT_FOUND" -> UserNotFoundException( | ||
| message = stringProvider?.errorUserNotFound.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "User not found", | ||
| cause = firebaseException | ||
| ) | ||
|
|
||
| "ERROR_USER_DISABLED" -> InvalidCredentialsException( | ||
| message = stringProvider?.errorUserDisabled.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "User account has been disabled", | ||
| cause = firebaseException | ||
| ) | ||
|
|
||
| else -> UserNotFoundException( | ||
| message = stringProvider?.errorUserAccountGeneric.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "User account error", | ||
| cause = firebaseException | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| is FirebaseAuthWeakPasswordException -> { | ||
| WeakPasswordException( | ||
| message = stringProvider?.errorWeakPasswordGeneric.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "Password is too weak", | ||
| cause = firebaseException, | ||
| reason = firebaseException.reason | ||
| ) | ||
|
|
@@ -384,92 +402,103 @@ abstract class AuthException( | |
| is FirebaseAuthUserCollisionException -> { | ||
| when (firebaseException.errorCode) { | ||
| "ERROR_EMAIL_ALREADY_IN_USE" -> EmailAlreadyInUseException( | ||
| message = stringProvider?.errorEmailAlreadyInUse.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "Email address is already in use", | ||
| cause = firebaseException, | ||
| email = firebaseException.email | ||
| ) | ||
|
|
||
| "ERROR_ACCOUNT_EXISTS_WITH_DIFFERENT_CREDENTIAL" -> AccountLinkingRequiredException( | ||
| message = stringProvider?.errorAccountExistsDifferentCredential.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "Account already exists with different credentials", | ||
| cause = firebaseException | ||
| ) | ||
|
|
||
| "ERROR_CREDENTIAL_ALREADY_IN_USE" -> AccountLinkingRequiredException( | ||
| message = stringProvider?.errorCredentialAlreadyInUse.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "Credential is already associated with a different user account", | ||
| cause = firebaseException | ||
| ) | ||
|
|
||
| else -> AccountLinkingRequiredException( | ||
| message = stringProvider?.errorAccountCollisionGeneric.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "Account collision error", | ||
| cause = firebaseException | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| is FirebaseAuthMultiFactorException -> { | ||
| MfaRequiredException( | ||
| message = stringProvider?.errorMfaRequiredFallback.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "Multi-factor authentication required", | ||
| cause = firebaseException | ||
| ) | ||
| } | ||
|
|
||
| is FirebaseAuthRecentLoginRequiredException -> { | ||
| InvalidCredentialsException( | ||
| message = stringProvider?.errorRecentLoginRequired.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "Recent login required for this operation", | ||
| cause = firebaseException | ||
| ) | ||
| } | ||
|
|
||
| is FirebaseAuthException -> { | ||
| when (firebaseException.errorCode) { | ||
| "ERROR_TOO_MANY_REQUESTS" -> TooManyRequestsException( | ||
| message = stringProvider?.errorTooManyRequests.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "Too many requests. Please try again later", | ||
| cause = firebaseException | ||
| ) | ||
|
|
||
| else -> UnknownException( | ||
| message = stringProvider?.errorUnknownAuth.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "An unknown authentication error occurred", | ||
| cause = firebaseException | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| is FirebaseException -> { | ||
| NetworkException( | ||
| message = stringProvider?.errorNetworkGeneric.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "Network error occurred", | ||
| cause = firebaseException | ||
| ) | ||
| } | ||
|
|
||
| else -> { | ||
| if (firebaseException.message?.contains("cancelled", ignoreCase = true) == true || | ||
| firebaseException.message?.contains("canceled", ignoreCase = true) == true | ||
| ) { | ||
| AuthCancelledException( | ||
| message = stringProvider?.errorAuthCancelled.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "Authentication was cancelled", | ||
| cause = firebaseException | ||
| ) | ||
| } else { | ||
| UnknownException( | ||
| message = stringProvider?.errorUnknownAuth.nonEmpty() | ||
| ?: firebaseException.message | ||
| ?: "An unknown error occurred", | ||
| cause = firebaseException | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun String?.nonEmpty(): String? = this?.ifEmpty { null } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -158,7 +158,11 @@ class AuthFlowController internal constructor( | |
| */ | ||
| fun createIntent(context: Context): Intent { | ||
| checkNotDisposed() | ||
| return FirebaseAuthActivity.createIntent( | ||
| context = context, | ||
| configuration = configuration, | ||
| authUI = authUI | ||
| ) | ||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ import android.app.Activity | |
| import android.content.Context | ||
| import android.content.Intent | ||
| import android.os.Bundle | ||
| import androidx.annotation.RestrictTo | ||
| import androidx.activity.ComponentActivity | ||
| import androidx.activity.compose.setContent | ||
| import androidx.activity.enableEdgeToEdge | ||
|
|
@@ -72,15 +73,16 @@ class FirebaseAuthActivity : ComponentActivity() { | |
|
|
||
| private lateinit var authUI: FirebaseAuthUI | ||
| private lateinit var configuration: AuthUIConfiguration | ||
| private var launchKey: String? = null | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| enableEdgeToEdge() | ||
|
|
||
| // Extract configuration and auth instance from cache using UUID key | ||
| launchKey = intent.getStringExtra(EXTRA_CONFIGURATION_KEY) | ||
| configuration = if (launchKey != null) { | ||
| configurationCache[launchKey] | ||
| } else { | ||
| null | ||
| } ?: run { | ||
|
|
@@ -90,7 +92,12 @@ class FirebaseAuthActivity : ComponentActivity() { | |
| return | ||
| } | ||
|
|
||
| authUI = launchKey?.let { authUICache[it] } ?: run { | ||
| // Missing auth instance, finish with error | ||
| setResult(RESULT_CANCELED) | ||
| finish() | ||
| return | ||
| } | ||
|
|
||
| // Extract email link if present | ||
| val emailLink = intent.getStringExtra(EmailLinkConstants.EXTRA_EMAIL_LINK) | ||
|
|
@@ -150,11 +157,17 @@ class FirebaseAuthActivity : ComponentActivity() { | |
| } | ||
|
|
||
| override fun onDestroy() { | ||
| if (isFinishing) { | ||
| launchKey?.let { key -> | ||
| configurationCache.remove(key) | ||
| authUICache.remove(key) | ||
| } | ||
| } else { | ||
| // Preserve cached launch state so the recreated activity can recover it. | ||
| authUI.updateAuthState(AuthState.Idle) | ||
| } | ||
|
|
||
| super.onDestroy() | ||
| } | ||
|
|
||
| companion object { | ||
|
|
@@ -191,14 +204,31 @@ class FirebaseAuthActivity : ComponentActivity() { | |
| */ | ||
| internal fun createIntent( | ||
| context: Context, | ||
| configuration: AuthUIConfiguration, | ||
| authUI: FirebaseAuthUI = FirebaseAuthUI.getInstance() | ||
| ): Intent { | ||
| val configKey = UUID.randomUUID().toString() | ||
| configurationCache[configKey] = configuration | ||
| authUICache[configKey] = authUI | ||
|
|
||
| return Intent(context, FirebaseAuthActivity::class.java).apply { | ||
| putExtra(EXTRA_CONFIGURATION_KEY, configKey) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Clears cached launch state. This method is intended for testing purposes only. | ||
| * | ||
| * @suppress This is an internal API and should not be used in production code. | ||
| * @RestrictTo RestrictTo.Scope.TESTS | ||
| */ | ||
| @JvmStatic | ||
| @RestrictTo(RestrictTo.Scope.TESTS) | ||
| fun clearLaunchStateCache() { | ||
| configurationCache.clear() | ||
| authUICache.clear() | ||
| } | ||
|
|
||
| private val authUICache = ConcurrentHashMap<String, FirebaseAuthUI>() | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since the
stateis already smart-cast toAuthState.Successin this block, you can usestate.userdirectly instead of relying on theuservariable retrieved fromauthUI.getCurrentUser(). This is more idiomatic as it ensures you are using the specific user instance that triggered the current state emission.