github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-06-06 22:42:58 -05:00
Code Issues 2.1k Packages Projects Releases 127 Wiki Activity

Add TOTP code generation (#687)

Browse Source
This commit is contained in:
Oleg Semenenko
2024-01-19 16:40:56 -06:00
committed by Álison Fernandes
parent 88e4b45f7d
commit a877897a19
7 changed files with 132 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt
View File

@@ -5,6 +5,7 @@ import com.bitwarden.core.CipherListView
import com.bitwarden.core.CipherView
import com.bitwarden.core.Collection
import com.bitwarden.core.CollectionView
import com.bitwarden.core.DateTime
import com.bitwarden.core.DerivePinKeyResponse
import com.bitwarden.core.Folder
import com.bitwarden.core.FolderView
@@ -15,6 +16,7 @@ import com.bitwarden.core.PasswordHistory
import com.bitwarden.core.PasswordHistoryView
import com.bitwarden.core.Send
import com.bitwarden.core.SendView
import com.bitwarden.core.TotpResponse
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.InitializeCryptoResult
/**
@@ -251,4 +253,13 @@ interface VaultSdkSource {
userId: String,
passwordHistoryList: List<PasswordHistory>,
): Result<List<PasswordHistoryView>>
/**
* Generate a verification code and the period using the totp code.
*/
suspend fun generateTotp(
userId: String,
totp: String,
time: DateTime,
): Result<TotpResponse>
}

15
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt
View File

@@ -5,6 +5,7 @@ import com.bitwarden.core.CipherListView
import com.bitwarden.core.CipherView
import com.bitwarden.core.Collection
import com.bitwarden.core.CollectionView
import com.bitwarden.core.DateTime
import com.bitwarden.core.DerivePinKeyResponse
import com.bitwarden.core.Folder
import com.bitwarden.core.FolderView
@@ -14,6 +15,7 @@ import com.bitwarden.core.PasswordHistory
import com.bitwarden.core.PasswordHistoryView
import com.bitwarden.core.Send
import com.bitwarden.core.SendView
import com.bitwarden.core.TotpResponse
import com.bitwarden.sdk.BitwardenException
import com.bitwarden.sdk.Client
import com.bitwarden.sdk.ClientVault
@@ -252,6 +254,19 @@ class VaultSdkSourceImpl(
.decryptList(passwordHistoryList)
}
override suspend fun generateTotp(
userId: String,
totp: String,
time: DateTime,
): Result<TotpResponse> = runCatching {
getClient(userId = userId)
.vault()
.generateTotp(
key = totp,
time = time,
)
}
private fun getClient(
userId: String,
): Client = sdkClientManager.getOrCreateClient(userId = userId)

7
app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt
View File

@@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.vault.repository
import android.net.Uri
import com.bitwarden.core.CipherView
import com.bitwarden.core.CollectionView
import com.bitwarden.core.DateTime
import com.bitwarden.core.FolderView
import com.bitwarden.core.SendType
import com.bitwarden.core.SendView
@@ -13,6 +14,7 @@ import com.x8bit.bitwarden.data.vault.repository.model.CreateCipherResult
import com.x8bit.bitwarden.data.vault.repository.model.CreateSendResult
import com.x8bit.bitwarden.data.vault.repository.model.DeleteCipherResult
import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult
import com.x8bit.bitwarden.data.vault.repository.model.GenerateTotpResult
import com.x8bit.bitwarden.data.vault.repository.model.RemovePasswordSendResult
import com.x8bit.bitwarden.data.vault.repository.model.SendData
import com.x8bit.bitwarden.data.vault.repository.model.ShareCipherResult
@@ -198,6 +200,11 @@ interface VaultRepository : VaultLockManager {
*/
suspend fun removePasswordSend(sendId: String): RemovePasswordSendResult
/**
* Attempt to get the verification code and the period.
*/
suspend fun generateTotp(totpCode: String, time: DateTime): GenerateTotpResult
/**
* Attempt to delete a send.
*/

23
app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt
View File

@@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.vault.repository
import android.net.Uri
import com.bitwarden.core.CipherView
import com.bitwarden.core.CollectionView
import com.bitwarden.core.DateTime
import com.bitwarden.core.FolderView
import com.bitwarden.core.InitOrgCryptoRequest
import com.bitwarden.core.InitUserCryptoMethod
@@ -37,6 +38,7 @@ import com.x8bit.bitwarden.data.vault.repository.model.CreateCipherResult
import com.x8bit.bitwarden.data.vault.repository.model.CreateSendResult
import com.x8bit.bitwarden.data.vault.repository.model.DeleteCipherResult
import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult
import com.x8bit.bitwarden.data.vault.repository.model.GenerateTotpResult
import com.x8bit.bitwarden.data.vault.repository.model.RemovePasswordSendResult
import com.x8bit.bitwarden.data.vault.repository.model.SendData
import com.x8bit.bitwarden.data.vault.repository.model.ShareCipherResult
@@ -593,6 +595,27 @@ class VaultRepositoryImpl(
)
}
override suspend fun generateTotp(
totpCode: String,
time: DateTime,
): GenerateTotpResult {
val userId = requireNotNull(activeUserId)
return vaultSdkSource.generateTotp(
time = time,
userId = userId,
totp = totpCode,
)
.fold(
onSuccess = {
GenerateTotpResult.Success(
code = it.code,
periodSeconds = it.period.toInt(),
)
},
onFailure = { GenerateTotpResult.Error },
)
}
/**
* Checks if the given [userId] has an associated encrypted PIN key but not a pin-protected user
* key. This indicates a scenario in which a user has requested PIN unlocking but requires

20
app/src/main/java/com/x8bit/bitwarden/data/vault/repository/model/GenerateTotpResult.kt Normal file
View File

@@ -0,0 +1,20 @@
package com.x8bit.bitwarden.data.vault.repository.model
/**
* Models the result of generating a totp code.
*/
sealed class GenerateTotpResult {
/**
* The code was generated successfully.
*/
data class Success(
val code: String,
val periodSeconds: Int,
) : GenerateTotpResult()
/**
* An error occurred while generating the code.
*/
data object Error : GenerateTotpResult()
}