Skip to content

Commit 6efd979

Browse files
authored
feat: Email link sign in with deep link test, added missing translations for strings (#2268)
* fix: email link sign in support * fix: email link sign in and tests * add missing translations * email link sign in and deep link e2e test
1 parent e5d5f1d commit 6efd979

File tree

94 files changed

+577
-141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+577
-141
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import kotlinx.coroutines.tasks.await
4747
* @see signInWithProvider
4848
*/
4949
@Composable
50-
fun FirebaseAuthUI.rememberOAuthSignInHandler(
50+
internal fun FirebaseAuthUI.rememberOAuthSignInHandler(
5151
activity: Activity?,
5252
config: AuthUIConfiguration,
5353
provider: AuthProvider.OAuth,

auth/src/main/java/com/firebase/ui/auth/compose/configuration/string_provider/AuthUIStringProvider.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,15 @@ interface AuthUIStringProvider {
170170
/** Body for email sign in link sent dialog */
171171
fun emailSignInLinkSentDialogBody(email: String): String
172172

173+
/** Divider text for alternate sign-in options */
174+
val orContinueWith: String
175+
176+
/** Button text to sign in with email link */
177+
val signInWithEmailLink: String
178+
179+
/** Button text to sign in with password */
180+
val signInWithPassword: String
181+
173182
/** Title shown when prompting the user to confirm their email for cross-device flows */
174183
val emailLinkPromptForEmailTitle: String
175184

auth/src/main/java/com/firebase/ui/auth/compose/configuration/string_provider/DefaultAuthUIStringProvider.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,15 @@ class DefaultAuthUIStringProvider(
148148
override fun emailSignInLinkSentDialogBody(email: String): String =
149149
localizedContext.getString(R.string.fui_email_link_email_sent, email)
150150

151+
override val orContinueWith: String
152+
get() = localizedContext.getString(R.string.fui_or_continue_with)
153+
154+
override val signInWithEmailLink: String
155+
get() = localizedContext.getString(R.string.fui_sign_in_with_email_link)
156+
157+
override val signInWithPassword: String
158+
get() = localizedContext.getString(R.string.fui_sign_in_with_password)
159+
151160
override val emailLinkPromptForEmailTitle: String
152161
get() = localizedContext.getString(R.string.fui_email_link_confirm_email_header)
153162

auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/email/SignInEmailLinkUI.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ fun SignInEmailLinkUI(
206206
) {
207207
HorizontalDivider(modifier = Modifier.weight(1f))
208208
Text(
209-
text = "or Continue with",
209+
text = stringProvider.orContinueWith,
210210
modifier = Modifier.padding(horizontal = 8.dp),
211211
style = MaterialTheme.typography.bodySmall
212212
)
@@ -220,7 +220,7 @@ fun SignInEmailLinkUI(
220220
modifier = Modifier.fillMaxWidth(),
221221
enabled = !isLoading
222222
) {
223-
Text("Sign in with password".uppercase())
223+
Text(stringProvider.signInWithPassword.uppercase())
224224
}
225225

226226
Spacer(modifier = Modifier.height(16.dp))

auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/email/SignInUI.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ fun SignInUI(
213213
) {
214214
HorizontalDivider(modifier = Modifier.weight(1f))
215215
Text(
216-
text = "or Continue with",
216+
text = stringProvider.orContinueWith,
217217
modifier = Modifier.padding(horizontal = 8.dp),
218218
style = MaterialTheme.typography.bodySmall
219219
)
@@ -227,7 +227,7 @@ fun SignInUI(
227227
modifier = Modifier.fillMaxWidth(),
228228
enabled = !isLoading
229229
) {
230-
Text("Sign in with email link".uppercase())
230+
Text(stringProvider.signInWithEmailLink.uppercase())
231231
}
232232
}
233233

auth/src/main/res/values-ar/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
<string name="fui_email_link_confirm_email_message">تأكيد عنوان البريد الإلكتروني لمتابعة تسجيل الدخول</string>
7676
<string name="fui_email_link_dismiss_button">رفض</string>
7777
<string name="fui_email_link_cross_device_linking_text">لقد بدأت هذه العملية بهدف ربط %1$s ببريدك الإلكتروني إلّا أنك فتحت الرابط على جهاز آخر لم يتمّ تسجيل الدخول عليه.\n\nلربط حسابك على %1$s، يجب فتح الرابط على الجهاز نفسه حيث سجّلت الدخول في البداية. ولإلغاء عملية الربط، يُرجى النقر على \"متابعة\" لتسجيل الدخول على هذا الجهاز.</string>
78+
<string name="fui_or_continue_with">أو المتابعة باستخدام</string>
79+
<string name="fui_sign_in_with_email_link">تسجيل الدخول باستخدام رابط البريد الإلكتروني</string>
80+
<string name="fui_sign_in_with_password">تسجيل الدخول باستخدام كلمة المرور</string>
7881
<string name="fui_verify_phone_number_title">أدخل رقم هاتفك</string>
7982
<string name="fui_invalid_phone_number">يُرجى إدخال رقم هاتف صالح</string>
8083
<string name="fui_enter_confirmation_code">أدخل الرمز المكوّن من 6 أرقام الذي أرسلناه إلى</string>

auth/src/main/res/values-b+es+419/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
<string name="fui_email_link_confirm_email_message">Confirma el correo electrónico para continuar con el acceso</string>
7676
<string name="fui_email_link_dismiss_button">Descartar</string>
7777
<string name="fui_email_link_cross_device_linking_text">Originalmente, intentaste conectar tu cuenta de correo electrónico con %1$s, pero abriste el vínculo en un dispositivo diferente en el que no accediste.\n\nSi quieres conectar tu cuenta de %1$s, abre el vínculo en el mismo dispositivo con el que iniciaste el acceso. De lo contrario, presiona Continuar para acceder en este dispositivo.</string>
78+
<string name="fui_or_continue_with">o Continuar con</string>
79+
<string name="fui_sign_in_with_email_link">Iniciar sesión con enlace de correo</string>
80+
<string name="fui_sign_in_with_password">Iniciar sesión con contraseña</string>
7881
<string name="fui_verify_phone_number_title">Ingresa tu número de teléfono</string>
7982
<string name="fui_invalid_phone_number">Ingresa un número de teléfono válido</string>
8083
<string name="fui_enter_confirmation_code">Ingresa el código de 6 dígitos que enviamos al número</string>

auth/src/main/res/values-bg/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
<string name="fui_email_link_confirm_email_message">Потвърдете имейл адреса, за да продължите с влизането в профила</string>
7676
<string name="fui_email_link_dismiss_button">Отхвърляне</string>
7777
<string name="fui_email_link_cross_device_linking_text">Първоначално искахте да свържете %1$s с имейла на профила си, но отворихте връзката на различно устройство без вход в профила.\n\nАко все още искате да свържете профила си в(ъв) %1$s, отворете връзката на същото устройство, на което започнахте влизането в профила. В противен случай докоснете „Напред“, за да влезете на това устройство.</string>
78+
<string name="fui_or_continue_with">или Продължете с</string>
79+
<string name="fui_sign_in_with_email_link">Вход чрез имейл връзка</string>
80+
<string name="fui_sign_in_with_password">Вход с парола</string>
7881
<string name="fui_verify_phone_number_title">Въвеждане на телефонния ви номер</string>
7982
<string name="fui_invalid_phone_number">Въведете валиден телефонен номер</string>
8083
<string name="fui_enter_confirmation_code">Въведете 6-цифрения код, който изпратихме до</string>

auth/src/main/res/values-bn/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
<string name="fui_email_link_confirm_email_message">সাইন-ইন করতে ইমেল আইডি কনফার্ম করুন</string>
7676
<string name="fui_email_link_dismiss_button">খারিজ করুন</string>
7777
<string name="fui_email_link_cross_device_linking_text">আপনি %1$s অ্যাকাউন্ট ইমেল অ্যাকাউন্টের সাথে কানেক্ট করতে চেয়েছিলেন কিন্তু এমন একটি ডিভাইসে লিঙ্কটি খুলেছেন যেখানে সাইন-ইন করেননি।\n\nআপনি যদি এখনও %1$s অ্যাকাউন্টটি কানেক্ট করতে চান, যে ডিভাইসে সাইন-ইন করেছিলেন সেখানেই লিঙ্কটি খুলুন। নাহলে, ডিভাইসের সাইন-ইন বিকল্পে ট্যাপ করুন।</string>
78+
<string name="fui_or_continue_with">বা এটি দিয়ে চালিয়ে যান</string>
79+
<string name="fui_sign_in_with_email_link">ইমেল লিঙ্ক দিয়ে সাইন ইন করুন</string>
80+
<string name="fui_sign_in_with_password">পাসওয়ার্ড দিয়ে সাইন ইন করুন</string>
7881
<string name="fui_verify_phone_number_title">আপনার ফোন নম্বর লিখুন</string>
7982
<string name="fui_invalid_phone_number">একটি সঠিক ফোন নম্বর লিখুন</string>
8083
<string name="fui_enter_confirmation_code">আমাদের পাঠানো ৬-সংখ্যার কোডটি লিখুন</string>

auth/src/main/res/values-ca/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
<string name="fui_email_link_confirm_email_message">Confirma l\'adreça electrònica per continuar amb l\'inici de sessió</string>
7676
<string name="fui_email_link_dismiss_button">Ignora</string>
7777
<string name="fui_email_link_cross_device_linking_text">Inicialment has intentat connectar %1$s amb el teu compte de correu electrònic, però has obert l\'enllaç amb un dispositiu diferent en què no has iniciat la sessió.\n\nSi encara vols connectar el compte que tens a %1$s, obre l\'enllaç al mateix dispositiu en què has començat a iniciar la sessió. Si no, toca Continua per iniciar la sessió en aquest dispositiu.</string>
78+
<string name="fui_or_continue_with">o Continua amb</string>
79+
<string name="fui_sign_in_with_email_link">Inicia la sessió amb l\'enllaç de correu electrònic</string>
80+
<string name="fui_sign_in_with_password">Inicia la sessió amb la contrasenya</string>
7881
<string name="fui_verify_phone_number_title">Introdueix el número de telèfon</string>
7982
<string name="fui_invalid_phone_number">Introdueix un número de telèfon vàlid</string>
8083
<string name="fui_enter_confirmation_code">Introdueix el codi de 6 dígits que s\'ha enviat al número</string>

0 commit comments

Comments
 (0)