mirror of
https://github.com/bitwarden/android.git
synced 2026-03-21 22:00:42 -05:00
[PM-15057] Rename toFido2RequestOrNull to toFido2CreateRequestOrNull (#4425)
This commit is contained in:
@@ -29,7 +29,7 @@ fun SpecialCircumstance.toAutofillSelectionDataOrNull(): AutofillSelectionData?
|
||||
/**
|
||||
* Returns [Fido2CreateCredentialRequest] when contained in the given [SpecialCircumstance].
|
||||
*/
|
||||
fun SpecialCircumstance.toFido2RequestOrNull(): Fido2CreateCredentialRequest? =
|
||||
fun SpecialCircumstance.toFido2CreateRequestOrNull(): Fido2CreateCredentialRequest? =
|
||||
when (this) {
|
||||
is SpecialCircumstance.Fido2Save -> this.fido2CreateCredentialRequest
|
||||
else -> null
|
||||
|
||||
@@ -23,7 +23,7 @@ import com.x8bit.bitwarden.data.platform.manager.event.OrganizationEventManager
|
||||
import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent
|
||||
import com.x8bit.bitwarden.data.platform.manager.util.toAutofillSaveItemOrNull
|
||||
import com.x8bit.bitwarden.data.platform.manager.util.toAutofillSelectionDataOrNull
|
||||
import com.x8bit.bitwarden.data.platform.manager.util.toFido2RequestOrNull
|
||||
import com.x8bit.bitwarden.data.platform.manager.util.toFido2CreateRequestOrNull
|
||||
import com.x8bit.bitwarden.data.platform.manager.util.toTotpDataOrNull
|
||||
import com.x8bit.bitwarden.data.platform.repository.SettingsRepository
|
||||
import com.x8bit.bitwarden.data.platform.repository.model.DataState
|
||||
@@ -121,7 +121,7 @@ class VaultAddEditViewModel @Inject constructor(
|
||||
// Check for totp data to pre-populate
|
||||
val totpData = specialCircumstance?.toTotpDataOrNull()
|
||||
// Check for Fido2 data to pre-populate
|
||||
val fido2CreationRequest = specialCircumstance?.toFido2RequestOrNull()
|
||||
val fido2CreationRequest = specialCircumstance?.toFido2CreateRequestOrNull()
|
||||
val fido2AttestationOptions = fido2CreationRequest?.let { request ->
|
||||
fido2CredentialManager.getPasskeyAttestationOptionsOrNull(request.requestJson)
|
||||
}
|
||||
@@ -419,7 +419,7 @@ class VaultAddEditViewModel @Inject constructor(
|
||||
}
|
||||
|
||||
specialCircumstanceManager.specialCircumstance
|
||||
?.toFido2RequestOrNull()
|
||||
?.toFido2CreateRequestOrNull()
|
||||
?.let { request ->
|
||||
handleFido2RequestSpecialCircumstance(request, content.toCipherView())
|
||||
return@onContent
|
||||
@@ -583,7 +583,7 @@ class VaultAddEditViewModel @Inject constructor(
|
||||
private fun handleConfirmOverwriteExistingPasskeyClick() {
|
||||
specialCircumstanceManager
|
||||
.specialCircumstance
|
||||
?.toFido2RequestOrNull()
|
||||
?.toFido2CreateRequestOrNull()
|
||||
?.let { request ->
|
||||
onContent { content ->
|
||||
registerFido2Credential(request, content.toCipherView())
|
||||
@@ -605,7 +605,7 @@ class VaultAddEditViewModel @Inject constructor(
|
||||
private fun getRequestAndRegisterCredential() =
|
||||
specialCircumstanceManager
|
||||
.specialCircumstance
|
||||
?.toFido2RequestOrNull()
|
||||
?.toFido2CreateRequestOrNull()
|
||||
?.let { request ->
|
||||
onContent { content ->
|
||||
registerFido2CredentialToCipher(
|
||||
|
||||
@@ -33,7 +33,7 @@ import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent
|
||||
import com.x8bit.bitwarden.data.platform.manager.util.toAutofillSelectionDataOrNull
|
||||
import com.x8bit.bitwarden.data.platform.manager.util.toFido2AssertionRequestOrNull
|
||||
import com.x8bit.bitwarden.data.platform.manager.util.toFido2GetCredentialsRequestOrNull
|
||||
import com.x8bit.bitwarden.data.platform.manager.util.toFido2RequestOrNull
|
||||
import com.x8bit.bitwarden.data.platform.manager.util.toFido2CreateRequestOrNull
|
||||
import com.x8bit.bitwarden.data.platform.manager.util.toTotpDataOrNull
|
||||
import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository
|
||||
import com.x8bit.bitwarden.data.platform.repository.SettingsRepository
|
||||
@@ -113,7 +113,7 @@ class VaultItemListingViewModel @Inject constructor(
|
||||
val activeAccountSummary = userState.toActiveAccountSummary()
|
||||
val accountSummaries = userState.toAccountSummaries()
|
||||
val specialCircumstance = specialCircumstanceManager.specialCircumstance
|
||||
val fido2CredentialRequest = specialCircumstance?.toFido2RequestOrNull()
|
||||
val fido2CredentialRequest = specialCircumstance?.toFido2CreateRequestOrNull()
|
||||
VaultItemListingState(
|
||||
itemListingType = VaultItemListingArgs(savedStateHandle = savedStateHandle)
|
||||
.vaultItemListingType
|
||||
@@ -1263,7 +1263,7 @@ class VaultItemListingViewModel @Inject constructor(
|
||||
private fun continueFido2Operation(cipherView: CipherView) {
|
||||
specialCircumstanceManager
|
||||
.specialCircumstance
|
||||
?.toFido2RequestOrNull()
|
||||
?.toFido2CreateRequestOrNull()
|
||||
?.let { request ->
|
||||
registerFido2CredentialToCipher(
|
||||
request = request,
|
||||
|
||||
@@ -140,7 +140,7 @@ class SpecialCircumstanceExtensionsTest {
|
||||
SpecialCircumstance.VaultShortcut,
|
||||
)
|
||||
.forEach { specialCircumstance ->
|
||||
assertNull(specialCircumstance.toFido2RequestOrNull())
|
||||
assertNull(specialCircumstance.toFido2CreateRequestOrNull())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -159,7 +159,7 @@ class SpecialCircumstanceExtensionsTest {
|
||||
.Fido2Save(
|
||||
fido2CreateCredentialRequest = fido2CreateCredentialRequest,
|
||||
)
|
||||
.toFido2RequestOrNull(),
|
||||
.toFido2CreateRequestOrNull(),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user