refactor: rename to emailLinkActionCodeSettings in AuthProvider.Email and passwordResetActionCodeSettings in AuthUIConfiguration

demolaf · demolaf · commit a467ddec9d58 · 2025-10-08T16:48:46.000+01:00
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/configuration/auth_provider/AuthProvider.kt b/auth/src/main/java/com/firebase/ui/auth/compose/configuration/auth_provider/AuthProvider.kt
@@ -174,7 +174,7 @@ abstract class AuthProvider(open val providerId: String) {
         /**
          * Settings for email link actions.
          */
-        val actionCodeSettings: ActionCodeSettings?,
+        val emailLinkActionCodeSettings: ActionCodeSettings?,
 
         /**
          * Allows new accounts to be created. Defaults to true.
@@ -206,7 +206,7 @@ abstract class AuthProvider(open val providerId: String) {
             isAnonymousUpgradeEnabled: Boolean = false
         ) {
             if (isEmailLinkSignInEnabled) {
-                val actionCodeSettings = requireNotNull(actionCodeSettings) {
+                val actionCodeSettings = requireNotNull(emailLinkActionCodeSettings) {
                     "ActionCodeSettings cannot be null when using " +
                             "email link sign in."
                 }
@@ -230,11 +230,11 @@ abstract class AuthProvider(open val providerId: String) {
             sessionId: String,
             anonymousUserId: String,
         ): ActionCodeSettings {
-            requireNotNull(actionCodeSettings) {
+            requireNotNull(emailLinkActionCodeSettings) {
                 "ActionCodeSettings is required for email link sign in"
             }
 
-            val continueUrl = continueUrl(actionCodeSettings.url) {
+            val continueUrl = continueUrl(emailLinkActionCodeSettings.url) {
                 appendSessionId(sessionId)
                 appendAnonymousUserId(anonymousUserId)
                 appendForceSameDeviceBit(isEmailLinkForceSameDeviceEnabled)
@@ -243,12 +243,12 @@ abstract class AuthProvider(open val providerId: String) {
 
             return actionCodeSettings {
                 url = continueUrl
-                handleCodeInApp = actionCodeSettings.canHandleCodeInApp()
-                iosBundleId = actionCodeSettings.iosBundle
+                handleCodeInApp = emailLinkActionCodeSettings.canHandleCodeInApp()
+                iosBundleId = emailLinkActionCodeSettings.iosBundle
                 setAndroidPackageName(
-                    actionCodeSettings.androidPackageName ?: "",
-                    actionCodeSettings.androidInstallApp,
-                    actionCodeSettings.androidMinimumVersion
+                    emailLinkActionCodeSettings.androidPackageName ?: "",
+                    emailLinkActionCodeSettings.androidInstallApp,
+                    emailLinkActionCodeSettings.androidMinimumVersion
                 )
             }
         }
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/components/AuthProviderButton.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/components/AuthProviderButton.kt
@@ -178,7 +178,7 @@ private fun PreviewAuthProviderButton() {
     ) {
         AuthProviderButton(
             provider = AuthProvider.Email(
-                actionCodeSettings = null,
+                emailLinkActionCodeSettings = null,
                 passwordValidationRules = emptyList()
             ),
             onClick = {},
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/method_picker/AuthMethodPicker.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/method_picker/AuthMethodPicker.kt
@@ -145,7 +145,7 @@ fun PreviewAuthMethodPicker() {
         AuthMethodPicker(
             providers = listOf(
                 AuthProvider.Email(
-                    actionCodeSettings = null,
+                    emailLinkActionCodeSettings = null,
                     passwordValidationRules = emptyList()
                 ),
                 AuthProvider.Phone(
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/ResetPasswordUI.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/ResetPasswordUI.kt
@@ -193,7 +193,7 @@ fun PreviewResetPasswordUI() {
         isDisplayNameRequired = true,
         isEmailLinkSignInEnabled = false,
         isEmailLinkForceSameDeviceEnabled = true,
-        actionCodeSettings = null,
+        emailLinkActionCodeSettings = null,
         isNewAccountsAllowed = true,
         minimumPasswordLength = 8,
         passwordValidationRules = listOf()
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/SignUpUI.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/SignUpUI.kt
@@ -245,7 +245,7 @@ fun PreviewSignUpUI() {
         isDisplayNameRequired = true,
         isEmailLinkSignInEnabled = false,
         isEmailLinkForceSameDeviceEnabled = true,
-        actionCodeSettings = null,
+        emailLinkActionCodeSettings = null,
         isNewAccountsAllowed = true,
         minimumPasswordLength = 8,
         passwordValidationRules = listOf()
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/sign_in/SignInUI.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/sign_in/SignInUI.kt
@@ -215,7 +215,7 @@ fun PreviewSignInUI() {
         isDisplayNameRequired = true,
         isEmailLinkSignInEnabled = false,
         isEmailLinkForceSameDeviceEnabled = true,
-        actionCodeSettings = null,
+        emailLinkActionCodeSettings = null,
         isNewAccountsAllowed = true,
         minimumPasswordLength = 8,
         passwordValidationRules = listOf()
diff --git a/auth/src/test/java/com/firebase/ui/auth/compose/configuration/AuthUIConfigurationTest.kt b/auth/src/test/java/com/firebase/ui/auth/compose/configuration/AuthUIConfigurationTest.kt
@@ -309,7 +309,7 @@ class AuthUIConfigurationTest {
                 )
                 provider(
                     AuthProvider.Email(
-                        actionCodeSettings = null,
+                        emailLinkActionCodeSettings = null,
                         passwordValidationRules = listOf()
                     )
                 )
diff --git a/auth/src/test/java/com/firebase/ui/auth/compose/configuration/auth_provider/AuthProviderTest.kt b/auth/src/test/java/com/firebase/ui/auth/compose/configuration/auth_provider/AuthProviderTest.kt
@@ -34,7 +34,7 @@ class AuthProviderTest {
     @Test
     fun `email provider with valid configuration should succeed`() {
         val provider = AuthProvider.Email(
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = listOf()
         )
 
@@ -50,7 +50,7 @@ class AuthProviderTest {
 
         val provider = AuthProvider.Email(
             isEmailLinkSignInEnabled = true,
-            actionCodeSettings = actionCodeSettings,
+            emailLinkActionCodeSettings = actionCodeSettings,
             passwordValidationRules = listOf()
         )
 
@@ -61,7 +61,7 @@ class AuthProviderTest {
     fun `email provider with email link enabled but null action code settings should throw`() {
         val provider = AuthProvider.Email(
             isEmailLinkSignInEnabled = true,
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = listOf()
         )
 
@@ -85,7 +85,7 @@ class AuthProviderTest {
 
         val provider = AuthProvider.Email(
             isEmailLinkSignInEnabled = true,
-            actionCodeSettings = actionCodeSettings,
+            emailLinkActionCodeSettings = actionCodeSettings,
             passwordValidationRules = listOf()
         )
 
@@ -319,7 +319,7 @@ class AuthProviderTest {
         val providers = listOf(
             AuthProvider.Anonymous,
             AuthProvider.Email(
-                actionCodeSettings = null,
+                emailLinkActionCodeSettings = null,
                 passwordValidationRules = listOf()
             )
         )
diff --git a/auth/src/test/java/com/firebase/ui/auth/compose/configuration/auth_provider/EmailAuthProviderFirebaseAuthUITest.kt b/auth/src/test/java/com/firebase/ui/auth/compose/configuration/auth_provider/EmailAuthProviderFirebaseAuthUITest.kt
@@ -123,7 +123,7 @@ class EmailAuthProviderFirebaseAuthUITest {
 
         val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth)
         val emailProvider = AuthProvider.Email(
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = emptyList()
         )
         val config = authUIConfiguration {
@@ -165,7 +165,7 @@ class EmailAuthProviderFirebaseAuthUITest {
             ).thenReturn(taskCompletionSource.task)
             val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth)
             val emailProvider = AuthProvider.Email(
-                actionCodeSettings = null,
+                emailLinkActionCodeSettings = null,
                 passwordValidationRules = emptyList()
             )
             val config = authUIConfiguration {
@@ -196,7 +196,7 @@ class EmailAuthProviderFirebaseAuthUITest {
     fun `createOrLinkUserWithEmailAndPassword - rejects weak password`() = runTest {
         val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth)
         val emailProvider = AuthProvider.Email(
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = emptyList()
         )
         val config = authUIConfiguration {
@@ -231,7 +231,7 @@ class EmailAuthProviderFirebaseAuthUITest {
     fun `createOrLinkUserWithEmailAndPassword - validates custom password rules`() = runTest {
         val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth)
         val emailProvider = AuthProvider.Email(
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = listOf(PasswordRule.RequireUppercase)
         )
         val config = authUIConfiguration {
@@ -259,7 +259,7 @@ class EmailAuthProviderFirebaseAuthUITest {
     fun `createOrLinkUserWithEmailAndPassword - respects isNewAccountsAllowed setting`() = runTest {
         val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth)
         val emailProvider = AuthProvider.Email(
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = emptyList(),
             isNewAccountsAllowed = false
         )
@@ -303,7 +303,7 @@ class EmailAuthProviderFirebaseAuthUITest {
 
         val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth)
         val emailProvider = AuthProvider.Email(
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = emptyList()
         )
         val config = authUIConfiguration {
@@ -348,7 +348,7 @@ class EmailAuthProviderFirebaseAuthUITest {
 
         val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth)
         val emailProvider = AuthProvider.Email(
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = emptyList()
         )
         val config = authUIConfiguration {
@@ -383,7 +383,7 @@ class EmailAuthProviderFirebaseAuthUITest {
 
         val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth)
         val emailProvider = AuthProvider.Email(
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = emptyList()
         )
         val config = authUIConfiguration {
@@ -419,7 +419,7 @@ class EmailAuthProviderFirebaseAuthUITest {
 
         val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth)
         val emailProvider = AuthProvider.Email(
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = emptyList()
         )
         val config = authUIConfiguration {
@@ -463,7 +463,7 @@ class EmailAuthProviderFirebaseAuthUITest {
 
         val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth)
         val emailProvider = AuthProvider.Email(
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = emptyList()
         )
         val config = authUIConfiguration {
@@ -501,7 +501,7 @@ class EmailAuthProviderFirebaseAuthUITest {
 
         val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth)
         val emailProvider = AuthProvider.Email(
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = emptyList()
         )
         val config = authUIConfiguration {
@@ -537,7 +537,7 @@ class EmailAuthProviderFirebaseAuthUITest {
 
         val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth)
         val emailProvider = AuthProvider.Email(
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = emptyList()
         )
         val config = authUIConfiguration {
@@ -583,7 +583,7 @@ class EmailAuthProviderFirebaseAuthUITest {
 
         val instance = FirebaseAuthUI.create(firebaseApp, mockFirebaseAuth)
         val emailProvider = AuthProvider.Email(
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = emptyList()
         )
         val config = authUIConfiguration {
diff --git a/auth/src/test/java/com/firebase/ui/auth/compose/ui/components/AuthProviderButtonTest.kt b/auth/src/test/java/com/firebase/ui/auth/compose/ui/components/AuthProviderButtonTest.kt
@@ -111,7 +111,7 @@ class AuthProviderButtonTest {
     @Test
     fun `AuthProviderButton displays Email provider correctly`() {
         val provider = AuthProvider.Email(
-            actionCodeSettings = null,
+            emailLinkActionCodeSettings = null,
             passwordValidationRules = emptyList()
         )
 
diff --git a/auth/src/test/java/com/firebase/ui/auth/compose/ui/method_picker/AuthMethodPickerTest.kt b/auth/src/test/java/com/firebase/ui/auth/compose/ui/method_picker/AuthMethodPickerTest.kt
@@ -56,7 +56,10 @@ class AuthMethodPickerTest {
         val providers = listOf(
             AuthProvider.Google(scopes = emptyList(), serverClientId = null),
             AuthProvider.Facebook(),
-            AuthProvider.Email(actionCodeSettings = null, passwordValidationRules = emptyList())
+            AuthProvider.Email(
+                emailLinkActionCodeSettings = null,
+                passwordValidationRules = emptyList()
+            )
         )
 
         composeTestRule.setContent {
@@ -277,7 +280,10 @@ class AuthMethodPickerTest {
             AuthProvider.Microsoft(tenant = null, customParameters = emptyMap()),
             AuthProvider.Yahoo(customParameters = emptyMap()),
             AuthProvider.Apple(locale = null, customParameters = emptyMap()),
-            AuthProvider.Email(actionCodeSettings = null, passwordValidationRules = emptyList()),
+            AuthProvider.Email(
+                emailLinkActionCodeSettings = null,
+                passwordValidationRules = emptyList()
+            ),
             AuthProvider.Phone(
                 defaultNumber = null,
                 defaultCountryCode = null,

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ class AuthUIConfigurationTest {`
`309`	`309`	`)`
`310`	`310`	`provider(`
`311`	`311`	`AuthProvider.Email(`
`312`		`- actionCodeSettings = null,`
	`312`	`+ emailLinkActionCodeSettings = null,`
`313`	`313`	`passwordValidationRules = listOf()`
`314`	`314`	`)`
`315`	`315`	`)`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ class AuthProviderButtonTest {`
`111`	`111`	`@Test`
`112`	`112`	fun `AuthProviderButton displays Email provider correctly`() {
`113`	`113`	`val provider = AuthProvider.Email(`
`114`		`- actionCodeSettings = null,`
	`114`	`+ emailLinkActionCodeSettings = null,`
`115`	`115`	`passwordValidationRules = emptyList()`
`116`	`116`	`)`
`117`	`117`