tweaks and simple version tests

bitwarden · Oct 3, 2024 · 95dfe5e · 95dfe5e
1 parent 7ab88ee
commit 95dfe5e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/FeatureFlagManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/FeatureFlagManagerImpl.kt
@@ -8,6 +8,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
 private const val CIPHER_KEY_ENCRYPTION_KEY = "enableCipherKeyEncryption"
+private const val CIPHER_KEY_ENC_MIN_SERVER_VERSION = "2024.2.0"
 
 /**
  * Primary implementation of [FeatureFlagManager].
@@ -17,8 +18,13 @@ class FeatureFlagManagerImpl(
 ) : FeatureFlagManager {
 
     override val sdkFeatureFlags: Map<String, Boolean>
-        get() = mapOf(CIPHER_KEY_ENCRYPTION_KEY to
-            isServerVersionAtLeast(serverConfigRepository, "2024.2.0"))
+        get() = mapOf(
+            CIPHER_KEY_ENCRYPTION_KEY to
+                isServerVersionAtLeast(
+                    serverConfigRepository.getLocalServerConfig(),
+                    CIPHER_KEY_ENC_MIN_SERVER_VERSION,
+                ),
+        )
 
     override fun <T : Any> getFeatureFlagFlow(key: FlagKey<T>): Flow<T> =
         serverConfigRepository

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/ServerVersionUtils.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/ServerVersionUtils.kt
@@ -1,6 +1,6 @@
 package com.x8bit.bitwarden.data.platform.util
 
-import com.x8bit.bitwarden.data.platform.repository.ServerConfigRepository
+import com.x8bit.bitwarden.data.platform.datasource.disk.model.ServerConfig
 import kotlin.text.split
 import kotlin.text.toIntOrNull
 
@@ -10,9 +10,8 @@ private const val SUFFIX_SEPARATOR = "-"
 /**
  * Checks if the server version is greater than another provided version, returns true if it is.
  */
- fun isServerVersionAtLeast(serverConfig: ServerConfigRepository, version: String): Boolean {
+ fun isServerVersionAtLeast(serverConfig: ServerConfig?, version: String): Boolean {
     val serverVersion = serverConfig
-        .getLocalServerConfig()
         ?.serverData
         ?.version
 

diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FeatureFlagManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FeatureFlagManagerTest.kt
@@ -7,6 +7,7 @@ import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponse
 import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson.ServerJson
 import com.x8bit.bitwarden.data.platform.manager.model.FlagKey
 import com.x8bit.bitwarden.data.platform.repository.util.FakeServerConfigRepository
+import com.x8bit.bitwarden.data.platform.util.isServerVersionAtLeast
 import kotlinx.coroutines.test.runTest
 import kotlinx.serialization.json.JsonPrimitive
 import org.junit.Test
@@ -33,6 +34,30 @@ class FeatureFlagManagerTest {
         assertEquals(expected, actual)
     }
 
+    @Test
+    fun `server version is at least supplied version`() {
+        val result =
+            isServerVersionAtLeast(
+                fakeServerConfigRepository.getLocalServerConfig(),
+                "2024.2.0",
+            )
+
+        // This relies on the fake server version being "2024.7.0"
+        assertTrue(result)
+    }
+
+    @Test
+    fun `server version is not at least supplied version`() {
+        val result =
+            isServerVersionAtLeast(
+                fakeServerConfigRepository.getLocalServerConfig(),
+                "2024.12.0-suffix",
+            )
+
+        // This relies on the fake server version being "2024.7.0"
+        assertFalse(result)
+    }
+
     @Test
     fun `ServerConfigRepository flow with value should trigger new flags`() = runTest {
         fakeServerConfigRepository.serverConfigValue = null