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

Use the clock in the Generator Repo (#1032)

Browse source
This commit is contained in:
David Perez 2024-02-16 16:12:38 -06:00 committed by Álison Fernandes
parent 7558a29922
commit 32f9b1bde6
3 changed files with 17 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryImpl.kt
View file

@ -40,7 +40,7 @@ import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.onStart
import kotlinx.coroutines.flow.receiveAsFlow
import kotlinx.coroutines.launch
import java.time.Instant
import java.time.Clock
import javax.inject.Singleton
import kotlin.math.max
@ -50,6 +50,7 @@ import kotlin.math.max
@Singleton
@Suppress("LongParameterList")
class GeneratorRepositoryImpl(
private val clock: Clock,
private val generatorSdkSource: GeneratorSdkSource,
private val generatorDiskSource: GeneratorDiskSource,
private val authDiskSource: AuthDiskSource,
@ -119,7 +120,7 @@ class GeneratorRepositoryImpl(
onSuccess = { generatedPassword ->
val passwordHistoryView = PasswordHistoryView(
password = generatedPassword,
lastUsedDate = Instant.now(),
lastUsedDate = clock.instant(),
)
if (shouldSave) {
@ -141,7 +142,7 @@ class GeneratorRepositoryImpl(
onSuccess = { generatedPassphrase ->
val passwordHistoryView = PasswordHistoryView(
password = generatedPassphrase,
lastUsedDate = Instant.now(),
lastUsedDate = clock.instant(),
)
scope.launch {
storePasswordHistory(passwordHistoryView)

3
app/src/main/java/com/x8bit/bitwarden/data/tools/generator/repository/di/GeneratorRepositoryModule.kt
View file

@ -13,6 +13,7 @@ import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import java.time.Clock
import javax.inject.Singleton
/**
@ -25,6 +26,7 @@ object GeneratorRepositoryModule {
@Provides
@Singleton
fun provideGeneratorRepository(
clock: Clock,
generatorSdkSource: GeneratorSdkSource,
generatorDiskSource: GeneratorDiskSource,
authDiskSource: AuthDiskSource,
@ -33,6 +35,7 @@ object GeneratorRepositoryModule {
dispatcherManager: DispatcherManager,
policyManager: PolicyManager,
): GeneratorRepository = GeneratorRepositoryImpl(
clock = clock,
generatorSdkSource = generatorSdkSource,
generatorDiskSource = generatorDiskSource,
authDiskSource = authDiskSource,

36
app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt
View file

@ -44,27 +44,29 @@ import io.mockk.coVerify
import io.mockk.every
import io.mockk.just
import io.mockk.mockk
import io.mockk.mockkStatic
import io.mockk.runs
import io.mockk.unmockkStatic
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.test.runTest
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.encodeToJsonElement
import kotlinx.serialization.json.jsonObject
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertNotNull
import org.junit.jupiter.api.Assertions.assertNull
import org.junit.jupiter.api.Test
import java.time.Clock
import java.time.Instant
import java.time.ZoneOffset
@Suppress("LargeClass")
class GeneratorRepositoryTest {
private val fixedClock: Clock = Clock.fixed(
Instant.parse("2021-01-01T00:00:00Z"),
ZoneOffset.UTC,
)
private val mutableUserStateFlow = MutableStateFlow<UserStateJson?>(null)
private val generatorSdkSource: GeneratorSdkSource = mockk()
private val generatorDiskSource: GeneratorDiskSource = mockk()
private val authDiskSource: AuthDiskSource = mockk {
@ -77,6 +79,7 @@ class GeneratorRepositoryTest {
private val policyManager: PolicyManager = mockk()
private val repository = GeneratorRepositoryImpl(
clock = fixedClock,
generatorSdkSource = generatorSdkSource,
generatorDiskSource = generatorDiskSource,
authDiskSource = authDiskSource,
@ -86,20 +89,10 @@ class GeneratorRepositoryTest {
policyManager = policyManager,
)
@AfterEach
fun tearDown() {
unmockkStatic(Instant::class)
}
@Suppress("MaxLineLength")
@Test
fun `generatePassword should emit Success result and store the generated password when shouldSave is true`() =
runTest {
val fixedInstant = Instant.parse("2021-01-01T00:00:00Z")
mockkStatic(Instant::class)
every { Instant.now() } returns fixedInstant
val userId = "testUserId"
val request = PasswordGeneratorRequest(
lowercase = true,
@ -116,7 +109,7 @@ class GeneratorRepositoryTest {
val generatedPassword = "GeneratedPassword123!"
val encryptedPasswordHistory = PasswordHistory(
password = generatedPassword,
lastUsedDate = Instant.now(),
lastUsedDate = fixedClock.instant(),
)
coEvery { authDiskSource.userState?.activeUserId } returns userId
@ -147,11 +140,6 @@ class GeneratorRepositoryTest {
@Test
fun `generatePassword should emit Success result but not store the generated password when shouldSave is false`() =
runTest {
val fixedInstant = Instant.parse("2021-01-01T00:00:00Z")
mockkStatic(Instant::class)
every { Instant.now() } returns fixedInstant
val userId = "testUserId"
val request = PasswordGeneratorRequest(
lowercase = true,
@ -168,7 +156,7 @@ class GeneratorRepositoryTest {
val generatedPassword = "GeneratedPassword123!"
val encryptedPasswordHistory = PasswordHistory(
password = generatedPassword,
lastUsedDate = Instant.now(),
lastUsedDate = fixedClock.instant(),
)
coEvery { authDiskSource.userState?.activeUserId } returns userId
@ -219,10 +207,6 @@ class GeneratorRepositoryTest {
@Test
fun `generatePassphrase should emit Success result and store the generated passphrase`() =
runTest {
val fixedInstant = Instant.parse("2021-01-01T00:00:00Z")
mockkStatic(Instant::class)
every { Instant.now() } returns fixedInstant
val userId = "testUserId"
val request = PassphraseGeneratorRequest(
numWords = 5.toUByte(),
@ -233,7 +217,7 @@ class GeneratorRepositoryTest {
val generatedPassphrase = "Generated-Passphrase-123"
val encryptedPasswordHistory = PasswordHistory(
password = generatedPassphrase,
lastUsedDate = Instant.now(),
lastUsedDate = fixedClock.instant(),
)
coEvery { authDiskSource.userState?.activeUserId } returns userId