diff --git a/app/src/main/java/com/firebase/uidemo/AuthFlowControllerDemoActivity.kt b/app/src/main/java/com/firebase/uidemo/AuthFlowControllerDemoActivity.kt index efca8c65e..4c91d5627 100644 --- a/app/src/main/java/com/firebase/uidemo/AuthFlowControllerDemoActivity.kt +++ b/app/src/main/java/com/firebase/uidemo/AuthFlowControllerDemoActivity.kt @@ -15,13 +15,13 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.AuthFlowController -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthActivity -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.PasswordRule -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.AuthFlowController +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthActivity +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.PasswordRule +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.actionCodeSettings import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/firebase/uidemo/CustomSlotsThemingDemoActivity.kt b/app/src/main/java/com/firebase/uidemo/CustomSlotsThemingDemoActivity.kt index bd5cc1088..759544f87 100644 --- a/app/src/main/java/com/firebase/uidemo/CustomSlotsThemingDemoActivity.kt +++ b/app/src/main/java/com/firebase/uidemo/CustomSlotsThemingDemoActivity.kt @@ -17,20 +17,20 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.PasswordRule -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset -import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme -import com.firebase.ui.auth.compose.ui.screens.email.EmailAuthContentState -import com.firebase.ui.auth.compose.ui.screens.email.EmailAuthMode -import com.firebase.ui.auth.compose.ui.screens.email.EmailAuthScreen -import com.firebase.ui.auth.compose.ui.screens.phone.PhoneAuthContentState -import com.firebase.ui.auth.compose.ui.screens.phone.PhoneAuthScreen -import com.firebase.ui.auth.compose.ui.screens.phone.PhoneAuthStep +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.PasswordRule +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.configuration.theme.AuthUITheme +import com.firebase.ui.auth.ui.screens.email.EmailAuthContentState +import com.firebase.ui.auth.ui.screens.email.EmailAuthMode +import com.firebase.ui.auth.ui.screens.email.EmailAuthScreen +import com.firebase.ui.auth.ui.screens.phone.PhoneAuthContentState +import com.firebase.ui.auth.ui.screens.phone.PhoneAuthScreen +import com.firebase.ui.auth.ui.screens.phone.PhoneAuthStep import com.google.firebase.auth.AuthResult /** @@ -96,7 +96,7 @@ class CustomSlotsThemingDemoActivity : ComponentActivity() { modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background ) { - var selectedDemo by remember { mutableStateOf(DemoType.Email) } + var selectedDemo by remember { mutableStateOf(DemoType.Email) } Column( modifier = Modifier @@ -226,7 +226,7 @@ fun DemoSelector( @Composable fun EmailAuthDemo( authUI: FirebaseAuthUI, - configuration: com.firebase.ui.auth.compose.configuration.AuthUIConfiguration, + configuration: AuthUIConfiguration, context: android.content.Context ) { var currentUser by remember { mutableStateOf(authUI.getCurrentUser()) } @@ -563,7 +563,7 @@ fun ResetPasswordUI(state: EmailAuthContentState) { @Composable fun PhoneAuthDemo( authUI: FirebaseAuthUI, - configuration: com.firebase.ui.auth.compose.configuration.AuthUIConfiguration, + configuration: AuthUIConfiguration, context: android.content.Context ) { var currentUser by remember { mutableStateOf(authUI.getCurrentUser()) } diff --git a/app/src/main/java/com/firebase/uidemo/HighLevelApiDemoActivity.kt b/app/src/main/java/com/firebase/uidemo/HighLevelApiDemoActivity.kt index 22579a41a..c57d6d39e 100644 --- a/app/src/main/java/com/firebase/uidemo/HighLevelApiDemoActivity.kt +++ b/app/src/main/java/com/firebase/uidemo/HighLevelApiDemoActivity.kt @@ -21,17 +21,17 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.PasswordRule -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset -import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme -import com.firebase.ui.auth.compose.ui.screens.AuthSuccessUiContext -import com.firebase.ui.auth.compose.ui.screens.FirebaseAuthScreen -import com.firebase.ui.auth.compose.util.EmailLinkConstants +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.PasswordRule +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.theme.AuthUIAsset +import com.firebase.ui.auth.configuration.theme.AuthUITheme +import com.firebase.ui.auth.ui.screens.AuthSuccessUiContext +import com.firebase.ui.auth.ui.screens.FirebaseAuthScreen +import com.firebase.ui.auth.util.EmailLinkConstants import com.google.firebase.auth.actionCodeSettings class HighLevelApiDemoActivity : ComponentActivity() { diff --git a/app/src/main/java/com/firebase/uidemo/MainActivity.kt b/app/src/main/java/com/firebase/uidemo/MainActivity.kt index da3bb669c..c575fa313 100644 --- a/app/src/main/java/com/firebase/uidemo/MainActivity.kt +++ b/app/src/main/java/com/firebase/uidemo/MainActivity.kt @@ -26,8 +26,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.util.EmailLinkConstants +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.util.EmailLinkConstants import com.google.firebase.FirebaseApp /** diff --git a/auth/MIGRATION.md b/auth/MIGRATION.md index ef0701ff4..03f08085d 100644 --- a/auth/MIGRATION.md +++ b/auth/MIGRATION.md @@ -397,7 +397,7 @@ class AuthActivity : ComponentActivity() { **Solution:** Ensure you have the correct import: ```kotlin -import com.firebase.ui.auth.compose.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.authUIConfiguration ``` ### Issue: "ActivityResultLauncher is deprecated" diff --git a/auth/README.md b/auth/README.md index cbc97b386..4e7dbdfb8 100644 --- a/auth/README.md +++ b/auth/README.md @@ -1136,7 +1136,7 @@ override fun onCreate(savedInstanceState: Bundle?) { **Low-Level API** - Using `AuthFlowController`: ```kotlin -import com.firebase.ui.auth.compose.util.EmailLinkConstants +import com.firebase.ui.auth.util.EmailLinkConstants // In your Activity that handles the deep link: override fun onCreate(savedInstanceState: Bundle?) { diff --git a/auth/src/main/AndroidManifest.xml b/auth/src/main/AndroidManifest.xml index 7b62c07ac..e3370d125 100644 --- a/auth/src/main/AndroidManifest.xml +++ b/auth/src/main/AndroidManifest.xml @@ -1,8 +1,6 @@ - + @@ -20,7 +18,7 @@ @@ -37,7 +35,7 @@ android:value="@string/facebook_client_token"/> diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthException.kt b/auth/src/main/java/com/firebase/ui/auth/AuthException.kt index da58b39e6..63af11c73 100644 --- a/auth/src/main/java/com/firebase/ui/auth/AuthException.kt +++ b/auth/src/main/java/com/firebase/ui/auth/AuthException.kt @@ -12,9 +12,9 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose +package com.firebase.ui.auth -import com.firebase.ui.auth.compose.AuthException.Companion.from +import com.firebase.ui.auth.AuthException.Companion.from import com.google.firebase.FirebaseException import com.google.firebase.auth.AuthCredential import com.google.firebase.auth.FirebaseAuthException diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthFlowController.kt b/auth/src/main/java/com/firebase/ui/auth/AuthFlowController.kt index 6d508e7df..44cdf45aa 100644 --- a/auth/src/main/java/com/firebase/ui/auth/AuthFlowController.kt +++ b/auth/src/main/java/com/firebase/ui/auth/AuthFlowController.kt @@ -12,13 +12,13 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose +package com.firebase.ui.auth import android.app.Activity import android.content.Context import android.content.Intent import androidx.activity.result.ActivityResultLauncher -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.AuthUIConfiguration import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthState.kt b/auth/src/main/java/com/firebase/ui/auth/AuthState.kt index 68bc06737..061b33a45 100644 --- a/auth/src/main/java/com/firebase/ui/auth/AuthState.kt +++ b/auth/src/main/java/com/firebase/ui/auth/AuthState.kt @@ -12,10 +12,10 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose +package com.firebase.ui.auth -import com.firebase.ui.auth.compose.AuthState.Companion.Cancelled -import com.firebase.ui.auth.compose.AuthState.Companion.Idle +import com.firebase.ui.auth.AuthState.Companion.Cancelled +import com.firebase.ui.auth.AuthState.Companion.Idle import com.google.firebase.auth.AuthResult import com.google.firebase.auth.FirebaseUser import com.google.firebase.auth.MultiFactorResolver diff --git a/auth/src/main/java/com/firebase/ui/auth/FirebaseAuthActivity.kt b/auth/src/main/java/com/firebase/ui/auth/FirebaseAuthActivity.kt index 72b6cc807..af71920d7 100644 --- a/auth/src/main/java/com/firebase/ui/auth/FirebaseAuthActivity.kt +++ b/auth/src/main/java/com/firebase/ui/auth/FirebaseAuthActivity.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose +package com.firebase.ui.auth import android.app.Activity import android.content.Context @@ -22,10 +22,10 @@ import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.lifecycle.lifecycleScope -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme -import com.firebase.ui.auth.compose.ui.screens.FirebaseAuthScreen -import com.firebase.ui.auth.compose.util.EmailLinkConstants +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.theme.AuthUITheme +import com.firebase.ui.auth.ui.screens.FirebaseAuthScreen +import com.firebase.ui.auth.util.EmailLinkConstants import kotlinx.coroutines.launch import java.util.UUID import java.util.concurrent.ConcurrentHashMap @@ -158,23 +158,23 @@ class FirebaseAuthActivity : ComponentActivity() { } companion object { - private const val EXTRA_CONFIGURATION_KEY = "com.firebase.ui.auth.compose.CONFIGURATION_KEY" + private const val EXTRA_CONFIGURATION_KEY = "com.firebase.ui.auth.CONFIGURATION_KEY" /** * Intent extra key for user ID on successful sign-in. * Use [com.google.firebase.auth.FirebaseAuth.getInstance().currentUser] to get the full user object. */ - const val EXTRA_USER_ID = "com.firebase.ui.auth.compose.USER_ID" + const val EXTRA_USER_ID = "com.firebase.ui.auth.USER_ID" /** * Intent extra key for isNewUser flag on successful sign-in. */ - const val EXTRA_IS_NEW_USER = "com.firebase.ui.auth.compose.IS_NEW_USER" + const val EXTRA_IS_NEW_USER = "com.firebase.ui.auth.IS_NEW_USER" /** * Intent extra key for [AuthException] on error. */ - const val EXTRA_ERROR = "com.firebase.ui.auth.compose.ERROR" + const val EXTRA_ERROR = "com.firebase.ui.auth.ERROR" /** * Cache for configurations passed through Intents. diff --git a/auth/src/main/java/com/firebase/ui/auth/FirebaseAuthUI.kt b/auth/src/main/java/com/firebase/ui/auth/FirebaseAuthUI.kt index 07c0a9713..df5a49173 100644 --- a/auth/src/main/java/com/firebase/ui/auth/FirebaseAuthUI.kt +++ b/auth/src/main/java/com/firebase/ui/auth/FirebaseAuthUI.kt @@ -12,14 +12,14 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose +package com.firebase.ui.auth import android.content.Context import android.content.Intent import androidx.annotation.RestrictTo -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.auth_provider.signOutFromGoogle +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.auth_provider.signOutFromGoogle import com.google.firebase.FirebaseApp import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseAuth.AuthStateListener diff --git a/auth/src/main/java/com/firebase/ui/auth/FirebaseUIComposeRegistrar.kt b/auth/src/main/java/com/firebase/ui/auth/FirebaseUIComposeRegistrar.kt index 62da63759..db960df5b 100644 --- a/auth/src/main/java/com/firebase/ui/auth/FirebaseUIComposeRegistrar.kt +++ b/auth/src/main/java/com/firebase/ui/auth/FirebaseUIComposeRegistrar.kt @@ -12,8 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.firebase.ui.auth.compose +package com.firebase.ui.auth +import android.util.Log import androidx.annotation.Keep import com.firebase.ui.auth.BuildConfig import com.google.firebase.components.Component @@ -27,6 +28,7 @@ import com.google.firebase.platforminfo.LibraryVersionComponent @Keep class FirebaseUIComposeRegistrar : ComponentRegistrar { override fun getComponents(): List> { + Log.d("FirebaseUIRegistrar", "FirebaseUI Compose Registrar initialized") return listOf( LibraryVersionComponent.create(BuildConfig.LIBRARY_NAME, BuildConfig.VERSION_NAME) ) diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/AuthUIConfiguration.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/AuthUIConfiguration.kt index d0a808fec..68087b419 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/AuthUIConfiguration.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/AuthUIConfiguration.kt @@ -12,17 +12,17 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration +package com.firebase.ui.auth.configuration import android.content.Context import androidx.compose.ui.graphics.vector.ImageVector -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvidersBuilder -import com.firebase.ui.auth.compose.configuration.auth_provider.Provider -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset -import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.auth_provider.AuthProvidersBuilder +import com.firebase.ui.auth.configuration.auth_provider.Provider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.theme.AuthUIAsset +import com.firebase.ui.auth.configuration.theme.AuthUITheme import com.google.firebase.auth.ActionCodeSettings import java.util.Locale diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/MfaConfiguration.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/MfaConfiguration.kt index 393ef0f26..ed748bfe0 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/MfaConfiguration.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/MfaConfiguration.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration +package com.firebase.ui.auth.configuration /** * Configuration class for Multi-Factor Authentication (MFA) enrollment and verification behavior. diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/MfaFactor.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/MfaFactor.kt index 78926ace4..472740560 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/MfaFactor.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/MfaFactor.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration +package com.firebase.ui.auth.configuration /** * Represents the different Multi-Factor Authentication (MFA) factors that can be used diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/PasswordRule.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/PasswordRule.kt index 5187f96a5..d10f1c811 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/PasswordRule.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/PasswordRule.kt @@ -12,13 +12,13 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration +package com.firebase.ui.auth.configuration -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider /** * An abstract class representing a set of validation rules that can be applied to a password field, - * typically within the [com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider.Email] configuration. + * typically within the [com.firebase.ui.auth.configuration.auth_provider.AuthProvider.Email] configuration. */ abstract class PasswordRule { /** diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/AnonymousAuthProvider+FirebaseAuthUI.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/AnonymousAuthProvider+FirebaseAuthUI.kt index b82cba9b4..009765727 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/AnonymousAuthProvider+FirebaseAuthUI.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/AnonymousAuthProvider+FirebaseAuthUI.kt @@ -1,11 +1,11 @@ -package com.firebase.ui.auth.compose.configuration.auth_provider +package com.firebase.ui.auth.configuration.auth_provider import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI import kotlinx.coroutines.CancellationException import kotlinx.coroutines.launch import kotlinx.coroutines.tasks.await diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/AuthProvider.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/AuthProvider.kt index f4a9ceed6..fb8e55775 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/AuthProvider.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/AuthProvider.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.auth_provider +package com.firebase.ui.auth.configuration.auth_provider import android.app.Activity import android.content.Context @@ -26,10 +26,10 @@ import androidx.credentials.GetCredentialRequest import androidx.datastore.preferences.core.stringPreferencesKey import com.facebook.AccessToken import com.firebase.ui.auth.R -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.AuthUIConfigurationDsl -import com.firebase.ui.auth.compose.configuration.PasswordRule -import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.AuthUIConfigurationDsl +import com.firebase.ui.auth.configuration.PasswordRule +import com.firebase.ui.auth.configuration.theme.AuthUIAsset import com.firebase.ui.auth.util.ContinueUrlBuilder import com.firebase.ui.auth.util.PhoneNumberUtils import com.firebase.ui.auth.util.Preconditions diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/EmailAuthProvider+FirebaseAuthUI.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/EmailAuthProvider+FirebaseAuthUI.kt index 0ebf95956..878fd03a5 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/EmailAuthProvider+FirebaseAuthUI.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/EmailAuthProvider+FirebaseAuthUI.kt @@ -12,19 +12,20 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.auth_provider +package com.firebase.ui.auth.configuration.auth_provider import android.content.Context import android.net.Uri import com.firebase.ui.auth.R -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider.Companion.canUpgradeAnonymous -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider.Companion.mergeProfile -import com.firebase.ui.auth.compose.util.EmailLinkPersistenceManager +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider.Companion.canUpgradeAnonymous +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider.Companion.mergeProfile +import com.firebase.ui.auth.util.EmailLinkPersistenceManager import com.firebase.ui.auth.util.EmailLinkParser +import com.firebase.ui.auth.util.PersistenceManager import com.firebase.ui.auth.util.SessionUtils import com.google.firebase.FirebaseApp import com.google.firebase.auth.ActionCodeSettings @@ -654,7 +655,7 @@ internal suspend fun FirebaseAuthUI.sendSignInLinkToEmail( provider: AuthProvider.Email, email: String, credentialForLinking: AuthCredential?, - persistenceManager: com.firebase.ui.auth.compose.util.PersistenceManager = EmailLinkPersistenceManager.default, + persistenceManager: PersistenceManager = EmailLinkPersistenceManager.default, ) { try { updateAuthState(AuthState.Loading("Sending sign in email link...")) @@ -812,7 +813,7 @@ internal suspend fun FirebaseAuthUI.signInWithEmailLink( provider: AuthProvider.Email, email: String, emailLink: String, - persistenceManager: com.firebase.ui.auth.compose.util.PersistenceManager = EmailLinkPersistenceManager.default, + persistenceManager: PersistenceManager = EmailLinkPersistenceManager.default, ): AuthResult? { try { updateAuthState(AuthState.Loading("Signing in with email link...")) diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/FacebookAuthProvider+FirebaseAuthUI.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/FacebookAuthProvider+FirebaseAuthUI.kt index 41b7c0b6f..9939a4b47 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/FacebookAuthProvider+FirebaseAuthUI.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/FacebookAuthProvider+FirebaseAuthUI.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.auth_provider +package com.firebase.ui.auth.configuration.auth_provider import android.content.Context import android.util.Log @@ -27,11 +27,11 @@ import com.facebook.FacebookCallback import com.facebook.FacebookException import com.facebook.login.LoginManager import com.facebook.login.LoginResult -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.util.EmailLinkPersistenceManager +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.util.EmailLinkPersistenceManager import kotlinx.coroutines.CancellationException import kotlinx.coroutines.launch diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/GoogleAuthProvider+FirebaseAuthUI.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/GoogleAuthProvider+FirebaseAuthUI.kt index 8f8cb6b69..d42362692 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/GoogleAuthProvider+FirebaseAuthUI.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/GoogleAuthProvider+FirebaseAuthUI.kt @@ -1,4 +1,4 @@ -package com.firebase.ui.auth.compose.configuration.auth_provider +package com.firebase.ui.auth.configuration.auth_provider import android.content.Context import androidx.compose.runtime.Composable @@ -8,11 +8,11 @@ import androidx.credentials.ClearCredentialStateRequest import androidx.credentials.CredentialManager import androidx.credentials.exceptions.GetCredentialException import androidx.credentials.exceptions.NoCredentialException -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.util.EmailLinkPersistenceManager +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.util.EmailLinkPersistenceManager import com.google.android.gms.common.api.Scope import com.google.android.libraries.identity.googleid.GoogleIdTokenParsingException import kotlinx.coroutines.CancellationException diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/OAuthProvider+FirebaseAuthUI.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/OAuthProvider+FirebaseAuthUI.kt index 1c8eb48d2..615aa6982 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/OAuthProvider+FirebaseAuthUI.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/OAuthProvider+FirebaseAuthUI.kt @@ -1,14 +1,14 @@ -package com.firebase.ui.auth.compose.configuration.auth_provider +package com.firebase.ui.auth.configuration.auth_provider import android.app.Activity import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider.Companion.canUpgradeAnonymous +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider.Companion.canUpgradeAnonymous import com.google.firebase.auth.FirebaseAuthUserCollisionException import com.google.firebase.auth.OAuthCredential import com.google.firebase.auth.OAuthProvider diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/PhoneAuthProvider+FirebaseAuthUI.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/PhoneAuthProvider+FirebaseAuthUI.kt index af381e78c..95dbdcf78 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/PhoneAuthProvider+FirebaseAuthUI.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/PhoneAuthProvider+FirebaseAuthUI.kt @@ -1,10 +1,10 @@ -package com.firebase.ui.auth.compose.configuration.auth_provider +package com.firebase.ui.auth.configuration.auth_provider import android.app.Activity -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration import com.google.firebase.auth.AuthResult import com.google.firebase.auth.MultiFactorSession import com.google.firebase.auth.PhoneAuthCredential diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/string_provider/AuthUIStringProvider.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/string_provider/AuthUIStringProvider.kt index e5a6631d0..da7b8d7c4 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/string_provider/AuthUIStringProvider.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/string_provider/AuthUIStringProvider.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.string_provider +package com.firebase.ui.auth.configuration.string_provider import androidx.compose.runtime.staticCompositionLocalOf diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/string_provider/AuthUIStringProviderSample.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/string_provider/AuthUIStringProviderSample.kt index 453f28cda..cb82bee99 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/string_provider/AuthUIStringProviderSample.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/string_provider/AuthUIStringProviderSample.kt @@ -12,12 +12,12 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.string_provider +package com.firebase.ui.auth.configuration.string_provider import android.content.Context -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider class AuthUIStringProviderSample { /** diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/string_provider/DefaultAuthUIStringProvider.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/string_provider/DefaultAuthUIStringProvider.kt index 4f39b0504..e9807866a 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/string_provider/DefaultAuthUIStringProvider.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/string_provider/DefaultAuthUIStringProvider.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.string_provider +package com.firebase.ui.auth.configuration.string_provider import android.content.Context import android.content.res.Configuration diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/theme/AuthUIAsset.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/theme/AuthUIAsset.kt index f54f0ed5b..c59fcf66e 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/theme/AuthUIAsset.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/theme/AuthUIAsset.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.theme +package com.firebase.ui.auth.configuration.theme import androidx.annotation.DrawableRes import androidx.compose.runtime.Composable diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/theme/AuthUITheme.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/theme/AuthUITheme.kt index 4ef809e9c..a2e8e143a 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/theme/AuthUITheme.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/theme/AuthUITheme.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.theme +package com.firebase.ui.auth.configuration.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.shape.RoundedCornerShape diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/theme/ProviderStyleDefaults.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/theme/ProviderStyleDefaults.kt index 115823a13..051758528 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/theme/ProviderStyleDefaults.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/theme/ProviderStyleDefaults.kt @@ -12,11 +12,11 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.theme +package com.firebase.ui.auth.configuration.theme import androidx.compose.ui.graphics.Color import com.firebase.ui.auth.R -import com.firebase.ui.auth.compose.configuration.auth_provider.Provider +import com.firebase.ui.auth.configuration.auth_provider.Provider /** * Default provider styling configurations for authentication providers. diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/validators/EmailValidator.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/validators/EmailValidator.kt index 30582a309..0bcee25bc 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/validators/EmailValidator.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/validators/EmailValidator.kt @@ -12,9 +12,9 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.validators +package com.firebase.ui.auth.configuration.validators -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider internal class EmailValidator(override val stringProvider: AuthUIStringProvider) : FieldValidator { private var _validationStatus = FieldValidationStatus(hasError = false, errorMessage = null) diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/validators/FieldValidationStatus.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/validators/FieldValidationStatus.kt index 7a681c921..a72313560 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/validators/FieldValidationStatus.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/validators/FieldValidationStatus.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.validators +package com.firebase.ui.auth.configuration.validators /** * Class for encapsulating [hasError] and [errorMessage] properties in diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/validators/FieldValidator.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/validators/FieldValidator.kt index 88cf98875..4a6924f50 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/validators/FieldValidator.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/validators/FieldValidator.kt @@ -12,9 +12,9 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.validators +package com.firebase.ui.auth.configuration.validators -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider /** * An interface for validating input fields. diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/validators/GeneralFieldValidator.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/validators/GeneralFieldValidator.kt index 74a08fe68..a72c9f80d 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/validators/GeneralFieldValidator.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/validators/GeneralFieldValidator.kt @@ -12,9 +12,9 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.validators +package com.firebase.ui.auth.configuration.validators -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider internal class GeneralFieldValidator( override val stringProvider: AuthUIStringProvider, diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/validators/PasswordValidator.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/validators/PasswordValidator.kt index 65f163fea..b7a8a70eb 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/validators/PasswordValidator.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/validators/PasswordValidator.kt @@ -12,10 +12,10 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.validators +package com.firebase.ui.auth.configuration.validators -import com.firebase.ui.auth.compose.configuration.PasswordRule -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.PasswordRule +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider internal class PasswordValidator( override val stringProvider: AuthUIStringProvider, diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/validators/PhoneNumberValidator.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/validators/PhoneNumberValidator.kt index 692ee0e44..1d2484bbc 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/validators/PhoneNumberValidator.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/validators/PhoneNumberValidator.kt @@ -12,10 +12,10 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.validators +package com.firebase.ui.auth.configuration.validators -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.data.CountryData +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.data.CountryData import com.google.i18n.phonenumbers.NumberParseException import com.google.i18n.phonenumbers.PhoneNumberUtil diff --git a/auth/src/main/java/com/firebase/ui/auth/configuration/validators/VerificationCodeValidator.kt b/auth/src/main/java/com/firebase/ui/auth/configuration/validators/VerificationCodeValidator.kt index e72f100ca..9824a8161 100644 --- a/auth/src/main/java/com/firebase/ui/auth/configuration/validators/VerificationCodeValidator.kt +++ b/auth/src/main/java/com/firebase/ui/auth/configuration/validators/VerificationCodeValidator.kt @@ -12,9 +12,9 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.validators +package com.firebase.ui.auth.configuration.validators -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider internal class VerificationCodeValidator(override val stringProvider: AuthUIStringProvider) : FieldValidator { diff --git a/auth/src/main/java/com/firebase/ui/auth/credentialmanager/PasswordCredential.kt b/auth/src/main/java/com/firebase/ui/auth/credentialmanager/PasswordCredential.kt index 23d2e6080..535ace99d 100644 --- a/auth/src/main/java/com/firebase/ui/auth/credentialmanager/PasswordCredential.kt +++ b/auth/src/main/java/com/firebase/ui/auth/credentialmanager/PasswordCredential.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.credentialmanager +package com.firebase.ui.auth.credentialmanager /** * Represents a password credential retrieved from the system credential manager. diff --git a/auth/src/main/java/com/firebase/ui/auth/credentialmanager/PasswordCredentialHandler.kt b/auth/src/main/java/com/firebase/ui/auth/credentialmanager/PasswordCredentialHandler.kt index 491606f5d..65e0ac0c0 100644 --- a/auth/src/main/java/com/firebase/ui/auth/credentialmanager/PasswordCredentialHandler.kt +++ b/auth/src/main/java/com/firebase/ui/auth/credentialmanager/PasswordCredentialHandler.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.credentialmanager +package com.firebase.ui.auth.credentialmanager import android.content.Context import androidx.credentials.CreatePasswordRequest diff --git a/auth/src/main/java/com/firebase/ui/auth/data/Countries.kt b/auth/src/main/java/com/firebase/ui/auth/data/Countries.kt index 3ba0dc497..e6400cc60 100644 --- a/auth/src/main/java/com/firebase/ui/auth/data/Countries.kt +++ b/auth/src/main/java/com/firebase/ui/auth/data/Countries.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.data +package com.firebase.ui.auth.data /** * Complete list of countries with their dial codes and ISO country codes. diff --git a/auth/src/main/java/com/firebase/ui/auth/data/CountryData.kt b/auth/src/main/java/com/firebase/ui/auth/data/CountryData.kt index 7deb276b7..e171f47a8 100644 --- a/auth/src/main/java/com/firebase/ui/auth/data/CountryData.kt +++ b/auth/src/main/java/com/firebase/ui/auth/data/CountryData.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.data +package com.firebase.ui.auth.data /** * Represents country information for phone number authentication. diff --git a/auth/src/main/java/com/firebase/ui/auth/mfa/MfaChallengeContentState.kt b/auth/src/main/java/com/firebase/ui/auth/mfa/MfaChallengeContentState.kt index 8e0381830..4311a7926 100644 --- a/auth/src/main/java/com/firebase/ui/auth/mfa/MfaChallengeContentState.kt +++ b/auth/src/main/java/com/firebase/ui/auth/mfa/MfaChallengeContentState.kt @@ -12,9 +12,9 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.mfa +package com.firebase.ui.auth.mfa -import com.firebase.ui.auth.compose.configuration.MfaFactor +import com.firebase.ui.auth.configuration.MfaFactor /** * State class containing all the necessary information to render a custom UI for the diff --git a/auth/src/main/java/com/firebase/ui/auth/mfa/MfaEnrollmentContentState.kt b/auth/src/main/java/com/firebase/ui/auth/mfa/MfaEnrollmentContentState.kt index 42b8fe06e..674cb42e6 100644 --- a/auth/src/main/java/com/firebase/ui/auth/mfa/MfaEnrollmentContentState.kt +++ b/auth/src/main/java/com/firebase/ui/auth/mfa/MfaEnrollmentContentState.kt @@ -12,10 +12,10 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.mfa +package com.firebase.ui.auth.mfa -import com.firebase.ui.auth.compose.configuration.MfaFactor -import com.firebase.ui.auth.compose.data.CountryData +import com.firebase.ui.auth.configuration.MfaFactor +import com.firebase.ui.auth.data.CountryData import com.google.firebase.auth.MultiFactorInfo /** @@ -49,9 +49,9 @@ import com.google.firebase.auth.MultiFactorInfo * @property error An optional error message to display to the user. Will be `null` if there's no error. * @property onBackClick Callback to navigate to the previous step in the flow. Invoked when the user clicks a back button. * - * @property availableFactors (Step: [MfaEnrollmentStep.SelectFactor]) A list of MFA factors the user can choose from (e.g., SMS, TOTP). Determined by [com.firebase.ui.auth.compose.configuration.MfaConfiguration.allowedFactors]. + * @property availableFactors (Step: [MfaEnrollmentStep.SelectFactor]) A list of MFA factors the user can choose from (e.g., SMS, TOTP). Determined by [com.firebase.ui.auth.configuration.MfaConfiguration.allowedFactors]. * @property onFactorSelected (Step: [MfaEnrollmentStep.SelectFactor]) Callback invoked when the user selects an MFA factor. Receives the selected [MfaFactor]. - * @property onSkipClick (Step: [MfaEnrollmentStep.SelectFactor]) Callback for the "Skip" action. Will be `null` if MFA enrollment is required via [com.firebase.ui.auth.compose.configuration.MfaConfiguration.requireEnrollment]. + * @property onSkipClick (Step: [MfaEnrollmentStep.SelectFactor]) Callback for the "Skip" action. Will be `null` if MFA enrollment is required via [com.firebase.ui.auth.configuration.MfaConfiguration.requireEnrollment]. * * @property phoneNumber (Step: [MfaEnrollmentStep.ConfigureSms]) The current value of the phone number input field. Does not include country code prefix. * @property onPhoneNumberChange (Step: [MfaEnrollmentStep.ConfigureSms]) Callback invoked when the phone number input changes. Receives the new phone number string. @@ -70,7 +70,7 @@ import com.google.firebase.auth.MultiFactorInfo * @property resendTimer (Step: [MfaEnrollmentStep.VerifyFactor], SMS only) The number of seconds remaining before the "Resend" action is available. Will be 0 when resend is allowed. * @property onResendCodeClick (Step: [MfaEnrollmentStep.VerifyFactor], SMS only) Callback to resend the SMS verification code. Will be `null` for TOTP verification. * - * @property recoveryCodes (Step: [MfaEnrollmentStep.ShowRecoveryCodes]) A list of one-time backup codes the user should save. Only present if [com.firebase.ui.auth.compose.configuration.MfaConfiguration.enableRecoveryCodes] is `true`. + * @property recoveryCodes (Step: [MfaEnrollmentStep.ShowRecoveryCodes]) A list of one-time backup codes the user should save. Only present if [com.firebase.ui.auth.configuration.MfaConfiguration.enableRecoveryCodes] is `true`. * @property onCodesSavedClick (Step: [MfaEnrollmentStep.ShowRecoveryCodes]) Callback invoked when the user confirms they have saved their recovery codes. Completes the enrollment flow. * * @since 10.0.0 diff --git a/auth/src/main/java/com/firebase/ui/auth/mfa/MfaEnrollmentStep.kt b/auth/src/main/java/com/firebase/ui/auth/mfa/MfaEnrollmentStep.kt index 160fa88ab..8d64da620 100644 --- a/auth/src/main/java/com/firebase/ui/auth/mfa/MfaEnrollmentStep.kt +++ b/auth/src/main/java/com/firebase/ui/auth/mfa/MfaEnrollmentStep.kt @@ -12,10 +12,10 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.mfa +package com.firebase.ui.auth.mfa -import com.firebase.ui.auth.compose.configuration.MfaFactor -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.MfaFactor +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider /** * Represents the different steps in the Multi-Factor Authentication (MFA) enrollment flow. @@ -28,7 +28,7 @@ import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringPr enum class MfaEnrollmentStep { /** * The user is presented with a selection of available MFA factors to enroll in. - * The available factors are determined by the [com.firebase.ui.auth.compose.configuration.MfaConfiguration]. + * The available factors are determined by the [com.firebase.ui.auth.configuration.MfaConfiguration]. */ SelectFactor, diff --git a/auth/src/main/java/com/firebase/ui/auth/mfa/MfaErrorMapper.kt b/auth/src/main/java/com/firebase/ui/auth/mfa/MfaErrorMapper.kt index 51be1dd98..7776702ee 100644 --- a/auth/src/main/java/com/firebase/ui/auth/mfa/MfaErrorMapper.kt +++ b/auth/src/main/java/com/firebase/ui/auth/mfa/MfaErrorMapper.kt @@ -12,9 +12,9 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.mfa +package com.firebase.ui.auth.mfa -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider import com.google.firebase.FirebaseNetworkException import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException import com.google.firebase.auth.FirebaseAuthRecentLoginRequiredException diff --git a/auth/src/main/java/com/firebase/ui/auth/mfa/SmsEnrollmentHandler.kt b/auth/src/main/java/com/firebase/ui/auth/mfa/SmsEnrollmentHandler.kt index 02037c4c9..8aec7c9c3 100644 --- a/auth/src/main/java/com/firebase/ui/auth/mfa/SmsEnrollmentHandler.kt +++ b/auth/src/main/java/com/firebase/ui/auth/mfa/SmsEnrollmentHandler.kt @@ -12,11 +12,11 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.mfa +package com.firebase.ui.auth.mfa import android.app.Activity -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.mfa.SmsEnrollmentHandler.Companion.RESEND_DELAY_SECONDS +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.mfa.SmsEnrollmentHandler.Companion.RESEND_DELAY_SECONDS import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser import com.google.firebase.auth.PhoneAuthCredential diff --git a/auth/src/main/java/com/firebase/ui/auth/mfa/TotpEnrollmentHandler.kt b/auth/src/main/java/com/firebase/ui/auth/mfa/TotpEnrollmentHandler.kt index 9a4d6f8c7..33bc874c6 100644 --- a/auth/src/main/java/com/firebase/ui/auth/mfa/TotpEnrollmentHandler.kt +++ b/auth/src/main/java/com/firebase/ui/auth/mfa/TotpEnrollmentHandler.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.mfa +package com.firebase.ui.auth.mfa import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser diff --git a/auth/src/main/java/com/firebase/ui/auth/mfa/TotpSecret.kt b/auth/src/main/java/com/firebase/ui/auth/mfa/TotpSecret.kt index 878f0759d..7a4121ba8 100644 --- a/auth/src/main/java/com/firebase/ui/auth/mfa/TotpSecret.kt +++ b/auth/src/main/java/com/firebase/ui/auth/mfa/TotpSecret.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.mfa +package com.firebase.ui.auth.mfa import android.content.Intent import android.net.Uri diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/components/AuthProviderButton.kt b/auth/src/main/java/com/firebase/ui/auth/ui/components/AuthProviderButton.kt index cb0e71a63..29a406821 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/components/AuthProviderButton.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/components/AuthProviderButton.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.components +package com.firebase.ui.auth.ui.components import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -38,12 +38,12 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.auth_provider.Provider -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset -import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.auth_provider.Provider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.theme.AuthUIAsset +import com.firebase.ui.auth.configuration.theme.AuthUITheme /** * A customizable button for an authentication provider. diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/components/AuthTextField.kt b/auth/src/main/java/com/firebase/ui/auth/ui/components/AuthTextField.kt index 725ba2f12..253a6e260 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/components/AuthTextField.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/components/AuthTextField.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.components +package com.firebase.ui.auth.ui.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -46,11 +46,11 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.configuration.PasswordRule -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.validators.EmailValidator -import com.firebase.ui.auth.compose.configuration.validators.FieldValidator -import com.firebase.ui.auth.compose.configuration.validators.PasswordValidator +import com.firebase.ui.auth.configuration.PasswordRule +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.validators.EmailValidator +import com.firebase.ui.auth.configuration.validators.FieldValidator +import com.firebase.ui.auth.configuration.validators.PasswordValidator /** * A customizable input field with built-in validation display. diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/components/CountrySelector.kt b/auth/src/main/java/com/firebase/ui/auth/ui/components/CountrySelector.kt index 5d3e29bdf..425aa32bc 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/components/CountrySelector.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/components/CountrySelector.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.components +package com.firebase.ui.auth.ui.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -54,10 +54,10 @@ import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.role import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.data.ALL_COUNTRIES -import com.firebase.ui.auth.compose.data.CountryData -import com.firebase.ui.auth.compose.util.CountryUtils +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.data.ALL_COUNTRIES +import com.firebase.ui.auth.data.CountryData +import com.firebase.ui.auth.util.CountryUtils import kotlinx.coroutines.launch /** diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/components/ErrorRecoveryDialog.kt b/auth/src/main/java/com/firebase/ui/auth/ui/components/ErrorRecoveryDialog.kt index c583ada1b..232c492c9 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/components/ErrorRecoveryDialog.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/components/ErrorRecoveryDialog.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.components +package com.firebase.ui.auth.ui.components import androidx.compose.material3.AlertDialog import androidx.compose.material3.MaterialTheme @@ -22,8 +22,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.window.DialogProperties -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider /** * A composable dialog for displaying authentication errors with recovery options. diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/components/QrCodeImage.kt b/auth/src/main/java/com/firebase/ui/auth/ui/components/QrCodeImage.kt index ab67379c9..754aa5cc7 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/components/QrCodeImage.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/components/QrCodeImage.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.components +package com.firebase.ui.auth.ui.components import android.graphics.Bitmap import androidx.compose.foundation.Image diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/components/ReauthenticationDialog.kt b/auth/src/main/java/com/firebase/ui/auth/ui/components/ReauthenticationDialog.kt index e529fdea5..08c9ed89c 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/components/ReauthenticationDialog.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/components/ReauthenticationDialog.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.components +package com.firebase.ui.auth.ui.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -43,8 +43,8 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider import com.google.firebase.auth.EmailAuthProvider import com.google.firebase.auth.FirebaseUser import kotlinx.coroutines.launch diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/components/TermsAndPrivacyForm.kt b/auth/src/main/java/com/firebase/ui/auth/ui/components/TermsAndPrivacyForm.kt index 82694d3dc..601452006 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/components/TermsAndPrivacyForm.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/components/TermsAndPrivacyForm.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.components +package com.firebase.ui.auth.ui.components import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/components/TopLevelDialogController.kt b/auth/src/main/java/com/firebase/ui/auth/ui/components/TopLevelDialogController.kt index 973d6e6d5..626c56c04 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/components/TopLevelDialogController.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/components/TopLevelDialogController.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.components +package com.firebase.ui.auth.ui.components import androidx.compose.runtime.Composable import androidx.compose.runtime.compositionLocalOf @@ -20,9 +20,9 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider /** * CompositionLocal for accessing the top-level dialog controller from any composable. diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/components/VerificationCodeInputField.kt b/auth/src/main/java/com/firebase/ui/auth/ui/components/VerificationCodeInputField.kt index 06fdca169..ab79e8954 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/components/VerificationCodeInputField.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/components/VerificationCodeInputField.kt @@ -1,4 +1,4 @@ -package com.firebase.ui.auth.compose.ui.components +package com.firebase.ui.auth.ui.components import androidx.compose.animation.core.animateDpAsState import androidx.compose.animation.core.tween @@ -57,8 +57,8 @@ import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.role import androidx.compose.ui.semantics.semantics import androidx.core.text.isDigitsOnly -import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme -import com.firebase.ui.auth.compose.configuration.validators.FieldValidator +import com.firebase.ui.auth.configuration.theme.AuthUITheme +import com.firebase.ui.auth.configuration.validators.FieldValidator @Composable fun VerificationCodeInputField( diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/method_picker/AnnotatedStringResource.kt b/auth/src/main/java/com/firebase/ui/auth/ui/method_picker/AnnotatedStringResource.kt index 7d0f6359c..7cf0c8ce5 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/method_picker/AnnotatedStringResource.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/method_picker/AnnotatedStringResource.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.method_picker +package com.firebase.ui.auth.ui.method_picker import android.content.Context import android.content.Intent diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/method_picker/AuthMethodPicker.kt b/auth/src/main/java/com/firebase/ui/auth/ui/method_picker/AuthMethodPicker.kt index 42b620d28..5c69b19bc 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/method_picker/AuthMethodPicker.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/method_picker/AuthMethodPicker.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.method_picker +package com.firebase.ui.auth.ui.method_picker import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -33,10 +33,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.firebase.ui.auth.R -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset -import com.firebase.ui.auth.compose.ui.components.AuthProviderButton +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.configuration.theme.AuthUIAsset +import com.firebase.ui.auth.ui.components.AuthProviderButton /** * Renders the provider selection screen. diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/FirebaseAuthScreen.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/FirebaseAuthScreen.kt index 9039ead5d..0a0a3c045 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/FirebaseAuthScreen.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/FirebaseAuthScreen.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens +package com.firebase.ui.auth.ui.screens import android.util.Log import androidx.activity.compose.LocalActivity @@ -46,26 +46,26 @@ import androidx.compose.ui.unit.dp import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.MfaConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.auth_provider.rememberAnonymousSignInHandler -import com.firebase.ui.auth.compose.configuration.auth_provider.rememberGoogleSignInHandler -import com.firebase.ui.auth.compose.configuration.auth_provider.rememberOAuthSignInHandler -import com.firebase.ui.auth.compose.configuration.auth_provider.rememberSignInWithFacebookLauncher -import com.firebase.ui.auth.compose.configuration.auth_provider.signInWithEmailLink -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.ui.components.LocalTopLevelDialogController -import com.firebase.ui.auth.compose.ui.components.rememberTopLevelDialogController -import com.firebase.ui.auth.compose.ui.method_picker.AuthMethodPicker -import com.firebase.ui.auth.compose.ui.screens.email.EmailAuthScreen -import com.firebase.ui.auth.compose.ui.screens.phone.PhoneAuthScreen -import com.firebase.ui.auth.compose.util.EmailLinkPersistenceManager +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.MfaConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.auth_provider.rememberAnonymousSignInHandler +import com.firebase.ui.auth.configuration.auth_provider.rememberGoogleSignInHandler +import com.firebase.ui.auth.configuration.auth_provider.rememberOAuthSignInHandler +import com.firebase.ui.auth.configuration.auth_provider.rememberSignInWithFacebookLauncher +import com.firebase.ui.auth.configuration.auth_provider.signInWithEmailLink +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.ui.components.LocalTopLevelDialogController +import com.firebase.ui.auth.ui.components.rememberTopLevelDialogController +import com.firebase.ui.auth.ui.method_picker.AuthMethodPicker +import com.firebase.ui.auth.ui.screens.email.EmailAuthScreen +import com.firebase.ui.auth.ui.screens.phone.PhoneAuthScreen +import com.firebase.ui.auth.util.EmailLinkPersistenceManager import com.google.firebase.auth.AuthCredential import com.google.firebase.auth.AuthResult import com.google.firebase.auth.MultiFactorResolver diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaChallengeDefaults.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaChallengeDefaults.kt index dcc167d53..bca4bc4c5 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaChallengeDefaults.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaChallengeDefaults.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens +package com.firebase.ui.auth.ui.screens import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -36,11 +36,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.configuration.MfaFactor -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.validators.VerificationCodeValidator -import com.firebase.ui.auth.compose.mfa.MfaChallengeContentState -import com.firebase.ui.auth.compose.ui.components.VerificationCodeInputField +import com.firebase.ui.auth.configuration.MfaFactor +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.configuration.validators.VerificationCodeValidator +import com.firebase.ui.auth.mfa.MfaChallengeContentState +import com.firebase.ui.auth.ui.components.VerificationCodeInputField @Composable internal fun DefaultMfaChallengeContent(state: MfaChallengeContentState) { diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaChallengeScreen.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaChallengeScreen.kt index 0b418a716..2dab06adb 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaChallengeScreen.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaChallengeScreen.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens +package com.firebase.ui.auth.ui.screens import androidx.activity.compose.LocalActivity import androidx.compose.runtime.Composable @@ -22,10 +22,10 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable -import com.firebase.ui.auth.compose.configuration.MfaFactor -import com.firebase.ui.auth.compose.mfa.MfaChallengeContentState -import com.firebase.ui.auth.compose.mfa.SmsEnrollmentHandler -import com.firebase.ui.auth.compose.mfa.maskPhoneNumber +import com.firebase.ui.auth.configuration.MfaFactor +import com.firebase.ui.auth.mfa.MfaChallengeContentState +import com.firebase.ui.auth.mfa.SmsEnrollmentHandler +import com.firebase.ui.auth.mfa.maskPhoneNumber import com.google.firebase.auth.AuthResult import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.MultiFactorResolver diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentDefaults.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentDefaults.kt index e08eafa33..61f1151a6 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentDefaults.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentDefaults.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens +package com.firebase.ui.auth.ui.screens import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -46,20 +46,20 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.MfaFactor -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.mfa.MfaEnrollmentContentState -import com.firebase.ui.auth.compose.mfa.MfaEnrollmentStep -import com.firebase.ui.auth.compose.mfa.toMfaErrorMessage -import com.firebase.ui.auth.compose.ui.components.QrCodeImage -import com.firebase.ui.auth.compose.ui.components.ReauthenticationDialog -import com.firebase.ui.auth.compose.ui.screens.phone.EnterPhoneNumberUI -import com.firebase.ui.auth.compose.ui.screens.phone.EnterVerificationCodeUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.MfaFactor +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.mfa.MfaEnrollmentContentState +import com.firebase.ui.auth.mfa.MfaEnrollmentStep +import com.firebase.ui.auth.mfa.toMfaErrorMessage +import com.firebase.ui.auth.ui.components.QrCodeImage +import com.firebase.ui.auth.ui.components.ReauthenticationDialog +import com.firebase.ui.auth.ui.screens.phone.EnterPhoneNumberUI +import com.firebase.ui.auth.ui.screens.phone.EnterVerificationCodeUI import com.google.firebase.auth.FirebaseAuthRecentLoginRequiredException import com.google.firebase.auth.FirebaseUser import com.google.firebase.auth.MultiFactorInfo @@ -238,7 +238,7 @@ private fun SelectFactorUI( onSkipClick: (() -> Unit)?, isLoading: Boolean, error: String?, - stringProvider: com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider + stringProvider: AuthUIStringProvider ) { val enrolledFactorIds = enrolledFactors.mapNotNull { when (it) { @@ -348,7 +348,7 @@ private fun EnrolledFactorItem( factorInfo: MultiFactorInfo, onRemove: () -> Unit, enabled: Boolean, - stringProvider: com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider + stringProvider: AuthUIStringProvider ) { Card( modifier = Modifier.fillMaxWidth(), @@ -414,7 +414,7 @@ private fun ConfigureTotpUI( isLoading: Boolean, isValid: Boolean, error: String?, - stringProvider: com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider + stringProvider: AuthUIStringProvider ) { Scaffold { innerPadding -> Column( @@ -503,7 +503,7 @@ private fun VerifyTotpUI( isLoading: Boolean, isValid: Boolean, error: String?, - stringProvider: com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider + stringProvider: AuthUIStringProvider ) { Scaffold { innerPadding -> Column( @@ -576,7 +576,7 @@ private fun ShowRecoveryCodesUI( onDoneClick: () -> Unit, isLoading: Boolean, error: String?, - stringProvider: com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider + stringProvider: AuthUIStringProvider ) { Scaffold { innerPadding -> Column( diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentScreen.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentScreen.kt index 7be763141..29f6827c9 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentScreen.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentScreen.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens +package com.firebase.ui.auth.ui.screens import androidx.activity.compose.LocalActivity import androidx.compose.runtime.Composable @@ -23,19 +23,19 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.platform.LocalContext -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.MfaConfiguration -import com.firebase.ui.auth.compose.configuration.MfaFactor -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.data.CountryData -import com.firebase.ui.auth.compose.util.CountryUtils -import com.firebase.ui.auth.compose.mfa.MfaEnrollmentContentState -import com.firebase.ui.auth.compose.mfa.MfaEnrollmentStep -import com.firebase.ui.auth.compose.mfa.SmsEnrollmentHandler -import com.firebase.ui.auth.compose.mfa.SmsEnrollmentSession -import com.firebase.ui.auth.compose.mfa.TotpEnrollmentHandler -import com.firebase.ui.auth.compose.mfa.TotpSecret +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.MfaConfiguration +import com.firebase.ui.auth.configuration.MfaFactor +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.data.CountryData +import com.firebase.ui.auth.util.CountryUtils +import com.firebase.ui.auth.mfa.MfaEnrollmentContentState +import com.firebase.ui.auth.mfa.MfaEnrollmentStep +import com.firebase.ui.auth.mfa.SmsEnrollmentHandler +import com.firebase.ui.auth.mfa.SmsEnrollmentSession +import com.firebase.ui.auth.mfa.TotpEnrollmentHandler +import com.firebase.ui.auth.mfa.TotpSecret import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser import kotlinx.coroutines.delay diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/EmailAuthScreen.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/EmailAuthScreen.kt index 74b9fa045..5a2c85ae8 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/EmailAuthScreen.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/EmailAuthScreen.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens.email +package com.firebase.ui.auth.ui.screens.email import android.content.Context import android.util.Log @@ -24,18 +24,18 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.auth_provider.createOrLinkUserWithEmailAndPassword -import com.firebase.ui.auth.compose.configuration.auth_provider.sendPasswordResetEmail -import com.firebase.ui.auth.compose.configuration.auth_provider.sendSignInLinkToEmail -import com.firebase.ui.auth.compose.configuration.auth_provider.signInWithEmailAndPassword -import com.firebase.ui.auth.compose.configuration.auth_provider.signInWithEmailLink -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.ui.components.LocalTopLevelDialogController +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.auth_provider.createOrLinkUserWithEmailAndPassword +import com.firebase.ui.auth.configuration.auth_provider.sendPasswordResetEmail +import com.firebase.ui.auth.configuration.auth_provider.sendSignInLinkToEmail +import com.firebase.ui.auth.configuration.auth_provider.signInWithEmailAndPassword +import com.firebase.ui.auth.configuration.auth_provider.signInWithEmailLink +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.ui.components.LocalTopLevelDialogController import com.google.firebase.auth.AuthCredential import com.google.firebase.auth.AuthResult import kotlinx.coroutines.launch diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/ResetPasswordUI.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/ResetPasswordUI.kt index 820dcf0aa..baf9e1485 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/ResetPasswordUI.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/ResetPasswordUI.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens.email +package com.firebase.ui.auth.ui.screens.email import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -43,14 +43,14 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme -import com.firebase.ui.auth.compose.configuration.validators.EmailValidator -import com.firebase.ui.auth.compose.ui.components.AuthTextField -import com.firebase.ui.auth.compose.ui.components.TermsAndPrivacyForm +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.configuration.theme.AuthUITheme +import com.firebase.ui.auth.configuration.validators.EmailValidator +import com.firebase.ui.auth.ui.components.AuthTextField +import com.firebase.ui.auth.ui.components.TermsAndPrivacyForm @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/SignInEmailLinkUI.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/SignInEmailLinkUI.kt index f8dbb1efa..14e045827 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/SignInEmailLinkUI.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/SignInEmailLinkUI.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens.email +package com.firebase.ui.auth.ui.screens.email import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -52,14 +52,14 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme -import com.firebase.ui.auth.compose.configuration.validators.EmailValidator -import com.firebase.ui.auth.compose.ui.components.AuthTextField -import com.firebase.ui.auth.compose.ui.components.TermsAndPrivacyForm +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.configuration.theme.AuthUITheme +import com.firebase.ui.auth.configuration.validators.EmailValidator +import com.firebase.ui.auth.ui.components.AuthTextField +import com.firebase.ui.auth.ui.components.TermsAndPrivacyForm import com.google.firebase.auth.actionCodeSettings @OptIn(ExperimentalMaterial3Api::class) diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/SignInUI.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/SignInUI.kt index 2a9df4307..4f733f355 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/SignInUI.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/SignInUI.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens.email +package com.firebase.ui.auth.ui.screens.email import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -54,15 +54,15 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme -import com.firebase.ui.auth.compose.configuration.validators.EmailValidator -import com.firebase.ui.auth.compose.configuration.validators.PasswordValidator -import com.firebase.ui.auth.compose.ui.components.AuthTextField -import com.firebase.ui.auth.compose.ui.components.TermsAndPrivacyForm +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.configuration.theme.AuthUITheme +import com.firebase.ui.auth.configuration.validators.EmailValidator +import com.firebase.ui.auth.configuration.validators.PasswordValidator +import com.firebase.ui.auth.ui.components.AuthTextField +import com.firebase.ui.auth.ui.components.TermsAndPrivacyForm @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/SignUpUI.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/SignUpUI.kt index db266af79..152931f13 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/SignUpUI.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/email/SignUpUI.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens.email +package com.firebase.ui.auth.ui.screens.email import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -38,16 +38,16 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme -import com.firebase.ui.auth.compose.configuration.validators.EmailValidator -import com.firebase.ui.auth.compose.configuration.validators.GeneralFieldValidator -import com.firebase.ui.auth.compose.configuration.validators.PasswordValidator -import com.firebase.ui.auth.compose.ui.components.AuthTextField -import com.firebase.ui.auth.compose.ui.components.TermsAndPrivacyForm +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.configuration.theme.AuthUITheme +import com.firebase.ui.auth.configuration.validators.EmailValidator +import com.firebase.ui.auth.configuration.validators.GeneralFieldValidator +import com.firebase.ui.auth.configuration.validators.PasswordValidator +import com.firebase.ui.auth.ui.components.AuthTextField +import com.firebase.ui.auth.ui.components.TermsAndPrivacyForm @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/EnterPhoneNumberUI.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/EnterPhoneNumberUI.kt index 6a6fc4010..ef8bfe545 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/EnterPhoneNumberUI.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/EnterPhoneNumberUI.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens.phone +package com.firebase.ui.auth.ui.screens.phone import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -43,17 +43,17 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme -import com.firebase.ui.auth.compose.configuration.validators.PhoneNumberValidator -import com.firebase.ui.auth.compose.data.CountryData -import com.firebase.ui.auth.compose.ui.components.AuthTextField -import com.firebase.ui.auth.compose.ui.components.CountrySelector -import com.firebase.ui.auth.compose.ui.components.TermsAndPrivacyForm -import com.firebase.ui.auth.compose.util.CountryUtils +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.configuration.theme.AuthUITheme +import com.firebase.ui.auth.configuration.validators.PhoneNumberValidator +import com.firebase.ui.auth.data.CountryData +import com.firebase.ui.auth.ui.components.AuthTextField +import com.firebase.ui.auth.ui.components.CountrySelector +import com.firebase.ui.auth.ui.components.TermsAndPrivacyForm +import com.firebase.ui.auth.util.CountryUtils @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/EnterVerificationCodeUI.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/EnterVerificationCodeUI.kt index c22562168..9839a7958 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/EnterVerificationCodeUI.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/EnterVerificationCodeUI.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens.phone +package com.firebase.ui.auth.ui.screens.phone import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -42,14 +42,14 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme -import com.firebase.ui.auth.compose.configuration.validators.VerificationCodeValidator -import com.firebase.ui.auth.compose.ui.components.TermsAndPrivacyForm -import com.firebase.ui.auth.compose.ui.components.VerificationCodeInputField +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.configuration.theme.AuthUITheme +import com.firebase.ui.auth.configuration.validators.VerificationCodeValidator +import com.firebase.ui.auth.ui.components.TermsAndPrivacyForm +import com.firebase.ui.auth.ui.components.VerificationCodeInputField import java.util.Locale @OptIn(ExperimentalMaterial3Api::class) diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/PhoneAuthScreen.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/PhoneAuthScreen.kt index d87afa6bc..300b2112e 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/PhoneAuthScreen.kt +++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/PhoneAuthScreen.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens.phone +package com.firebase.ui.auth.ui.screens.phone import android.content.Context import android.util.Log @@ -27,18 +27,18 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.Modifier -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.auth_provider.signInWithPhoneAuthCredential -import com.firebase.ui.auth.compose.configuration.auth_provider.submitVerificationCode -import com.firebase.ui.auth.compose.configuration.auth_provider.verifyPhoneNumber -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.data.CountryData -import com.firebase.ui.auth.compose.ui.components.LocalTopLevelDialogController -import com.firebase.ui.auth.compose.util.CountryUtils +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.auth_provider.signInWithPhoneAuthCredential +import com.firebase.ui.auth.configuration.auth_provider.submitVerificationCode +import com.firebase.ui.auth.configuration.auth_provider.verifyPhoneNumber +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.data.CountryData +import com.firebase.ui.auth.ui.components.LocalTopLevelDialogController +import com.firebase.ui.auth.util.CountryUtils import com.google.firebase.auth.AuthResult import com.google.firebase.auth.PhoneAuthProvider import kotlinx.coroutines.delay diff --git a/auth/src/main/java/com/firebase/ui/auth/util/CountryUtils.kt b/auth/src/main/java/com/firebase/ui/auth/util/CountryUtils.kt index 8516b454f..a4a4a3cbe 100644 --- a/auth/src/main/java/com/firebase/ui/auth/util/CountryUtils.kt +++ b/auth/src/main/java/com/firebase/ui/auth/util/CountryUtils.kt @@ -1,7 +1,7 @@ -package com.firebase.ui.auth.compose.util +package com.firebase.ui.auth.util -import com.firebase.ui.auth.compose.data.ALL_COUNTRIES -import com.firebase.ui.auth.compose.data.CountryData +import com.firebase.ui.auth.data.ALL_COUNTRIES +import com.firebase.ui.auth.data.CountryData import java.text.Normalizer import java.util.Locale diff --git a/auth/src/main/java/com/firebase/ui/auth/util/EmailLinkConstants.kt b/auth/src/main/java/com/firebase/ui/auth/util/EmailLinkConstants.kt index d02cbedaf..070b85210 100644 --- a/auth/src/main/java/com/firebase/ui/auth/util/EmailLinkConstants.kt +++ b/auth/src/main/java/com/firebase/ui/auth/util/EmailLinkConstants.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.util +package com.firebase.ui.auth.util /** * Constants for email link authentication. diff --git a/auth/src/main/java/com/firebase/ui/auth/util/EmailLinkPersistenceManager.kt b/auth/src/main/java/com/firebase/ui/auth/util/EmailLinkPersistenceManager.kt index 34c23cccc..9cb080ca2 100644 --- a/auth/src/main/java/com/firebase/ui/auth/util/EmailLinkPersistenceManager.kt +++ b/auth/src/main/java/com/firebase/ui/auth/util/EmailLinkPersistenceManager.kt @@ -12,21 +12,21 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.util +package com.firebase.ui.auth.util import android.content.Context import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.preferencesDataStore -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.auth_provider.Provider +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.auth_provider.Provider import com.google.firebase.auth.AuthCredential import com.google.firebase.auth.FacebookAuthProvider import com.google.firebase.auth.GoogleAuthProvider import kotlinx.coroutines.flow.first -private val Context.dataStore: DataStore by preferencesDataStore(name = "com.firebase.ui.auth.compose.util.EmailLinkPersistenceManager") +private val Context.dataStore: DataStore by preferencesDataStore(name = "com.firebase.ui.auth.util.EmailLinkPersistenceManager") /** * Manages saving/retrieving from DataStore for email link sign in. diff --git a/auth/src/main/java/com/firebase/ui/auth/util/PersistenceManager.kt b/auth/src/main/java/com/firebase/ui/auth/util/PersistenceManager.kt index 5640ce639..13c4e2499 100644 --- a/auth/src/main/java/com/firebase/ui/auth/util/PersistenceManager.kt +++ b/auth/src/main/java/com/firebase/ui/auth/util/PersistenceManager.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.util +package com.firebase.ui.auth.util import android.content.Context diff --git a/auth/src/main/java/com/firebase/ui/auth/util/PhoneNumberUtils.kt b/auth/src/main/java/com/firebase/ui/auth/util/PhoneNumberUtils.kt index 5875d23cc..0d895189f 100644 --- a/auth/src/main/java/com/firebase/ui/auth/util/PhoneNumberUtils.kt +++ b/auth/src/main/java/com/firebase/ui/auth/util/PhoneNumberUtils.kt @@ -14,7 +14,7 @@ package com.firebase.ui.auth.util import androidx.annotation.RestrictTo -import com.firebase.ui.auth.compose.util.CountryUtils +import com.firebase.ui.auth.util.CountryUtils /** * Phone number validation utilities. diff --git a/auth/src/main/java/com/firebase/ui/auth/util/Preconditions.java b/auth/src/main/java/com/firebase/ui/auth/util/Preconditions.java index ffd084c30..78c635e2a 100644 --- a/auth/src/main/java/com/firebase/ui/auth/util/Preconditions.java +++ b/auth/src/main/java/com/firebase/ui/auth/util/Preconditions.java @@ -18,7 +18,7 @@ import android.content.res.Resources; import android.os.Bundle; -import com.firebase.ui.auth.compose.FirebaseAuthUI; +import com.firebase.ui.auth.FirebaseAuthUI; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/auth/src/test/java/com/firebase/ui/auth/AuthExceptionTest.kt b/auth/src/test/java/com/firebase/ui/auth/AuthExceptionTest.kt index 46620f853..0b7b5bbbf 100644 --- a/auth/src/test/java/com/firebase/ui/auth/AuthExceptionTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/AuthExceptionTest.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose +package com.firebase.ui.auth import com.google.common.truth.Truth.assertThat import com.google.firebase.FirebaseException diff --git a/auth/src/test/java/com/firebase/ui/auth/AuthFlowControllerTest.kt b/auth/src/test/java/com/firebase/ui/auth/AuthFlowControllerTest.kt index 6a6cafdf5..061422d83 100644 --- a/auth/src/test/java/com/firebase/ui/auth/AuthFlowControllerTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/AuthFlowControllerTest.kt @@ -12,13 +12,13 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose +package com.firebase.ui.auth import android.app.Activity import android.content.Context import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider import com.google.common.truth.Truth.assertThat import com.google.firebase.FirebaseApp import com.google.firebase.FirebaseOptions @@ -134,7 +134,7 @@ class AuthFlowControllerTest { val intent = controller.createIntent(applicationContext) // Intent should contain a configuration key extra - val configKey = intent.getStringExtra("com.firebase.ui.auth.compose.CONFIGURATION_KEY") + val configKey = intent.getStringExtra("com.firebase.ui.auth.CONFIGURATION_KEY") assertThat(configKey).isNotNull() assertThat(configKey).isNotEmpty() } diff --git a/auth/src/test/java/com/firebase/ui/auth/FirebaseAuthActivityTest.kt b/auth/src/test/java/com/firebase/ui/auth/FirebaseAuthActivityTest.kt index 7d3500514..06e8c972a 100644 --- a/auth/src/test/java/com/firebase/ui/auth/FirebaseAuthActivityTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/FirebaseAuthActivityTest.kt @@ -12,20 +12,21 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose +package com.firebase.ui.auth import android.app.Activity import android.content.Context import android.content.Intent import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider import com.google.common.truth.Truth.assertThat import com.google.firebase.FirebaseApp import com.google.firebase.FirebaseOptions import com.google.firebase.auth.FirebaseUser import com.google.firebase.auth.MultiFactorResolver import android.os.Looper +import com.firebase.ui.auth.configuration.theme.AuthUITheme import kotlinx.coroutines.test.runTest import org.junit.After import org.junit.Before @@ -147,7 +148,7 @@ class FirebaseAuthActivityTest { val intent = FirebaseAuthActivity.createIntent(applicationContext, configuration) // Intent should contain configuration key - val configKey = intent.getStringExtra("com.firebase.ui.auth.compose.CONFIGURATION_KEY") + val configKey = intent.getStringExtra("com.firebase.ui.auth.CONFIGURATION_KEY") assertThat(configKey).isNotNull() assertThat(configKey).isNotEmpty() } @@ -381,11 +382,11 @@ class FirebaseAuthActivityTest { @Test fun `activity exposes correct intent extra constants`() { assertThat(FirebaseAuthActivity.EXTRA_USER_ID) - .isEqualTo("com.firebase.ui.auth.compose.USER_ID") + .isEqualTo("com.firebase.ui.auth.USER_ID") assertThat(FirebaseAuthActivity.EXTRA_IS_NEW_USER) - .isEqualTo("com.firebase.ui.auth.compose.IS_NEW_USER") + .isEqualTo("com.firebase.ui.auth.IS_NEW_USER") assertThat(FirebaseAuthActivity.EXTRA_ERROR) - .isEqualTo("com.firebase.ui.auth.compose.ERROR") + .isEqualTo("com.firebase.ui.auth.ERROR") } // ============================================================================================= @@ -395,7 +396,7 @@ class FirebaseAuthActivityTest { @Test fun `configuration is removed from cache after onCreate`() { val intent1 = FirebaseAuthActivity.createIntent(applicationContext, configuration) - val configKey1 = intent1.getStringExtra("com.firebase.ui.auth.compose.CONFIGURATION_KEY") + val configKey1 = intent1.getStringExtra("com.firebase.ui.auth.CONFIGURATION_KEY") assertThat(configKey1).isNotNull() @@ -405,7 +406,7 @@ class FirebaseAuthActivityTest { // Create another intent val intent2 = FirebaseAuthActivity.createIntent(applicationContext, configuration) - val configKey2 = intent2.getStringExtra("com.firebase.ui.auth.compose.CONFIGURATION_KEY") + val configKey2 = intent2.getStringExtra("com.firebase.ui.auth.CONFIGURATION_KEY") // Should be a different key assertThat(configKey2).isNotEqualTo(configKey1) @@ -522,7 +523,7 @@ class FirebaseAuthActivityTest { passwordValidationRules = emptyList() ) ), - theme = com.firebase.ui.auth.compose.configuration.theme.AuthUITheme.Default + theme = AuthUITheme.Default ) val intent = FirebaseAuthActivity.createIntent(applicationContext, customConfig) diff --git a/auth/src/test/java/com/firebase/ui/auth/FirebaseAuthUIAuthStateTest.kt b/auth/src/test/java/com/firebase/ui/auth/FirebaseAuthUIAuthStateTest.kt index 893f69b85..d2558a8a8 100644 --- a/auth/src/test/java/com/firebase/ui/auth/FirebaseAuthUIAuthStateTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/FirebaseAuthUIAuthStateTest.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose +package com.firebase.ui.auth import androidx.test.core.app.ApplicationProvider import com.google.common.truth.Truth.assertThat diff --git a/auth/src/test/java/com/firebase/ui/auth/FirebaseAuthUITest.kt b/auth/src/test/java/com/firebase/ui/auth/FirebaseAuthUITest.kt index c9025cece..b6561315d 100644 --- a/auth/src/test/java/com/firebase/ui/auth/FirebaseAuthUITest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/FirebaseAuthUITest.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose +package com.firebase.ui.auth import android.content.Context import android.content.Intent diff --git a/auth/src/test/java/com/firebase/ui/auth/FirebaseUIComposeRegistrarTest.kt b/auth/src/test/java/com/firebase/ui/auth/FirebaseUIComposeRegistrarTest.kt new file mode 100644 index 000000000..a10da2d9e --- /dev/null +++ b/auth/src/test/java/com/firebase/ui/auth/FirebaseUIComposeRegistrarTest.kt @@ -0,0 +1,104 @@ +/* + * Copyright 2025 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.firebase.ui.auth + +import android.content.Context +import android.content.pm.PackageManager +import androidx.test.core.app.ApplicationProvider +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +/** + * Unit tests for [FirebaseUIComposeRegistrar] covering component registration + * and AndroidManifest.xml configuration validation. + */ +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +class FirebaseUIComposeRegistrarTest { + + private lateinit var context: Context + private lateinit var registrar: FirebaseUIComposeRegistrar + + @Before + fun setUp() { + context = ApplicationProvider.getApplicationContext() + registrar = FirebaseUIComposeRegistrar() + } + + // ============================================================================================= + // Component Registration Tests + // ============================================================================================= + + @Test + fun `getComponents() returns exactly one component`() { + val components = registrar.getComponents() + + assertThat(components).hasSize(1) + } + + // ============================================================================================= + // AndroidManifest.xml Configuration Tests + // ============================================================================================= + + @Test + fun `ComponentDiscoveryService has correct meta-data for FirebaseUIComposeRegistrar`() { + val packageInfo = context.packageManager.getPackageInfo( + context.packageName, + PackageManager.GET_SERVICES or PackageManager.GET_META_DATA + ) + + val service = packageInfo.services?.find { serviceInfo -> + serviceInfo.name == "com.google.firebase.components.ComponentDiscoveryService" + } + + assertThat(service).isNotNull() + + val metaData = service?.metaData + assertThat(metaData).isNotNull() + + // Check the meta-data key contains the fully qualified class name + val expectedMetaDataKey = "com.google.firebase.components:com.firebase.ui.auth.FirebaseUIComposeRegistrar" + val metaDataValue = metaData?.getString(expectedMetaDataKey) + + assertThat(metaDataValue).isEqualTo("com.google.firebase.components.ComponentRegistrar") + } + + // ============================================================================================= + // Class Metadata Tests + // ============================================================================================= + + @Test + fun `meta-data key matches actual class fully qualified name`() { + // The expected meta-data key format used in AndroidManifest.xml + val expectedMetaDataKey = "com.google.firebase.components:com.firebase.ui.auth.FirebaseUIComposeRegistrar" + val actualClassName = FirebaseUIComposeRegistrar::class.java.name + + // Extract the class name from the meta-data key (after the colon) + val classNameInMetaData = expectedMetaDataKey.substringAfter(":") + + assertThat(classNameInMetaData).isEqualTo(actualClassName) + } + + @Test + fun `registrar implements ComponentRegistrar interface`() { + val interfaces = FirebaseUIComposeRegistrar::class.java.interfaces + + assertThat(interfaces.map { it.name }).contains("com.google.firebase.components.ComponentRegistrar") + } +} diff --git a/auth/src/test/java/com/firebase/ui/auth/configuration/AuthUIConfigurationTest.kt b/auth/src/test/java/com/firebase/ui/auth/configuration/AuthUIConfigurationTest.kt index c98c9f17a..304d3c3be 100644 --- a/auth/src/test/java/com/firebase/ui/auth/configuration/AuthUIConfigurationTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/configuration/AuthUIConfigurationTest.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration +package com.firebase.ui.auth.configuration import android.content.Context import android.content.res.Configuration @@ -20,11 +20,11 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.AccountCircle import androidx.test.core.app.ApplicationProvider import com.firebase.ui.auth.R -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset -import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.theme.AuthUIAsset +import com.firebase.ui.auth.configuration.theme.AuthUITheme import com.google.common.truth.Truth.assertThat import com.google.firebase.auth.actionCodeSettings import org.junit.Assert.assertThrows diff --git a/auth/src/test/java/com/firebase/ui/auth/configuration/MfaConfigurationTest.kt b/auth/src/test/java/com/firebase/ui/auth/configuration/MfaConfigurationTest.kt index 37e29d8ba..44802fc29 100644 --- a/auth/src/test/java/com/firebase/ui/auth/configuration/MfaConfigurationTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/configuration/MfaConfigurationTest.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration +package com.firebase.ui.auth.configuration import com.google.common.truth.Truth.assertThat import org.junit.Test diff --git a/auth/src/test/java/com/firebase/ui/auth/configuration/PasswordRuleTest.kt b/auth/src/test/java/com/firebase/ui/auth/configuration/PasswordRuleTest.kt index dbaccbcfb..7edccb309 100644 --- a/auth/src/test/java/com/firebase/ui/auth/configuration/PasswordRuleTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/configuration/PasswordRuleTest.kt @@ -12,13 +12,13 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration +package com.firebase.ui.auth.configuration import android.content.Context import androidx.test.core.app.ApplicationProvider import com.firebase.ui.auth.R -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test diff --git a/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/AnonymousAuthProviderFirebaseAuthUITest.kt b/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/AnonymousAuthProviderFirebaseAuthUITest.kt index c36899a63..53f465b9a 100644 --- a/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/AnonymousAuthProviderFirebaseAuthUITest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/AnonymousAuthProviderFirebaseAuthUITest.kt @@ -12,14 +12,14 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.auth_provider +package com.firebase.ui.auth.configuration.auth_provider import android.content.Context import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.authUIConfiguration +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.authUIConfiguration import com.google.android.gms.tasks.TaskCompletionSource import com.google.common.truth.Truth.assertThat import com.google.firebase.FirebaseApp diff --git a/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/AuthProviderTest.kt b/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/AuthProviderTest.kt index 99bd91766..f64bfc2a6 100644 --- a/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/AuthProviderTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/AuthProviderTest.kt @@ -1,4 +1,4 @@ -package com.firebase.ui.auth.compose.configuration.auth_provider +package com.firebase.ui.auth.configuration.auth_provider import android.content.Context import androidx.test.core.app.ApplicationProvider diff --git a/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/EmailAuthProviderFirebaseAuthUITest.kt b/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/EmailAuthProviderFirebaseAuthUITest.kt index 9f5de770c..dc027e3dc 100644 --- a/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/EmailAuthProviderFirebaseAuthUITest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/EmailAuthProviderFirebaseAuthUITest.kt @@ -12,16 +12,18 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.auth_provider +package com.firebase.ui.auth.configuration.auth_provider import android.content.Context import androidx.test.core.app.ApplicationProvider import com.firebase.ui.auth.R -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.PasswordRule -import com.firebase.ui.auth.compose.configuration.authUIConfiguration +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.PasswordRule +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.util.EmailLinkPersistenceManager +import com.firebase.ui.auth.util.MockPersistenceManager import com.google.android.gms.tasks.TaskCompletionSource import com.google.common.truth.Truth.assertThat import com.google.firebase.FirebaseApp @@ -1010,9 +1012,9 @@ class EmailAuthProviderFirebaseAuthUITest { val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth) // Create mock persistence manager with matching session - val mockPersistence = com.firebase.ui.auth.compose.util.MockPersistenceManager() + val mockPersistence = MockPersistenceManager() mockPersistence.setSessionRecord( - com.firebase.ui.auth.compose.util.EmailLinkPersistenceManager.SessionRecord( + EmailLinkPersistenceManager.SessionRecord( sessionId = "session123", email = "test@example.com", anonymousUserId = null, @@ -1078,9 +1080,9 @@ class EmailAuthProviderFirebaseAuthUITest { val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth) // Create mock persistence manager with matching session and anonymous user - val mockPersistence = com.firebase.ui.auth.compose.util.MockPersistenceManager() + val mockPersistence = MockPersistenceManager() mockPersistence.setSessionRecord( - com.firebase.ui.auth.compose.util.EmailLinkPersistenceManager.SessionRecord( + EmailLinkPersistenceManager.SessionRecord( sessionId = "session123", email = "test@example.com", anonymousUserId = "anon-uid-123", @@ -1135,7 +1137,7 @@ class EmailAuthProviderFirebaseAuthUITest { val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth) // Create mock persistence with no session (cross-device) - val mockPersistence = com.firebase.ui.auth.compose.util.MockPersistenceManager() + val mockPersistence = MockPersistenceManager() // Email link with different session ID (cross-device) val emailLink = "https://example.com/__/auth/action?apiKey=key&mode=signIn&oobCode=code123&continueUrl=https://example.com?ui_sid=different-session" @@ -1185,7 +1187,7 @@ class EmailAuthProviderFirebaseAuthUITest { val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth) // Create mock persistence with no session (cross-device) - val mockPersistence = com.firebase.ui.auth.compose.util.MockPersistenceManager() + val mockPersistence = MockPersistenceManager() // Email link with provider ID (cross-device linking) val emailLink = "https://example.com/__/auth/action?apiKey=key&mode=signIn&oobCode=code123&continueUrl=https://example.com?ui_sid=different-session&ui_pid=google.com" @@ -1278,9 +1280,9 @@ class EmailAuthProviderFirebaseAuthUITest { val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth) // Create mock persistence with session for different anonymous user - val mockPersistence = com.firebase.ui.auth.compose.util.MockPersistenceManager() + val mockPersistence = MockPersistenceManager() mockPersistence.setSessionRecord( - com.firebase.ui.auth.compose.util.EmailLinkPersistenceManager.SessionRecord( + EmailLinkPersistenceManager.SessionRecord( sessionId = "session123", email = "test@example.com", anonymousUserId = "different-anon-uid", @@ -1329,9 +1331,9 @@ class EmailAuthProviderFirebaseAuthUITest { val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth) // Create mock persistence with session but check email parameter is empty - val mockPersistence = com.firebase.ui.auth.compose.util.MockPersistenceManager() + val mockPersistence = MockPersistenceManager() mockPersistence.setSessionRecord( - com.firebase.ui.auth.compose.util.EmailLinkPersistenceManager.SessionRecord( + EmailLinkPersistenceManager.SessionRecord( sessionId = "session123", email = "stored@example.com", anonymousUserId = null, @@ -1384,9 +1386,9 @@ class EmailAuthProviderFirebaseAuthUITest { val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth) // Create mock persistence with different session (cross-device) - val mockPersistence = com.firebase.ui.auth.compose.util.MockPersistenceManager() + val mockPersistence = MockPersistenceManager() mockPersistence.setSessionRecord( - com.firebase.ui.auth.compose.util.EmailLinkPersistenceManager.SessionRecord( + EmailLinkPersistenceManager.SessionRecord( sessionId = "local-session", email = "test@example.com", anonymousUserId = null, @@ -1437,7 +1439,7 @@ class EmailAuthProviderFirebaseAuthUITest { val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth) // Create mock persistence (can be null since we expect validation error) - val mockPersistence = com.firebase.ui.auth.compose.util.MockPersistenceManager() + val mockPersistence = MockPersistenceManager() val emailLink = "https://example.com/__/auth/action?apiKey=key&mode=signIn&oobCode=code&continueUrl=https://example.com" diff --git a/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/FacebookAuthProviderFirebaseAuthUI.kt b/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/FacebookAuthProviderFirebaseAuthUI.kt index c1df4ef3a..b5109bc36 100644 --- a/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/FacebookAuthProviderFirebaseAuthUI.kt +++ b/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/FacebookAuthProviderFirebaseAuthUI.kt @@ -12,19 +12,19 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.auth_provider +package com.firebase.ui.auth.configuration.auth_provider import android.content.Context import android.net.Uri import androidx.test.core.app.ApplicationProvider import com.facebook.AccessToken import com.facebook.FacebookException -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider.Facebook.FacebookProfileData -import com.firebase.ui.auth.compose.util.EmailLinkPersistenceManager +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider.Facebook.FacebookProfileData +import com.firebase.ui.auth.util.EmailLinkPersistenceManager import com.google.android.gms.tasks.TaskCompletionSource import com.google.common.truth.Truth.assertThat import com.google.firebase.FirebaseApp diff --git a/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/GoogleAuthProviderFirebaseAuthUITest.kt b/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/GoogleAuthProviderFirebaseAuthUITest.kt index ce24ac55a..9091e7d7c 100644 --- a/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/GoogleAuthProviderFirebaseAuthUITest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/GoogleAuthProviderFirebaseAuthUITest.kt @@ -12,16 +12,16 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.auth_provider +package com.firebase.ui.auth.configuration.auth_provider import android.content.Context import androidx.core.net.toUri import androidx.credentials.CredentialManager import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.authUIConfiguration +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.authUIConfiguration import com.google.android.gms.common.api.Scope import com.google.android.gms.tasks.TaskCompletionSource import com.google.common.truth.Truth.assertThat diff --git a/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/OAuthProviderFirebaseAuthUITest.kt b/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/OAuthProviderFirebaseAuthUITest.kt index 2e2fc1cd7..3e5fdb981 100644 --- a/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/OAuthProviderFirebaseAuthUITest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/OAuthProviderFirebaseAuthUITest.kt @@ -12,15 +12,15 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.auth_provider +package com.firebase.ui.auth.configuration.auth_provider import android.app.Activity import android.content.Context import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.authUIConfiguration +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.authUIConfiguration import com.google.android.gms.tasks.Task import com.google.android.gms.tasks.TaskCompletionSource import com.google.common.truth.Truth.assertThat diff --git a/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/PhoneAuthProviderFirebaseAuthUITest.kt b/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/PhoneAuthProviderFirebaseAuthUITest.kt index ad39e96cf..c836ac218 100644 --- a/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/PhoneAuthProviderFirebaseAuthUITest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/configuration/auth_provider/PhoneAuthProviderFirebaseAuthUITest.kt @@ -12,13 +12,13 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.auth_provider +package com.firebase.ui.auth.configuration.auth_provider import android.content.Context import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.authUIConfiguration +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.authUIConfiguration import com.google.android.gms.tasks.TaskCompletionSource import com.google.common.truth.Truth.assertThat import com.google.firebase.FirebaseApp diff --git a/auth/src/test/java/com/firebase/ui/auth/configuration/theme/AuthUIThemeTest.kt b/auth/src/test/java/com/firebase/ui/auth/configuration/theme/AuthUIThemeTest.kt index f2a9b88cc..c08702fea 100644 --- a/auth/src/test/java/com/firebase/ui/auth/configuration/theme/AuthUIThemeTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/configuration/theme/AuthUIThemeTest.kt @@ -1,4 +1,4 @@ -package com.firebase.ui.auth.compose.configuration.theme +package com.firebase.ui.auth.configuration.theme import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme diff --git a/auth/src/test/java/com/firebase/ui/auth/configuration/validators/EmailValidatorTest.kt b/auth/src/test/java/com/firebase/ui/auth/configuration/validators/EmailValidatorTest.kt index 3715d63ec..20fc8c69f 100644 --- a/auth/src/test/java/com/firebase/ui/auth/configuration/validators/EmailValidatorTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/configuration/validators/EmailValidatorTest.kt @@ -12,13 +12,13 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.validators +package com.firebase.ui.auth.configuration.validators import android.content.Context import androidx.test.core.app.ApplicationProvider import com.firebase.ui.auth.R -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test diff --git a/auth/src/test/java/com/firebase/ui/auth/configuration/validators/PasswordValidatorTest.kt b/auth/src/test/java/com/firebase/ui/auth/configuration/validators/PasswordValidatorTest.kt index af36c1e18..1243d41c6 100644 --- a/auth/src/test/java/com/firebase/ui/auth/configuration/validators/PasswordValidatorTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/configuration/validators/PasswordValidatorTest.kt @@ -12,14 +12,14 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.configuration.validators +package com.firebase.ui.auth.configuration.validators import android.content.Context import androidx.test.core.app.ApplicationProvider import com.firebase.ui.auth.R -import com.firebase.ui.auth.compose.configuration.PasswordRule -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.PasswordRule +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test diff --git a/auth/src/test/java/com/firebase/ui/auth/credentialmanager/PasswordCredentialHandlerTest.kt b/auth/src/test/java/com/firebase/ui/auth/credentialmanager/PasswordCredentialHandlerTest.kt index f98ed6128..869d563ed 100644 --- a/auth/src/test/java/com/firebase/ui/auth/credentialmanager/PasswordCredentialHandlerTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/credentialmanager/PasswordCredentialHandlerTest.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.credentialmanager +package com.firebase.ui.auth.credentialmanager import android.content.Context import androidx.credentials.CreatePasswordRequest diff --git a/auth/src/test/java/com/firebase/ui/auth/data/CountryDataTest.kt b/auth/src/test/java/com/firebase/ui/auth/data/CountryDataTest.kt index ebc79a8be..742c9e19a 100644 --- a/auth/src/test/java/com/firebase/ui/auth/data/CountryDataTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/data/CountryDataTest.kt @@ -12,9 +12,9 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.data +package com.firebase.ui.auth.data -import com.firebase.ui.auth.compose.util.CountryUtils +import com.firebase.ui.auth.util.CountryUtils import com.google.common.truth.Truth.assertThat import org.junit.Test import org.junit.runner.RunWith diff --git a/auth/src/test/java/com/firebase/ui/auth/mfa/MfaChallengeContentStateTest.kt b/auth/src/test/java/com/firebase/ui/auth/mfa/MfaChallengeContentStateTest.kt index a8b4d5c0d..ce03d6f1f 100644 --- a/auth/src/test/java/com/firebase/ui/auth/mfa/MfaChallengeContentStateTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/mfa/MfaChallengeContentStateTest.kt @@ -12,9 +12,9 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.mfa +package com.firebase.ui.auth.mfa -import com.firebase.ui.auth.compose.configuration.MfaFactor +import com.firebase.ui.auth.configuration.MfaFactor import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull diff --git a/auth/src/test/java/com/firebase/ui/auth/mfa/MfaEnrollmentContentStateTest.kt b/auth/src/test/java/com/firebase/ui/auth/mfa/MfaEnrollmentContentStateTest.kt index b08c84bf3..739558cd6 100644 --- a/auth/src/test/java/com/firebase/ui/auth/mfa/MfaEnrollmentContentStateTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/mfa/MfaEnrollmentContentStateTest.kt @@ -12,10 +12,10 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.mfa +package com.firebase.ui.auth.mfa -import com.firebase.ui.auth.compose.configuration.MfaFactor -import com.firebase.ui.auth.compose.data.CountryData +import com.firebase.ui.auth.configuration.MfaFactor +import com.firebase.ui.auth.data.CountryData import com.google.firebase.auth.TotpSecret as FirebaseTotpSecret import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse diff --git a/auth/src/test/java/com/firebase/ui/auth/mfa/MfaEnrollmentStepTest.kt b/auth/src/test/java/com/firebase/ui/auth/mfa/MfaEnrollmentStepTest.kt index 5ffa2dab5..a3cc7e469 100644 --- a/auth/src/test/java/com/firebase/ui/auth/mfa/MfaEnrollmentStepTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/mfa/MfaEnrollmentStepTest.kt @@ -12,12 +12,12 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.mfa +package com.firebase.ui.auth.mfa import android.content.Context import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.configuration.MfaFactor -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.MfaFactor +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Before diff --git a/auth/src/test/java/com/firebase/ui/auth/mfa/SmsEnrollmentHandlerTest.kt b/auth/src/test/java/com/firebase/ui/auth/mfa/SmsEnrollmentHandlerTest.kt index 014a33f2e..f2b2bfa71 100644 --- a/auth/src/test/java/com/firebase/ui/auth/mfa/SmsEnrollmentHandlerTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/mfa/SmsEnrollmentHandlerTest.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.mfa +package com.firebase.ui.auth.mfa import android.app.Activity import com.google.firebase.auth.FirebaseAuth diff --git a/auth/src/test/java/com/firebase/ui/auth/mfa/TotpEnrollmentHandlerTest.kt b/auth/src/test/java/com/firebase/ui/auth/mfa/TotpEnrollmentHandlerTest.kt index d0218d450..6400558d8 100644 --- a/auth/src/test/java/com/firebase/ui/auth/mfa/TotpEnrollmentHandlerTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/mfa/TotpEnrollmentHandlerTest.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.mfa +package com.firebase.ui.auth.mfa import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser diff --git a/auth/src/test/java/com/firebase/ui/auth/mfa/TotpSecretTest.kt b/auth/src/test/java/com/firebase/ui/auth/mfa/TotpSecretTest.kt index 9a28d5c77..c302e7fab 100644 --- a/auth/src/test/java/com/firebase/ui/auth/mfa/TotpSecretTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/mfa/TotpSecretTest.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.mfa +package com.firebase.ui.auth.mfa import com.google.firebase.auth.TotpSecret as FirebaseTotpSecret import org.junit.Assert.assertEquals diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/components/AuthProviderButtonTest.kt b/auth/src/test/java/com/firebase/ui/auth/ui/components/AuthProviderButtonTest.kt index 6382bf6dd..d45176e94 100644 --- a/auth/src/test/java/com/firebase/ui/auth/ui/components/AuthProviderButtonTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/ui/components/AuthProviderButtonTest.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.components +package com.firebase.ui.auth.ui.components import android.content.Context import androidx.compose.material.icons.Icons @@ -28,12 +28,12 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.test.core.app.ApplicationProvider import com.firebase.ui.auth.R -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.auth_provider.Provider -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset -import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.auth_provider.Provider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.theme.AuthUIAsset +import com.firebase.ui.auth.configuration.theme.AuthUITheme import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Rule diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/components/AuthTextFieldTest.kt b/auth/src/test/java/com/firebase/ui/auth/ui/components/AuthTextFieldTest.kt index 8c22818c3..4f5b95c9d 100644 --- a/auth/src/test/java/com/firebase/ui/auth/ui/components/AuthTextFieldTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/ui/components/AuthTextFieldTest.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.components +package com.firebase.ui.auth.ui.components import android.content.Context import androidx.compose.material.icons.Icons @@ -32,11 +32,11 @@ import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTextClearance import androidx.compose.ui.test.performTextInput import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.configuration.PasswordRule -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.validators.EmailValidator -import com.firebase.ui.auth.compose.configuration.validators.PasswordValidator +import com.firebase.ui.auth.configuration.PasswordRule +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.validators.EmailValidator +import com.firebase.ui.auth.configuration.validators.PasswordValidator import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/components/ErrorRecoveryDialogLogicTest.kt b/auth/src/test/java/com/firebase/ui/auth/ui/components/ErrorRecoveryDialogLogicTest.kt index 6a4f5df2f..adf1a939b 100644 --- a/auth/src/test/java/com/firebase/ui/auth/ui/components/ErrorRecoveryDialogLogicTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/ui/components/ErrorRecoveryDialogLogicTest.kt @@ -1,7 +1,7 @@ -package com.firebase.ui.auth.compose.ui.components +package com.firebase.ui.auth.ui.components -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider import com.google.common.truth.Truth import org.junit.Test import org.junit.runner.RunWith diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/method_picker/AuthMethodPickerTest.kt b/auth/src/test/java/com/firebase/ui/auth/ui/method_picker/AuthMethodPickerTest.kt index 4c9ce634b..b40917d5b 100644 --- a/auth/src/test/java/com/firebase/ui/auth/ui/method_picker/AuthMethodPickerTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/ui/method_picker/AuthMethodPickerTest.kt @@ -1,4 +1,4 @@ -package com.firebase.ui.auth.compose.ui.method_picker +package com.firebase.ui.auth.ui.method_picker import android.content.Context import androidx.compose.material3.Button @@ -17,10 +17,10 @@ import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performScrollToNode import androidx.test.core.app.ApplicationProvider import com.firebase.ui.auth.R -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.configuration.theme.AuthUIAsset import com.google.common.truth.Truth import org.junit.Before import org.junit.Rule diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/screens/MfaChallengeScreenTest.kt b/auth/src/test/java/com/firebase/ui/auth/ui/screens/MfaChallengeScreenTest.kt index a28dae928..ffe4ec882 100644 --- a/auth/src/test/java/com/firebase/ui/auth/ui/screens/MfaChallengeScreenTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/ui/screens/MfaChallengeScreenTest.kt @@ -12,14 +12,14 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens +package com.firebase.ui.auth.ui.screens import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.ui.test.junit4.createComposeRule -import com.firebase.ui.auth.compose.configuration.MfaFactor -import com.firebase.ui.auth.compose.mfa.MfaChallengeContentState +import com.firebase.ui.auth.configuration.MfaFactor +import com.firebase.ui.auth.mfa.MfaChallengeContentState import com.google.firebase.FirebaseApp import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.MultiFactorResolver diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentScreenTest.kt b/auth/src/test/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentScreenTest.kt index fda9586cf..119ef0572 100644 --- a/auth/src/test/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentScreenTest.kt +++ b/auth/src/test/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentScreenTest.kt @@ -12,16 +12,16 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens +package com.firebase.ui.auth.ui.screens import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.ui.test.junit4.createComposeRule -import com.firebase.ui.auth.compose.configuration.MfaConfiguration -import com.firebase.ui.auth.compose.configuration.MfaFactor -import com.firebase.ui.auth.compose.mfa.MfaEnrollmentContentState -import com.firebase.ui.auth.compose.mfa.MfaEnrollmentStep +import com.firebase.ui.auth.configuration.MfaConfiguration +import com.firebase.ui.auth.configuration.MfaFactor +import com.firebase.ui.auth.mfa.MfaEnrollmentContentState +import com.firebase.ui.auth.mfa.MfaEnrollmentStep import com.google.firebase.FirebaseApp import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser diff --git a/auth/src/test/java/com/firebase/ui/auth/util/MockPersistenceManager.kt b/auth/src/test/java/com/firebase/ui/auth/util/MockPersistenceManager.kt index be374502d..1c511a6f8 100644 --- a/auth/src/test/java/com/firebase/ui/auth/util/MockPersistenceManager.kt +++ b/auth/src/test/java/com/firebase/ui/auth/util/MockPersistenceManager.kt @@ -12,10 +12,10 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.util +package com.firebase.ui.auth.util import android.content.Context -import com.firebase.ui.auth.compose.util.EmailLinkPersistenceManager.SessionRecord +import com.firebase.ui.auth.util.EmailLinkPersistenceManager.SessionRecord /** * Mock implementation of [PersistenceManager] for testing. diff --git a/e2eTest/src/test/AndroidManifest.xml b/e2eTest/src/test/AndroidManifest.xml index 6dd460c28..2c2643f04 100644 --- a/e2eTest/src/test/AndroidManifest.xml +++ b/e2eTest/src/test/AndroidManifest.xml @@ -22,7 +22,7 @@ This handles ACTION_VIEW intents with email link URLs from the Firebase Auth Emulator. --> diff --git a/e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/Constants.kt b/e2eTest/src/test/java/com/firebase/ui/auth/testutil/Constants.kt similarity index 50% rename from e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/Constants.kt rename to e2eTest/src/test/java/com/firebase/ui/auth/testutil/Constants.kt index 5f538e8c5..7c6f1d261 100644 --- a/e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/Constants.kt +++ b/e2eTest/src/test/java/com/firebase/ui/auth/testutil/Constants.kt @@ -1,3 +1,3 @@ -package com.firebase.ui.auth.compose.testutil +package com.firebase.ui.auth.testutil const val AUTH_STATE_WAIT_TIMEOUT_MS = 5_000L diff --git a/e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/EmailLinkTestActivity.kt b/e2eTest/src/test/java/com/firebase/ui/auth/testutil/EmailLinkTestActivity.kt similarity index 96% rename from e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/EmailLinkTestActivity.kt rename to e2eTest/src/test/java/com/firebase/ui/auth/testutil/EmailLinkTestActivity.kt index c380e5cf3..fe400437f 100644 --- a/e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/EmailLinkTestActivity.kt +++ b/e2eTest/src/test/java/com/firebase/ui/auth/testutil/EmailLinkTestActivity.kt @@ -1,4 +1,4 @@ -package com.firebase.ui.auth.compose.testutil +package com.firebase.ui.auth.testutil import android.content.Intent import android.os.Bundle diff --git a/e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/EmulatorApi.kt b/e2eTest/src/test/java/com/firebase/ui/auth/testutil/EmulatorApi.kt similarity index 98% rename from e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/EmulatorApi.kt rename to e2eTest/src/test/java/com/firebase/ui/auth/testutil/EmulatorApi.kt index 190715f46..4430c37a7 100644 --- a/e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/EmulatorApi.kt +++ b/e2eTest/src/test/java/com/firebase/ui/auth/testutil/EmulatorApi.kt @@ -1,4 +1,4 @@ -package com.firebase.ui.auth.compose.testutil +package com.firebase.ui.auth.testutil import org.json.JSONArray import org.json.JSONObject diff --git a/e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/HttpClient.kt b/e2eTest/src/test/java/com/firebase/ui/auth/testutil/HttpClient.kt similarity index 95% rename from e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/HttpClient.kt rename to e2eTest/src/test/java/com/firebase/ui/auth/testutil/HttpClient.kt index 035b15572..3d1b684d5 100644 --- a/e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/HttpClient.kt +++ b/e2eTest/src/test/java/com/firebase/ui/auth/testutil/HttpClient.kt @@ -1,4 +1,4 @@ -package com.firebase.ui.auth.compose.testutil +package com.firebase.ui.auth.testutil import java.net.HttpURLConnection import java.net.URL diff --git a/e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/TaskExtensions.kt b/e2eTest/src/test/java/com/firebase/ui/auth/testutil/TaskExtensions.kt similarity index 98% rename from e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/TaskExtensions.kt rename to e2eTest/src/test/java/com/firebase/ui/auth/testutil/TaskExtensions.kt index 7c7e558fc..070d81342 100644 --- a/e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/TaskExtensions.kt +++ b/e2eTest/src/test/java/com/firebase/ui/auth/testutil/TaskExtensions.kt @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.testutil +package com.firebase.ui.auth.testutil import android.os.Looper import com.google.android.gms.tasks.Task diff --git a/e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/TestHelpers.kt b/e2eTest/src/test/java/com/firebase/ui/auth/testutil/TestHelpers.kt similarity index 97% rename from e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/TestHelpers.kt rename to e2eTest/src/test/java/com/firebase/ui/auth/testutil/TestHelpers.kt index 4853442da..958df6f53 100644 --- a/e2eTest/src/test/java/com/firebase/ui/auth/compose/testutil/TestHelpers.kt +++ b/e2eTest/src/test/java/com/firebase/ui/auth/testutil/TestHelpers.kt @@ -1,7 +1,7 @@ -package com.firebase.ui.auth.compose.testutil +package com.firebase.ui.auth.testutil import android.os.Looper -import com.firebase.ui.auth.compose.FirebaseAuthUI +import com.firebase.ui.auth.FirebaseAuthUI import com.google.firebase.auth.FirebaseUser import org.robolectric.Shadows.shadowOf diff --git a/e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/AccessibilityTest.kt b/e2eTest/src/test/java/com/firebase/ui/auth/ui/AccessibilityTest.kt similarity index 83% rename from e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/AccessibilityTest.kt rename to e2eTest/src/test/java/com/firebase/ui/auth/ui/AccessibilityTest.kt index cd1682855..b79ab3772 100644 --- a/e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/AccessibilityTest.kt +++ b/e2eTest/src/test/java/com/firebase/ui/auth/ui/AccessibilityTest.kt @@ -1,6 +1,9 @@ -package com.firebase.ui.auth.compose.ui +package com.firebase.ui.auth.ui import android.content.Context +import androidx.compose.material3.Text +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.SemanticsProperties import androidx.compose.ui.test.SemanticsMatcher @@ -14,18 +17,20 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.LayoutDirection import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.ui.components.AuthProviderButton -import com.firebase.ui.auth.compose.ui.components.AuthTextField -import com.firebase.ui.auth.compose.ui.components.CountrySelector -import com.firebase.ui.auth.compose.ui.components.QrCodeImage -import com.firebase.ui.auth.compose.ui.components.VerificationCodeInputField -import com.firebase.ui.auth.compose.ui.screens.email.SignInUI -import com.firebase.ui.auth.compose.ui.screens.phone.EnterPhoneNumberUI -import com.firebase.ui.auth.compose.util.CountryUtils +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.ui.components.AuthProviderButton +import com.firebase.ui.auth.ui.components.AuthTextField +import com.firebase.ui.auth.ui.components.CountrySelector +import com.firebase.ui.auth.ui.components.QrCodeImage +import com.firebase.ui.auth.ui.components.VerificationCodeInputField +import com.firebase.ui.auth.ui.screens.email.SignInUI +import com.firebase.ui.auth.ui.screens.phone.EnterPhoneNumberUI +import com.firebase.ui.auth.util.CountryUtils import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -75,7 +80,7 @@ class AccessibilityTest { AuthTextField( value = "", onValueChange = {}, - label = { androidx.compose.material3.Text("Email") } + label = { Text("Email") } ) } @@ -91,7 +96,7 @@ class AccessibilityTest { AuthTextField( value = "", onValueChange = {}, - label = { androidx.compose.material3.Text("Password") }, + label = { Text("Password") }, isSecureTextField = true ) } @@ -105,8 +110,8 @@ class AccessibilityTest { @Test fun countrySelector_hasDropdownRole() { composeTestRule.setContent { - androidx.compose.runtime.CompositionLocalProvider( - com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider provides stringProvider + CompositionLocalProvider( + LocalAuthUIStringProvider provides stringProvider ) { CountrySelector( selectedCountry = CountryUtils.getDefaultCountry(), @@ -177,8 +182,8 @@ class AccessibilityTest { } composeTestRule.setContent { - androidx.compose.runtime.CompositionLocalProvider( - com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider provides stringProvider + CompositionLocalProvider( + LocalAuthUIStringProvider provides stringProvider ) { SignInUI( configuration = configuration, @@ -221,8 +226,8 @@ class AccessibilityTest { } composeTestRule.setContent { - androidx.compose.runtime.CompositionLocalProvider( - com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider provides stringProvider + CompositionLocalProvider( + LocalAuthUIStringProvider provides stringProvider ) { EnterPhoneNumberUI( configuration = configuration, @@ -267,9 +272,9 @@ class AccessibilityTest { composeTestRule.setContent { // Force RTL layout direction - androidx.compose.runtime.CompositionLocalProvider( - androidx.compose.ui.platform.LocalLayoutDirection provides androidx.compose.ui.unit.LayoutDirection.Rtl, - com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider provides stringProvider + CompositionLocalProvider( + LocalLayoutDirection provides LayoutDirection.Rtl, + LocalAuthUIStringProvider provides stringProvider ) { SignInUI( configuration = configuration, diff --git a/e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/AnonymousAuthScreenTest.kt b/e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/AnonymousAuthScreenTest.kt similarity index 95% rename from e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/AnonymousAuthScreenTest.kt rename to e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/AnonymousAuthScreenTest.kt index 883eaa57a..ba68bad9a 100644 --- a/e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/AnonymousAuthScreenTest.kt +++ b/e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/AnonymousAuthScreenTest.kt @@ -1,4 +1,4 @@ -package com.firebase.ui.auth.compose.ui.screens +package com.firebase.ui.auth.ui.screens import android.content.Context import android.os.Looper @@ -23,17 +23,17 @@ import androidx.compose.ui.test.performTextInput import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.testutil.AUTH_STATE_WAIT_TIMEOUT_MS -import com.firebase.ui.auth.compose.testutil.EmulatorAuthApi -import com.firebase.ui.auth.compose.testutil.ensureFreshUser +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.testutil.AUTH_STATE_WAIT_TIMEOUT_MS +import com.firebase.ui.auth.testutil.EmulatorAuthApi +import com.firebase.ui.auth.testutil.ensureFreshUser import com.google.common.truth.Truth.assertThat import com.google.firebase.FirebaseApp import com.google.firebase.FirebaseOptions diff --git a/e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/EmailAuthScreenTest.kt b/e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/EmailAuthScreenTest.kt similarity index 96% rename from e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/EmailAuthScreenTest.kt rename to e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/EmailAuthScreenTest.kt index 0fa4d6af5..50fca4728 100644 --- a/e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/EmailAuthScreenTest.kt +++ b/e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/EmailAuthScreenTest.kt @@ -1,4 +1,4 @@ -package com.firebase.ui.auth.compose.ui.screens +package com.firebase.ui.auth.ui.screens import android.content.Context import android.content.Intent @@ -26,23 +26,24 @@ import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performTextInput import androidx.test.core.app.ActivityScenario import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.PasswordRule -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.testutil.AUTH_STATE_WAIT_TIMEOUT_MS -import com.firebase.ui.auth.compose.testutil.EmailLinkTestActivity -import com.firebase.ui.auth.compose.testutil.EmulatorAuthApi -import com.firebase.ui.auth.compose.testutil.ensureFreshUser -import com.firebase.ui.auth.compose.testutil.verifyEmailInEmulator +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.PasswordRule +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.testutil.AUTH_STATE_WAIT_TIMEOUT_MS +import com.firebase.ui.auth.testutil.EmailLinkTestActivity +import com.firebase.ui.auth.testutil.EmulatorAuthApi +import com.firebase.ui.auth.testutil.ensureFreshUser +import com.firebase.ui.auth.testutil.verifyEmailInEmulator import com.google.common.truth.Truth.assertThat import com.google.firebase.FirebaseApp import com.google.firebase.FirebaseOptions +import com.google.firebase.auth.ActionCodeSettings import com.google.firebase.auth.actionCodeSettings import org.junit.After import org.junit.Assume @@ -237,7 +238,7 @@ class EmailAuthScreenTest { } catch (e: Exception) { // If we can't fetch OOB codes, the emulator might not be configured correctly // or might not be running. Skip this test with a clear message. - org.junit.Assume.assumeTrue( + Assume.assumeTrue( "Skipping test: Firebase Auth Emulator OOB codes endpoint not available. " + "Ensure emulator is running on localhost:9099. Error: ${e.message}", false diff --git a/e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/GoogleAuthScreenTest.kt b/e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/GoogleAuthScreenTest.kt similarity index 95% rename from e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/GoogleAuthScreenTest.kt rename to e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/GoogleAuthScreenTest.kt index 8d92d1a8a..eab1c29d2 100644 --- a/e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/GoogleAuthScreenTest.kt +++ b/e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/GoogleAuthScreenTest.kt @@ -1,4 +1,4 @@ -package com.firebase.ui.auth.compose.ui.screens +package com.firebase.ui.auth.ui.screens import android.content.Context import android.net.Uri @@ -23,31 +23,27 @@ import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick -import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performScrollToNode -import androidx.compose.ui.test.performTextInput import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.credentials.CredentialManager import androidx.credentials.GetCredentialRequest import androidx.credentials.GetCredentialResponse import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.testutil.AUTH_STATE_WAIT_TIMEOUT_MS -import com.firebase.ui.auth.compose.testutil.EmulatorAuthApi -import com.firebase.ui.auth.compose.testutil.ensureFreshUser +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.testutil.AUTH_STATE_WAIT_TIMEOUT_MS +import com.firebase.ui.auth.testutil.EmulatorAuthApi import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential import com.google.common.truth.Truth.assertThat import com.google.firebase.FirebaseApp import com.google.firebase.FirebaseOptions -import kotlinx.coroutines.tasks.await import kotlinx.coroutines.test.runTest import org.junit.After import org.junit.Before diff --git a/e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/MfaChallengeScreenTest.kt b/e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/MfaChallengeScreenTest.kt similarity index 92% rename from e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/MfaChallengeScreenTest.kt rename to e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/MfaChallengeScreenTest.kt index 7210a2fae..58b9f99d1 100644 --- a/e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/MfaChallengeScreenTest.kt +++ b/e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/MfaChallengeScreenTest.kt @@ -12,9 +12,13 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens +package com.firebase.ui.auth.ui.screens import android.content.Context +import androidx.compose.foundation.layout.Column +import androidx.compose.material3.Button +import androidx.compose.material3.Text +import androidx.compose.material3.TextField import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.test.assertIsDisplayed @@ -25,12 +29,12 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTextInput import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.MfaFactor -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.mfa.MfaChallengeContentState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.MfaFactor +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.mfa.MfaChallengeContentState import com.google.common.truth.Truth.assertThat import com.google.firebase.FirebaseApp import com.google.firebase.FirebaseOptions @@ -422,34 +426,34 @@ class MfaChallengeScreenTest { @Composable private fun TestMfaChallengeUI(state: MfaChallengeContentState) { - androidx.compose.foundation.layout.Column { - androidx.compose.material3.Text("MFA Challenge") + Column { + Text("MFA Challenge") state.maskedPhoneNumber?.let { - androidx.compose.material3.Text(it) + Text(it) } - androidx.compose.material3.TextField( + TextField( value = state.verificationCode, onValueChange = state.onVerificationCodeChange, - label = { androidx.compose.material3.Text("Verification code") } + label = { Text("Verification code") } ) - androidx.compose.material3.Button( + Button( onClick = state.onVerifyClick, enabled = state.isValid && !state.isLoading ) { - androidx.compose.material3.Text("VERIFY") + Text("VERIFY") } state.onResendCodeClick?.let { - androidx.compose.material3.Button(onClick = it) { - androidx.compose.material3.Text("RESEND CODE") + Button(onClick = it) { + Text("RESEND CODE") } } - androidx.compose.material3.Button(onClick = state.onCancelClick) { - androidx.compose.material3.Text("CANCEL") + Button(onClick = state.onCancelClick) { + Text("CANCEL") } } } diff --git a/e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/MfaEnrollmentScreenTest.kt b/e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentScreenTest.kt similarity index 83% rename from e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/MfaEnrollmentScreenTest.kt rename to e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentScreenTest.kt index 6287f93e0..41283b74b 100644 --- a/e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/MfaEnrollmentScreenTest.kt +++ b/e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/MfaEnrollmentScreenTest.kt @@ -12,9 +12,13 @@ * limitations under the License. */ -package com.firebase.ui.auth.compose.ui.screens +package com.firebase.ui.auth.ui.screens import android.content.Context +import androidx.compose.foundation.layout.Column +import androidx.compose.material3.Button +import androidx.compose.material3.Text +import androidx.compose.material3.TextField import androidx.compose.runtime.Composable import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.assertIsEnabled @@ -24,19 +28,20 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTextInput import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.MfaConfiguration -import com.firebase.ui.auth.compose.configuration.MfaFactor -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.mfa.MfaEnrollmentContentState -import com.firebase.ui.auth.compose.mfa.MfaEnrollmentStep -import com.firebase.ui.auth.compose.mfa.getHelperText -import com.firebase.ui.auth.compose.mfa.getTitle +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.MfaConfiguration +import com.firebase.ui.auth.configuration.MfaFactor +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.mfa.MfaEnrollmentContentState +import com.firebase.ui.auth.mfa.MfaEnrollmentStep +import com.firebase.ui.auth.mfa.getHelperText +import com.firebase.ui.auth.mfa.getTitle import com.google.common.truth.Truth.assertThat import com.google.firebase.FirebaseApp import com.google.firebase.FirebaseOptions import com.google.firebase.auth.FirebaseUser +import com.google.firebase.auth.MultiFactor import org.junit.After import org.junit.Before import org.junit.Rule @@ -74,7 +79,7 @@ class MfaEnrollmentScreenTest { private lateinit var mockFirebaseUser: FirebaseUser @Mock - private lateinit var mockMultiFactor: com.google.firebase.auth.MultiFactor + private lateinit var mockMultiFactor: MultiFactor @Before fun setUp() { @@ -366,93 +371,93 @@ class MfaEnrollmentScreenTest { @Composable private fun TestMfaEnrollmentUI(state: MfaEnrollmentContentState) { - androidx.compose.foundation.layout.Column { + Column { // Title - androidx.compose.material3.Text(state.step.getTitle(stringProvider)) - androidx.compose.material3.Text(state.step.getHelperText(stringProvider, state.selectedFactor)) + Text(state.step.getTitle(stringProvider)) + Text(state.step.getHelperText(stringProvider, state.selectedFactor)) when (state.step) { MfaEnrollmentStep.SelectFactor -> { state.availableFactors.forEach { factor -> - androidx.compose.material3.Button( + Button( onClick = { state.onFactorSelected(factor) } ) { - androidx.compose.material3.Text(factor.name.uppercase()) + Text(factor.name.uppercase()) } } state.onSkipClick?.let { - androidx.compose.material3.Button(onClick = it) { - androidx.compose.material3.Text("SKIP") + Button(onClick = it) { + Text("SKIP") } } } MfaEnrollmentStep.ConfigureSms -> { - androidx.compose.material3.TextField( + TextField( value = state.phoneNumber, onValueChange = state.onPhoneNumberChange, - label = { androidx.compose.material3.Text("Phone number") } + label = { Text("Phone number") } ) - androidx.compose.material3.Button( + Button( onClick = state.onSendSmsCodeClick, enabled = state.isValid && !state.isLoading ) { - androidx.compose.material3.Text("SEND CODE") + Text("SEND CODE") } - androidx.compose.material3.Button(onClick = state.onBackClick) { - androidx.compose.material3.Text("BACK") + Button(onClick = state.onBackClick) { + Text("BACK") } } MfaEnrollmentStep.ConfigureTotp -> { state.totpSecret?.let { - androidx.compose.material3.Text("Secret: ${it.sharedSecretKey}") + Text("Secret: ${it.sharedSecretKey}") } state.totpQrCodeUrl?.let { - androidx.compose.material3.Text("QR: $it") + Text("QR: $it") } - androidx.compose.material3.Button( + Button( onClick = state.onContinueToVerifyClick, enabled = state.isValid && !state.isLoading ) { - androidx.compose.material3.Text("CONTINUE") + Text("CONTINUE") } - androidx.compose.material3.Button(onClick = state.onBackClick) { - androidx.compose.material3.Text("BACK") + Button(onClick = state.onBackClick) { + Text("BACK") } } MfaEnrollmentStep.VerifyFactor -> { - androidx.compose.material3.TextField( + TextField( value = state.verificationCode, onValueChange = state.onVerificationCodeChange, - label = { androidx.compose.material3.Text("Verification code") } + label = { Text("Verification code") } ) - androidx.compose.material3.Button( + Button( onClick = state.onVerifyClick, enabled = state.isValid && !state.isLoading ) { - androidx.compose.material3.Text("VERIFY") + Text("VERIFY") } state.onResendCodeClick?.let { - androidx.compose.material3.Button(onClick = it) { - androidx.compose.material3.Text("RESEND") + Button(onClick = it) { + Text("RESEND") } } - androidx.compose.material3.Button(onClick = state.onBackClick) { - androidx.compose.material3.Text("BACK") + Button(onClick = state.onBackClick) { + Text("BACK") } } MfaEnrollmentStep.ShowRecoveryCodes -> { state.recoveryCodes?.forEach { code -> - androidx.compose.material3.Text(code) + Text(code) } - androidx.compose.material3.Button( + Button( onClick = state.onCodesSavedClick, enabled = !state.isLoading ) { - androidx.compose.material3.Text("DONE") + Text("DONE") } } } diff --git a/e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/PhoneAuthScreenTest.kt b/e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/PhoneAuthScreenTest.kt similarity index 92% rename from e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/PhoneAuthScreenTest.kt rename to e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/PhoneAuthScreenTest.kt index 1b0afbf47..7082910f1 100644 --- a/e2eTest/src/test/java/com/firebase/ui/auth/compose/ui/screens/PhoneAuthScreenTest.kt +++ b/e2eTest/src/test/java/com/firebase/ui/auth/ui/screens/PhoneAuthScreenTest.kt @@ -1,4 +1,4 @@ -package com.firebase.ui.auth.compose.ui.screens +package com.firebase.ui.auth.ui.screens import android.content.Context import android.os.Looper @@ -20,28 +20,30 @@ import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performScrollToNode import androidx.compose.ui.test.performTextInput import androidx.test.core.app.ApplicationProvider -import com.firebase.ui.auth.compose.AuthException -import com.firebase.ui.auth.compose.AuthState -import com.firebase.ui.auth.compose.FirebaseAuthUI -import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration -import com.firebase.ui.auth.compose.configuration.authUIConfiguration -import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider -import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider -import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider -import com.firebase.ui.auth.compose.testutil.AUTH_STATE_WAIT_TIMEOUT_MS -import com.firebase.ui.auth.compose.testutil.EmulatorAuthApi -import com.firebase.ui.auth.compose.ui.screens.phone.EnterPhoneNumberUI -import com.firebase.ui.auth.compose.ui.screens.phone.EnterVerificationCodeUI -import com.firebase.ui.auth.compose.ui.screens.phone.PhoneAuthScreen -import com.firebase.ui.auth.compose.ui.screens.phone.PhoneAuthStep -import com.firebase.ui.auth.compose.util.CountryUtils +import com.firebase.ui.auth.AuthException +import com.firebase.ui.auth.AuthState +import com.firebase.ui.auth.FirebaseAuthUI +import com.firebase.ui.auth.configuration.AuthUIConfiguration +import com.firebase.ui.auth.configuration.authUIConfiguration +import com.firebase.ui.auth.configuration.auth_provider.AuthProvider +import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider +import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider +import com.firebase.ui.auth.testutil.AUTH_STATE_WAIT_TIMEOUT_MS +import com.firebase.ui.auth.testutil.EmulatorAuthApi +import com.firebase.ui.auth.ui.screens.phone.EnterPhoneNumberUI +import com.firebase.ui.auth.ui.screens.phone.EnterVerificationCodeUI +import com.firebase.ui.auth.ui.screens.phone.PhoneAuthScreen +import com.firebase.ui.auth.ui.screens.phone.PhoneAuthStep +import com.firebase.ui.auth.util.CountryUtils import com.google.common.truth.Truth.assertThat import com.google.firebase.FirebaseApp import com.google.firebase.FirebaseOptions import com.google.firebase.auth.AuthResult import org.junit.After +import org.junit.Assume import org.junit.Before +import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -132,7 +134,7 @@ class PhoneAuthScreenTest { } @Test - @org.junit.Ignore("Flaky test") + @Ignore("Flaky test") fun `sign-in and verify SMS emits Success auth state`() { val country = CountryUtils.findByCountryCode("DE")!! val phone = "151${System.currentTimeMillis() % 100000000}" @@ -208,7 +210,7 @@ class PhoneAuthScreenTest { if (retries >= maxRetries) { // If we can't fetch verification codes, the emulator might not be configured // correctly or might not be running. Skip this test with a clear message. - org.junit.Assume.assumeTrue( + Assume.assumeTrue( "Skipping test: Firebase Auth Emulator verification codes endpoint not available. " + "Ensure emulator is running on localhost:9099. Error: ${e.message}", false @@ -263,7 +265,7 @@ class PhoneAuthScreenTest { } @Test - @org.junit.Ignore("Flaky in CI due to timing/scrolling issues - works locally") + @Ignore("Flaky in CI due to timing/scrolling issues - works locally") fun `change phone number navigates back to EnterPhoneNumber step`() { val defaultNumber = "+12025550123" val country = CountryUtils.findByCountryCode("US")!! @@ -339,7 +341,7 @@ class PhoneAuthScreenTest { } @Test - @org.junit.Ignore("Flaky in CI due to timing issues with countdown timer") + @Ignore("Flaky in CI due to timing issues with countdown timer") fun `resend code timer starts at configured timeout`() { val phone = "+12025550123" val timeout = 120L