From d70e658c8b52495c303447192c1d2a4d0de0021c Mon Sep 17 00:00:00 2001 From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com> Date: Wed, 2 Apr 2025 16:07:41 -0400 Subject: [PATCH] [PM-19783] Migrate ConfigApi and ConfigResponseJson to `network` module (#4964) --- .../datasource/disk/model/ServerConfig.kt | 2 +- .../network/service/ConfigService.kt | 2 +- .../network/service/ConfigServiceImpl.kt | 4 +- .../auth/repository/AuthRepositoryTest.kt | 2 +- .../datasource/disk/ConfigDiskSourceTest.kt | 6 +- .../network/service/ConfigServiceTest.kt | 4 +- .../manager/FeatureFlagManagerTest.kt | 6 +- .../repository/DebugMenuRepositoryTest.kt | 2 +- .../repository/ServerConfigRepositoryTest.kt | 6 +- .../util/FakeServerConfigRepository.kt | 6 +- .../datasource/disk/model/ServerConfig.kt | 2 +- .../datasource/network/api/ConfigApi.kt | 14 ---- .../network/model/ConfigResponseJson.kt | 82 ------------------- .../network/service/ConfigService.kt | 2 +- .../network/service/ConfigServiceImpl.kt | 4 +- .../datasource/disk/ConfigDiskSourceTest.kt | 6 +- .../network/service/ConfigServiceTest.kt | 4 +- .../manager/FeatureFlagManagerTest.kt | 6 +- .../repository/DebugMenuRepositoryTest.kt | 2 +- .../repository/ServerConfigRepositoryTest.kt | 6 +- .../util/FakeServerConfigRepository.kt | 6 +- .../com/bitwarden}/network/api/ConfigApi.kt | 4 +- .../network/model/ConfigResponseJson.kt | 2 +- 23 files changed, 42 insertions(+), 138 deletions(-) delete mode 100644 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/api/ConfigApi.kt delete mode 100644 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/model/ConfigResponseJson.kt rename {app/src/main/java/com/x8bit/bitwarden/data/platform/datasource => network/src/main/kotlin/com/bitwarden}/network/api/ConfigApi.kt (64%) rename {app/src/main/java/com/x8bit/bitwarden/data/platform/datasource => network/src/main/kotlin/com/bitwarden}/network/model/ConfigResponseJson.kt (97%) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/model/ServerConfig.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/model/ServerConfig.kt index e1935686be..ee82b4bf09 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/model/ServerConfig.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/model/ServerConfig.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.datasource.disk.model -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson +import com.bitwarden.network.model.ConfigResponseJson import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigService.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigService.kt index 3d28dc1bae..84361b4337 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigService.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.datasource.network.service -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson +import com.bitwarden.network.model.ConfigResponseJson /** * Provides an API for querying config endpoints. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigServiceImpl.kt index f19cebeb2a..63a0d9890c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigServiceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigServiceImpl.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.platform.datasource.network.service +import com.bitwarden.network.api.ConfigApi +import com.bitwarden.network.model.ConfigResponseJson import com.bitwarden.network.util.toResult -import com.x8bit.bitwarden.data.platform.datasource.network.api.ConfigApi -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson class ConfigServiceImpl(private val configApi: ConfigApi) : ConfigService { override suspend fun getConfig(): Result = configApi.getConfig().toResult() diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt index 98c154b749..adba8b3bb7 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt @@ -15,6 +15,7 @@ import com.bitwarden.crypto.HashPurpose import com.bitwarden.crypto.Kdf import com.bitwarden.crypto.RsaKeyPair import com.bitwarden.crypto.TrustDeviceResponse +import com.bitwarden.network.model.ConfigResponseJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson @@ -108,7 +109,6 @@ import com.x8bit.bitwarden.data.auth.util.toSdkParams import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.model.ServerConfig import com.x8bit.bitwarden.data.platform.datasource.disk.util.FakeConfigDiskSource -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson import com.x8bit.bitwarden.data.platform.error.MissingPropertyException import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/ConfigDiskSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/ConfigDiskSourceTest.kt index 5767e1d867..f0ecab06f4 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/ConfigDiskSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/ConfigDiskSourceTest.kt @@ -3,11 +3,11 @@ package com.x8bit.bitwarden.data.platform.datasource.disk import androidx.core.content.edit import app.cash.turbine.test import com.bitwarden.core.di.CoreModule +import com.bitwarden.network.model.ConfigResponseJson +import com.bitwarden.network.model.ConfigResponseJson.EnvironmentJson +import com.bitwarden.network.model.ConfigResponseJson.ServerJson import com.x8bit.bitwarden.data.platform.base.FakeSharedPreferences import com.x8bit.bitwarden.data.platform.datasource.disk.model.ServerConfig -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson.EnvironmentJson -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson.ServerJson import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.JsonPrimitive import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigServiceTest.kt index aaf81a7f4c..10a7c1ca96 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigServiceTest.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.platform.datasource.network.service import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.network.api.ConfigApi +import com.bitwarden.network.model.ConfigResponseJson import com.x8bit.bitwarden.data.platform.base.BaseServiceTest -import com.x8bit.bitwarden.data.platform.datasource.network.api.ConfigApi -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.JsonPrimitive import okhttp3.mockwebserver.MockResponse 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 index 66040b9efb..e690e65208 100644 --- 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 @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.data.platform.manager import app.cash.turbine.test +import com.bitwarden.network.model.ConfigResponseJson +import com.bitwarden.network.model.ConfigResponseJson.EnvironmentJson +import com.bitwarden.network.model.ConfigResponseJson.ServerJson import com.x8bit.bitwarden.data.platform.datasource.disk.model.ServerConfig -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson.EnvironmentJson -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 diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/DebugMenuRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/DebugMenuRepositoryTest.kt index 3d23fee00e..3d4f5e1658 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/DebugMenuRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/DebugMenuRepositoryTest.kt @@ -1,13 +1,13 @@ package com.x8bit.bitwarden.data.platform.repository import app.cash.turbine.test +import com.bitwarden.network.model.ConfigResponseJson import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.platform.datasource.disk.FeatureFlagOverrideDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.model.ServerConfig -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import io.mockk.every import io.mockk.just diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryTest.kt index 8f44d1769d..fc8ca099e1 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/ServerConfigRepositoryTest.kt @@ -2,12 +2,12 @@ package com.x8bit.bitwarden.data.platform.repository import app.cash.turbine.test import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.network.model.ConfigResponseJson +import com.bitwarden.network.model.ConfigResponseJson.EnvironmentJson +import com.bitwarden.network.model.ConfigResponseJson.ServerJson import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.model.ServerConfig import com.x8bit.bitwarden.data.platform.datasource.disk.util.FakeConfigDiskSource -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson.EnvironmentJson -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson.ServerJson import com.x8bit.bitwarden.data.platform.datasource.network.service.ConfigService import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import io.mockk.coEvery diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/FakeServerConfigRepository.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/FakeServerConfigRepository.kt index a5d3239c8b..2ec7e172a1 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/FakeServerConfigRepository.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/FakeServerConfigRepository.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.platform.repository.util +import com.bitwarden.network.model.ConfigResponseJson +import com.bitwarden.network.model.ConfigResponseJson.EnvironmentJson +import com.bitwarden.network.model.ConfigResponseJson.ServerJson import com.x8bit.bitwarden.data.platform.datasource.disk.model.ServerConfig -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson.EnvironmentJson -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson.ServerJson import com.x8bit.bitwarden.data.platform.repository.ServerConfigRepository import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/model/ServerConfig.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/model/ServerConfig.kt index 7e6e2de1a7..5cc0b265d6 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/model/ServerConfig.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/model/ServerConfig.kt @@ -1,6 +1,6 @@ package com.bitwarden.authenticator.data.platform.datasource.disk.model -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson +import com.bitwarden.network.model.ConfigResponseJson import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/api/ConfigApi.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/api/ConfigApi.kt deleted file mode 100644 index 2a0bcec95b..0000000000 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/api/ConfigApi.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.bitwarden.authenticator.data.platform.datasource.network.api - -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson -import com.bitwarden.network.model.NetworkResult -import retrofit2.http.GET - -/** - * This interface defines the API service for fetching configuration data. - */ -interface ConfigApi { - - @GET("config") - suspend fun getConfig(): NetworkResult -} diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/model/ConfigResponseJson.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/model/ConfigResponseJson.kt deleted file mode 100644 index a5c493ef37..0000000000 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/model/ConfigResponseJson.kt +++ /dev/null @@ -1,82 +0,0 @@ -package com.bitwarden.authenticator.data.platform.datasource.network.model - -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable -import kotlinx.serialization.json.JsonPrimitive - -/** - * Represents the response model for configuration data fetched from the server. - * - * @property type The object type, typically "config". - * @property version The version of the configuration data. - * @property gitHash The Git hash associated with the configuration data. - * @property server The server information (nullable). - * @property environment The environment information containing URLs (vault, api, identity, etc.). - * @property featureStates A map containing various feature states. - */ -@Serializable -data class ConfigResponseJson( - @SerialName("object") - val type: String?, - - @SerialName("version") - val version: String?, - - @SerialName("gitHash") - val gitHash: String?, - - @SerialName("server") - val server: ServerJson?, - - @SerialName("environment") - val environment: EnvironmentJson?, - - @SerialName("featureStates") - val featureStates: Map?, -) { - /** - * Represents a server in the configuration response. - * - * @param name The name of the server. - * @param url The URL of the server. - */ - @Serializable - data class ServerJson( - @SerialName("name") - val name: String?, - - @SerialName("url") - val url: String?, - ) - - /** - * Represents the environment details in the configuration response. - * - * @param cloudRegion The cloud region associated with the environment. - * @param vaultUrl The URL of the vault service in the environment. - * @param apiUrl The URL of the API service in the environment. - * @param identityUrl The URL of the identity service in the environment. - * @param notificationsUrl The URL of the notifications service in the environment. - * @param ssoUrl The URL of the single sign-on (SSO) service in the environment. - */ - @Serializable - data class EnvironmentJson( - @SerialName("cloudRegion") - val cloudRegion: String?, - - @SerialName("vault") - val vaultUrl: String?, - - @SerialName("api") - val apiUrl: String?, - - @SerialName("identity") - val identityUrl: String?, - - @SerialName("notifications") - val notificationsUrl: String?, - - @SerialName("sso") - val ssoUrl: String?, - ) -} diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigService.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigService.kt index 4417910b71..f62322e851 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigService.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigService.kt @@ -1,6 +1,6 @@ package com.bitwarden.authenticator.data.platform.datasource.network.service -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson +import com.bitwarden.network.model.ConfigResponseJson /** * Provides an API for querying for app configurations. diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigServiceImpl.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigServiceImpl.kt index 3cfbddfa3f..9828ebf0e0 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigServiceImpl.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigServiceImpl.kt @@ -1,7 +1,7 @@ package com.bitwarden.authenticator.data.platform.datasource.network.service -import com.bitwarden.authenticator.data.platform.datasource.network.api.ConfigApi -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson +import com.bitwarden.network.api.ConfigApi +import com.bitwarden.network.model.ConfigResponseJson import com.bitwarden.network.util.toResult /** diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/disk/ConfigDiskSourceTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/disk/ConfigDiskSourceTest.kt index 80fc18a1c4..68efd2e364 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/disk/ConfigDiskSourceTest.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/disk/ConfigDiskSourceTest.kt @@ -4,10 +4,10 @@ import androidx.core.content.edit import app.cash.turbine.test import com.bitwarden.authenticator.data.platform.base.FakeSharedPreferences import com.bitwarden.authenticator.data.platform.datasource.disk.model.ServerConfig -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson.EnvironmentJson -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson.ServerJson import com.bitwarden.core.di.CoreModule +import com.bitwarden.network.model.ConfigResponseJson +import com.bitwarden.network.model.ConfigResponseJson.EnvironmentJson +import com.bitwarden.network.model.ConfigResponseJson.ServerJson import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.JsonPrimitive import org.junit.jupiter.api.Assertions.assertEquals diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigServiceTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigServiceTest.kt index 8859a29fc3..0f9ac99dc3 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigServiceTest.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigServiceTest.kt @@ -1,9 +1,9 @@ package com.bitwarden.authenticator.data.platform.datasource.network.service import com.bitwarden.authenticator.data.platform.base.BaseServiceTest -import com.bitwarden.authenticator.data.platform.datasource.network.api.ConfigApi -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.network.api.ConfigApi +import com.bitwarden.network.model.ConfigResponseJson import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.JsonPrimitive import okhttp3.mockwebserver.MockResponse diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/manager/FeatureFlagManagerTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/manager/FeatureFlagManagerTest.kt index 165542cc64..06ac977000 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/manager/FeatureFlagManagerTest.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/manager/FeatureFlagManagerTest.kt @@ -2,11 +2,11 @@ package com.bitwarden.authenticator.data.platform.manager import app.cash.turbine.test import com.bitwarden.authenticator.data.platform.datasource.disk.model.ServerConfig -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson.EnvironmentJson -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson.ServerJson import com.bitwarden.authenticator.data.platform.manager.model.FlagKey import com.bitwarden.authenticator.data.platform.repository.util.FakeServerConfigRepository +import com.bitwarden.network.model.ConfigResponseJson +import com.bitwarden.network.model.ConfigResponseJson.EnvironmentJson +import com.bitwarden.network.model.ConfigResponseJson.ServerJson import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.JsonPrimitive import org.junit.Test diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/DebugMenuRepositoryTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/DebugMenuRepositoryTest.kt index 019ec2e8f2..1474c6c6ee 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/DebugMenuRepositoryTest.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/DebugMenuRepositoryTest.kt @@ -3,8 +3,8 @@ package com.bitwarden.authenticator.data.platform.repository import app.cash.turbine.test import com.bitwarden.authenticator.data.platform.datasource.disk.FeatureFlagOverrideDiskSource import com.bitwarden.authenticator.data.platform.datasource.disk.model.ServerConfig -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson import com.bitwarden.authenticator.data.platform.manager.model.FlagKey +import com.bitwarden.network.model.ConfigResponseJson import io.mockk.every import io.mockk.just import io.mockk.mockk diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryTest.kt index cdc80f934d..aae132741f 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryTest.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/ServerConfigRepositoryTest.kt @@ -4,12 +4,12 @@ import app.cash.turbine.test import com.bitwarden.authenticator.data.platform.base.FakeDispatcherManager import com.bitwarden.authenticator.data.platform.datasource.disk.model.ServerConfig import com.bitwarden.authenticator.data.platform.datasource.disk.util.FakeConfigDiskSource -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson.EnvironmentJson -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson.ServerJson import com.bitwarden.authenticator.data.platform.datasource.network.service.ConfigService import com.bitwarden.authenticator.data.platform.manager.DispatcherManager import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.network.model.ConfigResponseJson +import com.bitwarden.network.model.ConfigResponseJson.EnvironmentJson +import com.bitwarden.network.model.ConfigResponseJson.ServerJson import io.mockk.coEvery import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/util/FakeServerConfigRepository.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/util/FakeServerConfigRepository.kt index 5a82244208..954f941246 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/util/FakeServerConfigRepository.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/util/FakeServerConfigRepository.kt @@ -1,10 +1,10 @@ package com.bitwarden.authenticator.data.platform.repository.util import com.bitwarden.authenticator.data.platform.datasource.disk.model.ServerConfig -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson.EnvironmentJson -import com.bitwarden.authenticator.data.platform.datasource.network.model.ConfigResponseJson.ServerJson import com.bitwarden.authenticator.data.platform.repository.ServerConfigRepository +import com.bitwarden.network.model.ConfigResponseJson +import com.bitwarden.network.model.ConfigResponseJson.EnvironmentJson +import com.bitwarden.network.model.ConfigResponseJson.ServerJson import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.serialization.json.JsonPrimitive diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/api/ConfigApi.kt b/network/src/main/kotlin/com/bitwarden/network/api/ConfigApi.kt similarity index 64% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/api/ConfigApi.kt rename to network/src/main/kotlin/com/bitwarden/network/api/ConfigApi.kt index 36c25effcf..c3703ae1f6 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/api/ConfigApi.kt +++ b/network/src/main/kotlin/com/bitwarden/network/api/ConfigApi.kt @@ -1,7 +1,7 @@ -package com.x8bit.bitwarden.data.platform.datasource.network.api +package com.bitwarden.network.api +import com.bitwarden.network.model.ConfigResponseJson import com.bitwarden.network.model.NetworkResult -import com.x8bit.bitwarden.data.platform.datasource.network.model.ConfigResponseJson import retrofit2.http.GET /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/model/ConfigResponseJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/ConfigResponseJson.kt similarity index 97% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/model/ConfigResponseJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/ConfigResponseJson.kt index c72f7f50e3..7bd6ccd210 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/model/ConfigResponseJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/ConfigResponseJson.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.platform.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable