mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-22 01:16:02 +03:00
Code Issues Projects Releases Packages Wiki Activity

BIT-933: Properly pass nullable captcha to login screen (#149)

Browse source
This commit is contained in:
Brian Yencho 2023-10-23 16:54:42 -05:00 committed by Álison Fernandes
parent 84b127bd10
commit 6476ee2927
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginNavigation.kt
View file

@ -10,7 +10,7 @@ import androidx.navigation.navArgument
private const val EMAIL_ADDRESS: String = "email_address"
private const val CAPTCHA_TOKEN = "captcha_token"
private const val LOGIN_ROUTE: String = "login/{$EMAIL_ADDRESS}/{$CAPTCHA_TOKEN}"
private const val LOGIN_ROUTE: String = "login/{$EMAIL_ADDRESS}?$CAPTCHA_TOKEN={$CAPTCHA_TOKEN}"
/**
* Class to retrieve login arguments from the [SavedStateHandle].
@ -30,7 +30,10 @@ fun NavController.navigateToLogin(
captchaToken: String?,
navOptions: NavOptions? = null,
) {
this.navigate("login/$emailAddress/$captchaToken", navOptions)
this.navigate(
"login/$emailAddress?$CAPTCHA_TOKEN=$captchaToken",
navOptions,
)
}
/**
@ -43,6 +46,10 @@ fun NavGraphBuilder.loginDestinations(
route = LOGIN_ROUTE,
arguments = listOf(
navArgument(EMAIL_ADDRESS) { type = NavType.StringType },
navArgument(CAPTCHA_TOKEN) {
type = NavType.StringType
nullable = true
},
),
) {
LoginScreen(