From 3311086dfc83497f0e8e4fcf413ab91aa639c90e Mon Sep 17 00:00:00 2001 From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com> Date: Wed, 16 Apr 2025 12:37:29 -0400 Subject: [PATCH] [PM-20309] Migrate Environment and EnvironmentUrlDataJson to data module (#5063) --- .../data/platform/manager/LogsManagerImpl.kt | 2 +- .../auth/datasource/disk/model/AccountJson.kt | 1 + .../auth/repository/AuthRepositoryImpl.kt | 2 +- .../data/auth/repository/model/UserState.kt | 3 +- .../util/GetTokenResponseExtensions.kt | 2 +- .../util/UserStateJsonExtensions.kt | 2 +- .../datasource/disk/EnvironmentDiskSource.kt | 2 +- .../disk/EnvironmentDiskSourceImpl.kt | 2 +- .../interceptor/BaseUrlInterceptors.kt | 10 +- .../data/platform/manager/LogsManager.kt | 2 +- .../restriction/RestrictionManagerImpl.kt | 2 +- .../repository/EnvironmentRepository.kt | 2 +- .../repository/EnvironmentRepositoryImpl.kt | 6 +- .../EnterpriseSignOnViewModel.kt | 2 +- .../environment/EnvironmentViewModel.kt | 4 +- .../ui/auth/feature/landing/LandingScreen.kt | 2 +- .../auth/feature/landing/LandingViewModel.kt | 2 +- .../StartRegistrationScreen.kt | 2 +- .../StartRegistrationViewModel.kt | 8 +- .../handlers/StartRegistrationHandler.kt | 2 +- .../twofactorlogin/TwoFactorLoginViewModel.kt | 2 +- .../dropdown/EnvironmentSelector.kt | 2 +- .../feature/search/SearchViewModel.kt | 4 +- .../feature/settings/about/AboutViewModel.kt | 2 +- .../AccountSecurityViewModel.kt | 2 +- .../settings/vault/VaultSettingsViewModel.kt | 2 +- .../ui/platform/util/EnvironmentExtensions.kt | 2 +- .../ui/tools/feature/send/SendViewModel.kt | 2 +- .../feature/send/addsend/AddSendViewModel.kt | 2 +- .../vault/feature/item/VaultItemViewModel.kt | 8 +- .../itemlisting/VaultItemListingViewModel.kt | 4 +- .../ui/vault/feature/vault/VaultViewModel.kt | 2 +- .../VerificationCodeViewModel.kt | 2 +- .../data/platform/manager/LogsManagerImpl.kt | 2 +- .../com/x8bit/bitwarden/MainViewModelTest.kt | 2 +- .../datasource/disk/AuthDiskSourceTest.kt | 2 +- .../auth/manager/TrustedDeviceManagerTests.kt | 2 +- .../util/TrustDeviceResponseExtensionsTest.kt | 2 +- .../auth/repository/AuthRepositoryTest.kt | 4 +- .../util/GetTokenResponseExtensionsTest.kt | 2 +- .../util/UserStateJsonExtensionsTest.kt | 4 +- .../processor/Fido2ProviderProcessorTest.kt | 2 +- .../disk/EnvironmentDiskSourceTest.kt | 4 +- .../disk/FakeEnvironmentDiskSource.kt | 2 +- .../datasource/network/ssl/SslManagerTest.kt | 4 +- .../manager/FirstTimeActionManagerTest.kt | 2 +- .../network/NetworkConfigManagerTest.kt | 2 +- .../restriction/RestrictionManagerTest.kt | 4 +- .../repository/EnvironmentRepositoryTest.kt | 6 +- .../repository/SettingsRepositoryTest.kt | 2 +- .../util/FakeEnvironmentRepository.kt | 2 +- .../repository/GeneratorRepositoryTest.kt | 2 +- .../accountsetup/SetupUnlockViewModelTest.kt | 2 +- .../environment/EnvironmentViewModelTest.kt | 4 +- .../auth/feature/landing/LandingScreenTest.kt | 2 +- .../feature/landing/LandingViewModelTest.kt | 2 +- .../auth/feature/login/LoginViewModelTest.kt | 4 +- .../RemovePasswordViewModelTest.kt | 2 +- .../StartRegistrationScreenTest.kt | 2 +- .../StartRegistrationViewModelTest.kt | 2 +- .../TrustedDeviceViewModelTest.kt | 2 +- .../TwoFactorLoginViewModelTest.kt | 4 +- .../vaultunlock/VaultUnlockViewModelTest.kt | 4 +- .../feature/rootnav/RootNavViewModelTest.kt | 2 +- .../feature/search/SearchViewModelTest.kt | 2 +- .../settings/about/AboutViewModelTest.kt | 2 +- .../AccountSecurityViewModelTest.kt | 2 +- .../DeleteAccountViewModelTest.kt | 4 +- .../LoginApprovalViewModelTest.kt | 4 +- .../exportvault/ExportVaultViewModelTest.kt | 2 +- .../util/EnvironmentExtensionsTest.kt | 4 +- .../generator/GeneratorViewModelTest.kt | 2 +- .../tools/feature/send/SendViewModelTest.kt | 4 +- .../send/addsend/AddSendViewModelTest.kt | 2 +- .../addedit/VaultAddEditViewModelTest.kt | 2 +- .../addedit/util/CipherViewExtensionsTest.kt | 2 +- .../attachments/AttachmentsViewModelTest.kt | 2 +- .../importlogins/ImportLoginsViewModelTest.kt | 4 +- .../feature/item/VaultItemViewModelTest.kt | 4 +- .../itemlisting/VaultItemListingScreenTest.kt | 6 +- .../VaultItemListingViewModelTest.kt | 6 +- .../VaultItemListingDataExtensionsTest.kt | 6 +- .../VaultMoveToOrganizationViewModelTest.kt | 2 +- .../VaultMoveToOrganizationExtensionsTest.kt | 2 +- .../ui/vault/feature/vault/VaultScreenTest.kt | 6 +- .../vault/feature/vault/VaultViewModelTest.kt | 4 +- .../vault/util/UserStateExtensionsTest.kt | 4 +- .../vault/util/VaultDataExtensionsTest.kt | 6 +- .../VerificationCodeScreenTest.kt | 8 +- .../VerificationCodeViewModelTest.kt | 12 +- .../disk/model/EnvironmentUrlDataJson.kt | 54 ---- .../interceptor/BaseUrlInterceptors.kt | 4 +- .../platform/repository/model/Environment.kt | 68 ----- .../util/EnvironmentUrlDataJsonExtensions.kt | 122 -------- .../interceptor/BaseUrlInterceptorsTest.kt | 4 +- .../EnvironmentUrlsDataJsonExtensionsTest.kt | 278 ------------------ .../disk/model/EnvironmentUrlDataJson.kt | 2 +- .../data}/repository/model/Environment.kt | 6 +- .../util/EnvironmentUrlDataJsonExtensions.kt | 6 +- .../EnvironmentUrlsDataJsonExtensionsTest.kt | 6 +- 100 files changed, 156 insertions(+), 678 deletions(-) delete mode 100644 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/auth/datasource/disk/model/EnvironmentUrlDataJson.kt delete mode 100644 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/model/Environment.kt delete mode 100644 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/util/EnvironmentUrlDataJsonExtensions.kt delete mode 100644 authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/util/EnvironmentUrlsDataJsonExtensionsTest.kt rename {app/src/main/java/com/x8bit/bitwarden/data/auth => data/src/main/kotlin/com/bitwarden/data}/datasource/disk/model/EnvironmentUrlDataJson.kt (98%) rename {app/src/main/java/com/x8bit/bitwarden/data/platform => data/src/main/kotlin/com/bitwarden/data}/repository/model/Environment.kt (89%) rename {app/src/main/java/com/x8bit/bitwarden/data/platform => data/src/main/kotlin/com/bitwarden/data}/repository/util/EnvironmentUrlDataJsonExtensions.kt (96%) rename {app/src/test/java/com/x8bit/bitwarden/data/platform => data/src/test/kotlin/com/bitwarden/data}/repository/util/EnvironmentUrlsDataJsonExtensionsTest.kt (98%) diff --git a/app/src/fdroid/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt b/app/src/fdroid/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt index 387bd196f6..3d70dab189 100644 --- a/app/src/fdroid/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt +++ b/app/src/fdroid/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.platform.manager +import com.bitwarden.data.repository.model.Environment import com.x8bit.bitwarden.BuildConfig import com.x8bit.bitwarden.data.platform.datasource.disk.legacy.LegacyAppCenterMigrator import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import timber.log.Timber /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/AccountJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/AccountJson.kt index 1798cd4fec..17292c9a48 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/AccountJson.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/AccountJson.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.auth.datasource.disk.model +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import com.bitwarden.network.model.KdfTypeJson import com.bitwarden.network.model.UserDecryptionOptionsJson import kotlinx.serialization.Contextual diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt index 690555a330..a7a21bec97 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt @@ -10,6 +10,7 @@ import com.bitwarden.crypto.HashPurpose import com.bitwarden.crypto.Kdf import com.bitwarden.data.datasource.disk.ConfigDiskSource import com.bitwarden.data.manager.DispatcherManager +import com.bitwarden.data.repository.util.toEnvironmentUrls import com.bitwarden.network.model.DeleteAccountResponseJson import com.bitwarden.network.model.GetTokenResponseJson import com.bitwarden.network.model.IdentityTokenAuthModel @@ -118,7 +119,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.manager.util.getActivePolicies import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.util.toEnvironmentUrls import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.VaultUnlockData diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/UserState.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/UserState.kt index ab3f3c5ed8..0befd19112 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/UserState.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/UserState.kt @@ -1,9 +1,8 @@ package com.x8bit.bitwarden.data.auth.repository.model +import com.bitwarden.data.repository.model.Environment import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus -import com.x8bit.bitwarden.data.auth.repository.model.UserState.Account import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.data.platform.repository.model.Environment /** * Represents the overall "user state" of the current active user as well as any users that may be diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensions.kt index 0f25c50a56..afc7a8908b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensions.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.auth.repository.util +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import com.bitwarden.network.model.GetTokenResponseJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetReason import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt index d8a4e72191..330db3d13a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.auth.repository.util +import com.bitwarden.data.repository.util.toEnvironmentUrlsOrDefault import com.bitwarden.network.model.OrganizationType import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.UserDecryptionOptionsJson @@ -11,7 +12,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.UserOrganizations import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.auth.repository.model.VaultUnlockType import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.data.platform.repository.util.toEnvironmentUrlsOrDefault import com.x8bit.bitwarden.data.vault.repository.model.VaultUnlockData import com.x8bit.bitwarden.data.vault.repository.util.statusFor import com.x8bit.bitwarden.ui.platform.base.util.toHexColorRepresentation diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSource.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSource.kt index 47a15f3de8..85f0fb8dcf 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSource.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSource.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.datasource.disk -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import kotlinx.coroutines.flow.Flow /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt index 2b4b628391..7a5a531344 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt @@ -4,7 +4,7 @@ import android.content.SharedPreferences import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.util.decodeFromStringOrNull import com.bitwarden.data.datasource.disk.BaseDiskSource -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.onSubscription import kotlinx.serialization.json.Json diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/interceptor/BaseUrlInterceptors.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/interceptor/BaseUrlInterceptors.kt index 4d0f664143..8f111e5217 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/interceptor/BaseUrlInterceptors.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/interceptor/BaseUrlInterceptors.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.platform.datasource.network.interceptor import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.baseApiUrl +import com.bitwarden.data.repository.util.baseEventsUrl +import com.bitwarden.data.repository.util.baseIdentityUrl +import com.bitwarden.data.repository.util.toEnvironmentUrlsOrDefault import com.x8bit.bitwarden.data.platform.datasource.disk.EnvironmentDiskSource -import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.repository.util.baseApiUrl -import com.x8bit.bitwarden.data.platform.repository.util.baseEventsUrl -import com.x8bit.bitwarden.data.platform.repository.util.baseIdentityUrl -import com.x8bit.bitwarden.data.platform.repository.util.toEnvironmentUrlsOrDefault import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/LogsManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/LogsManager.kt index d191627c51..910261fd0d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/LogsManager.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/LogsManager.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.manager -import com.x8bit.bitwarden.data.platform.repository.model.Environment +import com.bitwarden.data.repository.model.Environment /** * Implementations of this interface provide a way to enable or disable the collection of crash diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerImpl.kt index a4056610ab..7f688c55f9 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerImpl.kt @@ -7,10 +7,10 @@ import android.content.IntentFilter import android.content.RestrictionsManager import android.os.Bundle import com.bitwarden.data.manager.DispatcherManager +import com.bitwarden.data.repository.model.Environment import com.x8bit.bitwarden.data.platform.manager.AppStateManager import com.x8bit.bitwarden.data.platform.manager.model.AppForegroundState import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepository.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepository.kt index cd4be42d52..98115d77b4 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepository.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepository.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.repository -import com.x8bit.bitwarden.data.platform.repository.model.Environment +import com.bitwarden.data.repository.model.Environment import kotlinx.coroutines.flow.StateFlow /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryImpl.kt index b753d86b25..ea394fc0cd 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryImpl.kt @@ -1,11 +1,11 @@ package com.x8bit.bitwarden.data.platform.repository import com.bitwarden.data.manager.DispatcherManager +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.toEnvironmentUrls +import com.bitwarden.data.repository.util.toEnvironmentUrlsOrDefault import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.EnvironmentDiskSource -import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.repository.util.toEnvironmentUrls -import com.x8bit.bitwarden.data.platform.repository.util.toEnvironmentUrlsOrDefault import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModel.kt index da063e57be..b6cb1e7566 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModel.kt @@ -4,6 +4,7 @@ import android.net.Uri import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.data.repository.util.baseIdentityUrl import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R @@ -21,7 +22,6 @@ import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.util.baseIdentityUrl import com.x8bit.bitwarden.data.tools.generator.repository.GeneratorRepository import com.x8bit.bitwarden.data.tools.generator.repository.utils.generateRandomString import com.x8bit.bitwarden.ui.platform.base.BaseViewModel diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModel.kt index 1322956b52..185e292194 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModel.kt @@ -4,17 +4,17 @@ import android.os.Parcelable import androidx.core.net.toUri import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.platform.datasource.disk.model.MutualTlsKeyHost import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.KeyManager import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.manager.model.ImportPrivateKeyResult import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.manager.FileManager import com.x8bit.bitwarden.ui.platform.base.BaseViewModel import com.x8bit.bitwarden.ui.platform.base.util.isValidUri diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt index acc6c39f08..5fce92df95 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt @@ -35,8 +35,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.bitwarden.data.repository.model.Environment import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin import com.x8bit.bitwarden.ui.platform.components.account.BitwardenAccountSwitcher diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt index a15c6caf58..f3f7403e65 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.auth.feature.landing import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R @@ -12,7 +13,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.ui.platform.base.BaseViewModel import com.x8bit.bitwarden.ui.platform.base.util.isValidEmail diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt index 460a7e8caa..ace328896d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt @@ -41,8 +41,8 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.bitwarden.data.repository.model.Environment import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationAction.ErrorDialogDismiss import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationEvent.NavigateToPrivacyPolicy import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationEvent.NavigateToTerms diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationViewModel.kt index 2b71764c2f..d518db2f5b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationViewModel.kt @@ -3,6 +3,10 @@ package com.x8bit.bitwarden.ui.auth.feature.startregistration import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.model.Environment.Type +import com.bitwarden.ui.util.Text +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.RegisterResult @@ -10,8 +14,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.SendVerificationEmailResul import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.repository.model.Environment.Type import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationAction.CloseClick import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationAction.ContinueClick import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationAction.EmailInputChange @@ -27,8 +29,6 @@ import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationAc import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationAction.TermsClick import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationAction.UnsubscribeMarketingEmailsClick import com.x8bit.bitwarden.ui.platform.base.BaseViewModel -import com.bitwarden.ui.util.Text -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.base.util.isValidEmail import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.launchIn diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/handlers/StartRegistrationHandler.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/handlers/StartRegistrationHandler.kt index d933a301e0..72edca5fd3 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/handlers/StartRegistrationHandler.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/handlers/StartRegistrationHandler.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden.ui.auth.feature.startregistration.handlers import androidx.compose.runtime.Composable import androidx.compose.runtime.remember -import com.x8bit.bitwarden.data.platform.repository.model.Environment +import com.bitwarden.data.repository.model.Environment import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationAction import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationViewModel diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt index 4c3244325f..f4b0ee85c1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt @@ -6,6 +6,7 @@ import androidx.annotation.DrawableRes import androidx.core.net.toUri import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.data.repository.util.baseWebVaultUrlOrDefault import com.bitwarden.network.model.TwoFactorAuthMethod import com.bitwarden.network.model.TwoFactorDataModel import com.bitwarden.network.util.availableAuthMethods @@ -25,7 +26,6 @@ import com.x8bit.bitwarden.data.auth.repository.util.generateUriForCaptcha import com.x8bit.bitwarden.data.auth.repository.util.generateUriForWebAuth import com.x8bit.bitwarden.data.auth.util.YubiKeyResult import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.util.baseWebVaultUrlOrDefault import com.x8bit.bitwarden.ui.auth.feature.twofactorlogin.util.button import com.x8bit.bitwarden.ui.auth.feature.twofactorlogin.util.imageRes import com.x8bit.bitwarden.ui.auth.feature.twofactorlogin.util.isContinueButtonEnabled diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/EnvironmentSelector.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/EnvironmentSelector.kt index 24e4db6f21..e650cf0ae8 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/EnvironmentSelector.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/EnvironmentSelector.kt @@ -20,8 +20,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import com.bitwarden.data.repository.model.Environment import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.ui.platform.components.button.BitwardenStandardIconButton import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenSelectionDialog import com.x8bit.bitwarden.ui.platform.components.dialog.row.BitwardenSelectionRow diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt index 83ab00b6e7..85c12f5b67 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt @@ -5,6 +5,8 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import com.bitwarden.core.annotation.OmitFromCoverage import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.repository.util.baseIconUrl +import com.bitwarden.data.repository.util.baseWebSendUrl import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -28,8 +30,6 @@ import com.x8bit.bitwarden.data.platform.manager.util.toAutofillSelectionDataOrN 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 -import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl -import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult import com.x8bit.bitwarden.data.vault.repository.model.GenerateTotpResult diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutViewModel.kt index 1931fdb438..7c18bef2b9 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutViewModel.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.about import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.data.repository.util.baseWebVaultUrlOrDefault import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.bitwarden.ui.util.concat @@ -14,7 +15,6 @@ import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardMan import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.util.baseWebVaultUrlOrDefault import com.x8bit.bitwarden.data.platform.util.ciBuildInfo import com.x8bit.bitwarden.data.platform.util.deviceData import com.x8bit.bitwarden.data.platform.util.isFdroid diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModel.kt index 8a005493ea..0fa2b187f0 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModel.kt @@ -4,6 +4,7 @@ import android.os.Build import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.data.repository.util.baseWebVaultUrlOrDefault import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -23,7 +24,6 @@ import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.platform.repository.model.BiometricsKeyResult import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeout import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction -import com.x8bit.bitwarden.data.platform.repository.util.baseWebVaultUrlOrDefault import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.ui.platform.base.BaseViewModel diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsViewModel.kt index 9b3f88e003..b6248a13ac 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsViewModel.kt @@ -1,11 +1,11 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.vault import androidx.lifecycle.viewModelScope +import com.bitwarden.data.repository.util.toBaseWebVaultImportUrl import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.FirstTimeActionManager import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.util.toBaseWebVaultImportUrl import com.x8bit.bitwarden.ui.platform.base.BaseViewModel import com.x8bit.bitwarden.ui.platform.base.util.BackgroundEvent import com.x8bit.bitwarden.ui.platform.components.snackbar.BitwardenSnackbarData diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/util/EnvironmentExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/util/EnvironmentExtensions.kt index c9ac6f12cc..433b9b7718 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/util/EnvironmentExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/util/EnvironmentExtensions.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.ui.platform.util +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.repository.model.Environment /** * Returns a human-readable display label for the given [Environment.Type]. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt index 8edefff23a..c5d3318b96 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt @@ -5,6 +5,7 @@ import androidx.annotation.DrawableRes import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.repository.util.baseWebSendUrl import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -14,7 +15,6 @@ import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardMan import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult import com.x8bit.bitwarden.data.vault.repository.model.RemovePasswordSendResult diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt index 25e97a539b..94789ecd74 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt @@ -6,6 +6,7 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.takeUntilLoaded +import com.bitwarden.data.repository.util.baseWebSendUrl import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.send.SendView import com.bitwarden.ui.util.Text @@ -21,7 +22,6 @@ import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardMan import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.manager.util.getActivePolicies import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.CreateSendResult import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt index 76f1aad9d0..66904a2142 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt @@ -7,6 +7,10 @@ import androidx.lifecycle.viewModelScope import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.combineDataStates import com.bitwarden.core.data.repository.util.mapNullable +import com.bitwarden.data.repository.util.baseIconUrl +import com.bitwarden.ui.util.Text +import com.bitwarden.ui.util.asText +import com.bitwarden.ui.util.concat import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.repository.AuthRepository @@ -18,16 +22,12 @@ import com.x8bit.bitwarden.data.platform.manager.event.OrganizationEventManager import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.vault.manager.FileManager import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.DeleteCipherResult import com.x8bit.bitwarden.data.vault.repository.model.DownloadAttachmentResult import com.x8bit.bitwarden.data.vault.repository.model.RestoreCipherResult import com.x8bit.bitwarden.ui.platform.base.BaseViewModel -import com.bitwarden.ui.util.Text -import com.bitwarden.ui.util.asText -import com.bitwarden.ui.util.concat import com.x8bit.bitwarden.ui.platform.components.model.IconData import com.x8bit.bitwarden.ui.platform.util.persistentListOfNotNull import com.x8bit.bitwarden.ui.vault.feature.item.model.TotpCodeItemData diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt index de1ed9224e..a52e3a0bbf 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt @@ -9,6 +9,8 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.map +import com.bitwarden.data.repository.util.baseIconUrl +import com.bitwarden.data.repository.util.baseWebSendUrl import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.Text @@ -50,8 +52,6 @@ import com.x8bit.bitwarden.data.platform.manager.util.toFido2GetCredentialsReque 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 -import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl -import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.DecryptFido2CredentialAutofillViewResult import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt index 45179f835a..16e38140db 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt @@ -4,6 +4,7 @@ import android.os.Parcelable import androidx.compose.ui.graphics.Color import androidx.lifecycle.viewModelScope import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.repository.util.baseIconUrl import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -26,7 +27,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.GenerateTotpResult import com.x8bit.bitwarden.data.vault.repository.model.VaultData diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt index 329dadee7c..d2e03ae9a5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.vault.feature.verificationcode import android.os.Parcelable import androidx.lifecycle.viewModelScope import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.repository.util.baseIconUrl import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.bitwarden.ui.util.concat @@ -12,7 +13,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.vault.manager.model.VerificationCodeItem import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.ui.platform.base.BaseViewModel diff --git a/app/src/standard/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt b/app/src/standard/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt index 7025f78fb1..ddd706f22d 100644 --- a/app/src/standard/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt +++ b/app/src/standard/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.platform.manager import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.data.repository.model.Environment import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase import com.x8bit.bitwarden.BuildConfig import com.x8bit.bitwarden.data.platform.datasource.disk.legacy.LegacyAppCenterMigrator import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import timber.log.Timber /** diff --git a/app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt index 9728d0bf5a..634b98b9c1 100644 --- a/app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt @@ -10,6 +10,7 @@ import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.asText import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus @@ -53,7 +54,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.PasswordlessRequestData import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.util.isAddTotpLoginItemFromAuthenticator import com.x8bit.bitwarden.data.vault.manager.model.VaultStateEvent import com.x8bit.bitwarden.data.vault.repository.VaultRepository diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt index 803b92ca9c..a8a377d4d2 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt @@ -5,6 +5,7 @@ import app.cash.turbine.test import com.bitwarden.authenticatorbridge.util.generateSecretKey import com.bitwarden.core.di.CoreModule import com.bitwarden.data.datasource.disk.base.FakeSharedPreferences +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import com.bitwarden.network.model.KdfTypeJson import com.bitwarden.network.model.KeyConnectorUserDecryptionOptionsJson import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson @@ -13,7 +14,6 @@ import com.bitwarden.network.model.createMockOrganization import com.bitwarden.network.model.createMockPolicy 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 import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetReason import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerTests.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerTests.kt index fbe0f193a7..aabdfd36ae 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerTests.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerTests.kt @@ -3,13 +3,13 @@ package com.x8bit.bitwarden.data.auth.manager import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess import com.bitwarden.crypto.TrustDeviceResponse +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import com.bitwarden.network.model.KdfTypeJson import com.bitwarden.network.model.TrustedDeviceKeysResponseJson import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.UserDecryptionOptionsJson import com.bitwarden.network.service.DevicesService import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource import com.x8bit.bitwarden.data.auth.manager.util.toUserStateJson diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/util/TrustDeviceResponseExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/util/TrustDeviceResponseExtensionsTest.kt index 01f6483c1d..c51eae6ef4 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/util/TrustDeviceResponseExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/manager/util/TrustDeviceResponseExtensionsTest.kt @@ -1,11 +1,11 @@ package com.x8bit.bitwarden.data.auth.manager.util import com.bitwarden.crypto.TrustDeviceResponse +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import com.bitwarden.network.model.KdfTypeJson import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.UserDecryptionOptionsJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test 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 84d390fef9..370c7a3d08 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 @@ -16,9 +16,11 @@ import com.bitwarden.crypto.Kdf import com.bitwarden.crypto.RsaKeyPair import com.bitwarden.crypto.TrustDeviceResponse import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import com.bitwarden.data.datasource.disk.model.ServerConfig import com.bitwarden.data.datasource.disk.util.FakeConfigDiskSource import com.bitwarden.data.manager.DispatcherManager +import com.bitwarden.data.repository.model.Environment import com.bitwarden.network.model.ConfigResponseJson import com.bitwarden.network.model.DeleteAccountResponseJson import com.bitwarden.network.model.GetTokenResponseJson @@ -59,7 +61,6 @@ import com.bitwarden.network.service.IdentityService import com.bitwarden.network.service.OrganizationService 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 import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetReason import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson @@ -124,7 +125,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.manager.model.NotificationLogoutData import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.repository.VaultRepository diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensionsTest.kt index e7d7ec8562..1e6f9fe8c2 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensionsTest.kt @@ -1,11 +1,11 @@ package com.x8bit.bitwarden.data.auth.repository.util +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import com.bitwarden.network.model.GetTokenResponseJson import com.bitwarden.network.model.KdfTypeJson import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.UserDecryptionOptionsJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetReason import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.auth.repository.model.JwtTokenDataJson diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt index ccb96c5bec..e2e6c4cb05 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt @@ -1,5 +1,7 @@ package com.x8bit.bitwarden.data.auth.repository.util +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.repository.model.Environment import com.bitwarden.network.model.KdfTypeJson import com.bitwarden.network.model.KeyConnectorUserDecryptionOptionsJson import com.bitwarden.network.model.OrganizationType @@ -7,7 +9,6 @@ import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.UserDecryptionOptionsJson 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 import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetReason import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson @@ -18,7 +19,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.UserOrganizations import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.auth.repository.model.VaultUnlockType import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.repository.model.VaultUnlockData import io.mockk.every import io.mockk.mockk diff --git a/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt index b6884cab99..9afe05aa8e 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/processor/Fido2ProviderProcessorTest.kt @@ -29,6 +29,7 @@ import com.bitwarden.core.data.util.asSuccess import com.bitwarden.core.di.CoreModule import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.data.manager.DispatcherManager +import com.bitwarden.data.repository.model.Environment import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus @@ -40,7 +41,6 @@ import com.x8bit.bitwarden.data.platform.manager.BiometricsEncryptionManager import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.FlagKey -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFido2CredentialAutofillView diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt index a970ea173c..9aab10046a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt @@ -3,8 +3,8 @@ package com.x8bit.bitwarden.data.platform.datasource.disk import androidx.core.content.edit import app.cash.turbine.test import com.bitwarden.data.datasource.disk.base.FakeSharedPreferences -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson -import com.x8bit.bitwarden.data.platform.repository.model.Environment +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.repository.model.Environment import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.Json import kotlinx.serialization.json.encodeToJsonElement diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/FakeEnvironmentDiskSource.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/FakeEnvironmentDiskSource.kt index e779f1cde9..f3eda792ea 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/FakeEnvironmentDiskSource.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/FakeEnvironmentDiskSource.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.platform.datasource.disk import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.onSubscription diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/ssl/SslManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/ssl/SslManagerTest.kt index 7c71943936..ac470c4172 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/ssl/SslManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/ssl/SslManagerTest.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.platform.datasource.network.ssl import android.net.Uri -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.repository.model.Environment import com.x8bit.bitwarden.data.platform.datasource.disk.model.MutualTlsCertificate import com.x8bit.bitwarden.data.platform.datasource.disk.model.MutualTlsKeyHost import com.x8bit.bitwarden.data.platform.manager.KeyManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import io.mockk.every import io.mockk.just import io.mockk.mockk diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt index e95a12d58b..aff8375c48 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt @@ -2,12 +2,12 @@ package com.x8bit.bitwarden.data.platform.manager import app.cash.turbine.test import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import com.bitwarden.network.model.KdfTypeJson import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.UserDecryptionOptionsJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource import com.x8bit.bitwarden.data.autofill.manager.AutofillEnabledManager diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/network/NetworkConfigManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/network/NetworkConfigManagerTest.kt index a8222261f8..0774d11e31 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/network/NetworkConfigManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/network/NetworkConfigManagerTest.kt @@ -3,11 +3,11 @@ package com.x8bit.bitwarden.data.platform.manager.network import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.data.repository.ServerConfigRepository +import com.bitwarden.data.repository.model.Environment import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.AuthState import com.x8bit.bitwarden.data.platform.datasource.network.authenticator.RefreshAuthenticator import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.util.advanceTimeByAndRunCurrent import io.mockk.coEvery import io.mockk.coVerify diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerTest.kt index ad739eb21b..2ab3cbd0f3 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/restriction/RestrictionManagerTest.kt @@ -5,10 +5,10 @@ import android.content.Context import android.content.RestrictionsManager import android.os.Bundle import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.repository.model.Environment import com.x8bit.bitwarden.data.platform.manager.model.AppForegroundState import com.x8bit.bitwarden.data.platform.manager.util.FakeAppStateManager -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository import io.mockk.clearMocks import io.mockk.every diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryTest.kt index 818d342769..f2ac8d5da9 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/EnvironmentRepositoryTest.kt @@ -2,14 +2,14 @@ package com.x8bit.bitwarden.data.platform.repository import app.cash.turbine.test import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import com.bitwarden.data.manager.DispatcherManager +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.toEnvironmentUrls import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.FakeEnvironmentDiskSource -import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.repository.util.toEnvironmentUrls import io.mockk.every import io.mockk.mockk import io.mockk.mockkStatic diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt index 338ff9d16b..7bbc24e88c 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt @@ -8,13 +8,13 @@ import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import com.bitwarden.network.model.KdfTypeJson import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.UserDecryptionOptionsJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource import com.x8bit.bitwarden.data.auth.repository.model.UserFingerprintResult diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/FakeEnvironmentRepository.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/FakeEnvironmentRepository.kt index 0b2bb069c3..e50dc40813 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/FakeEnvironmentRepository.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/FakeEnvironmentRepository.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.platform.repository.util +import com.bitwarden.data.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt index 756d10c6d1..91365846f7 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/tools/generator/repository/GeneratorRepositoryTest.kt @@ -4,6 +4,7 @@ import app.cash.turbine.test import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson import com.bitwarden.generators.AppendType import com.bitwarden.generators.ForwarderServiceType import com.bitwarden.generators.PassphraseGeneratorRequest @@ -18,7 +19,6 @@ import com.bitwarden.vault.PasswordHistoryView import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource 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 import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetReason import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.platform.manager.ReviewPromptManager diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockViewModelTest.kt index ef52f5b460..9c3ca026c7 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockViewModelTest.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.ui.auth.feature.accountsetup import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus @@ -12,7 +13,6 @@ import com.x8bit.bitwarden.data.platform.manager.FirstTimeActionManager import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.platform.repository.model.BiometricsKeyResult -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest import com.x8bit.bitwarden.ui.platform.components.toggle.UnlockWithPinState import io.mockk.coEvery diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModelTest.kt index b01dac8e7d..72cea37b68 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentViewModelTest.kt @@ -4,15 +4,15 @@ import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.util.asSuccess +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.platform.datasource.disk.model.MutualTlsKeyHost import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.KeyManager import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.manager.model.ImportPrivateKeyResult -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository import com.x8bit.bitwarden.data.vault.manager.FileManager import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt index 3f8de1ab4d..36282659a0 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt @@ -17,8 +17,8 @@ import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performTextInput import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.asText -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModelTest.kt index 035b55ca3e..547c3094a2 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModelTest.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.ui.auth.feature.landing import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus @@ -12,7 +13,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.VaultUnlockType import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.FlagKey -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModelTest.kt index 2e9b0be258..b3c090593e 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginViewModelTest.kt @@ -4,9 +4,10 @@ import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.KnownDeviceResult @@ -16,7 +17,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.auth.repository.util.CaptchaCallbackTokenResult import com.x8bit.bitwarden.data.auth.repository.util.generateUriForCaptcha import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordViewModelTest.kt index d892f12cc1..e6862209ea 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordViewModelTest.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.ui.auth.feature.removepassword import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.data.repository.model.Environment import com.bitwarden.network.model.OrganizationType import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R @@ -11,7 +12,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.Organization import com.x8bit.bitwarden.data.auth.repository.model.RemovePasswordResult import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest import io.mockk.coEvery import io.mockk.every diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreenTest.kt index a4342b48b7..ec4388c855 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreenTest.kt @@ -13,8 +13,8 @@ import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performTextInput import androidx.core.net.toUri import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.asText -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationAction.CloseClick import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationAction.EmailInputChange import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationViewModelTest.kt index a21f825cb9..88383b6402 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationViewModelTest.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.auth.feature.startregistration import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.repository.AuthRepository @@ -10,7 +11,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.SendVerificationEmailResul import com.x8bit.bitwarden.data.auth.repository.util.generateUriForCaptcha import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager import com.x8bit.bitwarden.data.platform.manager.model.FlagKey -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationAction.CloseClick import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationAction.ContinueClick diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/trusteddevice/TrustedDeviceViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/trusteddevice/TrustedDeviceViewModelTest.kt index 89f84b651d..146273b41e 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/trusteddevice/TrustedDeviceViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/trusteddevice/TrustedDeviceViewModelTest.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.ui.auth.feature.trusteddevice import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus @@ -12,7 +13,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.NewSsoUserResult import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest import io.mockk.coEvery diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt index d4e3fb5665..f9f202b995 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt @@ -5,6 +5,8 @@ import androidx.core.net.toUri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.baseWebVaultUrlOrDefault import com.bitwarden.network.model.GetTokenResponseJson import com.bitwarden.network.model.TwoFactorAuthMethod import com.bitwarden.network.model.TwoFactorDataModel @@ -21,8 +23,6 @@ import com.x8bit.bitwarden.data.auth.repository.util.generateUriForCaptcha import com.x8bit.bitwarden.data.auth.repository.util.generateUriForWebAuth import com.x8bit.bitwarden.data.auth.util.YubiKeyResult import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.repository.util.baseWebVaultUrlOrDefault import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest import com.x8bit.bitwarden.ui.platform.manager.resource.ResourceManager import io.mockk.coEvery diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModelTest.kt index d9eafd3e2f..6cbec12ef6 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModelTest.kt @@ -3,9 +3,10 @@ package com.x8bit.bitwarden.ui.auth.feature.vaultunlock import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.LogoutReason @@ -21,7 +22,6 @@ import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository import com.x8bit.bitwarden.data.vault.manager.VaultLockManager import com.x8bit.bitwarden.data.vault.repository.VaultRepository diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt index 73191aa2ad..72088d2e71 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.ui.platform.feature.rootnav import androidx.core.os.bundleOf import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.repository.model.Environment import com.bitwarden.network.model.OrganizationType import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.AuthRepository @@ -20,7 +21,6 @@ import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManagerImpl import com.x8bit.bitwarden.data.platform.manager.model.CompleteRegistrationData import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest import io.mockk.every import io.mockk.mockk diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt index 2dae6a9b57..e765fb12a9 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt @@ -6,6 +6,7 @@ import app.cash.turbine.test import app.cash.turbine.turbineScope import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.repository.model.Environment import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.ui.util.Text @@ -34,7 +35,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFolderView diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutViewModelTest.kt index bb4ffb89b5..1b5e314063 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutViewModelTest.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.about import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.data.repository.util.baseWebVaultUrlOrDefault import com.bitwarden.ui.util.asText import com.bitwarden.ui.util.concat import com.x8bit.bitwarden.data.platform.datasource.disk.model.FlightRecorderDataSet @@ -11,7 +12,6 @@ import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardMan import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.util.baseWebVaultUrlOrDefault import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest import com.x8bit.bitwarden.ui.platform.feature.settings.about.util.getStopsLoggingStringForActiveLog import io.mockk.coVerify diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModelTest.kt index 49b340b574..d2c94b3bfb 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModelTest.kt @@ -4,6 +4,7 @@ import android.os.Build import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.data.repository.model.Environment import com.bitwarden.network.model.OrganizationType import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.network.model.SyncResponseJson.Policy @@ -27,7 +28,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.FlagKey import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.platform.repository.model.BiometricsKeyResult -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeout import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccount/DeleteAccountViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccount/DeleteAccountViewModelTest.kt index 632cc11a2f..71452b3be8 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccount/DeleteAccountViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccount/DeleteAccountViewModelTest.kt @@ -2,6 +2,8 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.accountsecurity.deletea import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.AuthRepository @@ -9,9 +11,7 @@ import com.x8bit.bitwarden.data.auth.repository.model.DeleteAccountResult import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.auth.repository.model.ValidatePasswordResult import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest -import com.bitwarden.ui.util.asText import io.mockk.coEvery import io.mockk.coVerify import io.mockk.every diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalViewModelTest.kt index 6755525520..b5c22e38be 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalViewModelTest.kt @@ -3,6 +3,8 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.accountsecurity.loginap import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.manager.model.AuthRequest @@ -15,9 +17,7 @@ import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.PasswordlessRequestData import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest -import com.bitwarden.ui.util.asText import io.mockk.coEvery import io.mockk.coVerify import io.mockk.every diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModelTest.kt index 90e921614d..da94b22672 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModelTest.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.exportvault import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.data.repository.model.Environment import com.bitwarden.exporters.ExportFormat import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.network.model.createMockPolicy @@ -18,7 +19,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.ValidatePasswordResult import com.x8bit.bitwarden.data.auth.repository.model.VerifyOtpResult import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.manager.FileManager import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.ExportVaultDataResult diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/util/EnvironmentExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/util/EnvironmentExtensionsTest.kt index 249692e756..cb0c3b980c 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/util/EnvironmentExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/util/EnvironmentExtensionsTest.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.ui.platform.util -import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.repository.model.Environment +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.asText +import com.x8bit.bitwarden.R import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt index b3c9813e6b..4432780322 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import app.cash.turbine.turbineScope import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.data.repository.model.Environment import com.bitwarden.generators.PasswordGeneratorRequest import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.network.model.SyncResponseJson @@ -21,7 +22,6 @@ import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardMan import com.x8bit.bitwarden.data.platform.manager.model.CoachMarkTourType import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.FlagKey -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.tools.generator.repository.model.GeneratedCatchAllUsernameResult import com.x8bit.bitwarden.data.tools.generator.repository.model.GeneratedForwardedServiceUsernameResult import com.x8bit.bitwarden.data.tools.generator.repository.model.GeneratedPassphraseResult diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt index cf5e012f94..e8054ce962 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt @@ -3,6 +3,8 @@ package com.x8bit.bitwarden.ui.tools.feature.send import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.baseWebSendUrl import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -12,8 +14,6 @@ import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardMan import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult import com.x8bit.bitwarden.data.vault.repository.model.RemovePasswordSendResult diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt index 39b4b11385..6230ece7fd 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt @@ -4,6 +4,7 @@ import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.repository.model.Environment import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.createMockPolicy @@ -21,7 +22,6 @@ import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardMan import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.CreateSendResult diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt index 89c3c1c8be..7914a49061 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt @@ -11,6 +11,7 @@ import com.bitwarden.core.DateTime import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.repository.model.Environment import com.bitwarden.network.model.OrganizationType import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.network.model.SyncResponseJson @@ -49,7 +50,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.tools.generator.repository.GeneratorRepository import com.x8bit.bitwarden.data.tools.generator.repository.util.FakeGeneratorRepository import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createEditCollectionView diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt index 448d4348b9..750f3a0da8 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.ui.vault.feature.addedit.util +import com.bitwarden.data.repository.model.Environment import com.bitwarden.network.model.OrganizationType import com.bitwarden.ui.util.asText import com.bitwarden.vault.CardView @@ -21,7 +22,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.Organization import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.auth.repository.model.VaultUnlockType import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFolderView diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModelTest.kt index 00df890441..764527ed80 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsViewModelTest.kt @@ -4,6 +4,7 @@ import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.repository.model.Environment import com.bitwarden.ui.util.asText import com.bitwarden.ui.util.concat import com.bitwarden.vault.CipherView @@ -13,7 +14,6 @@ import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.error.NoActiveUserException import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.CreateAttachmentResult diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModelTest.kt index 15231e572a..159dc90444 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModelTest.kt @@ -3,14 +3,14 @@ package com.x8bit.bitwarden.ui.vault.feature.importlogins import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.platform.manager.FirstTimeActionManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.SyncVaultDataResult import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.components.snackbar.BitwardenSnackbarData import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelay import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelayManagerImpl diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt index 8658dce16f..3788aeddff 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt @@ -4,6 +4,8 @@ import android.net.Uri import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.baseIconUrl import com.bitwarden.network.model.OrganizationType import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -24,9 +26,7 @@ import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository -import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFolderView diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt index 078a3e84df..47e5056a66 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt @@ -16,13 +16,13 @@ import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTextInput import androidx.core.net.toUri import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.baseIconUrl +import com.bitwarden.data.repository.util.baseWebSendUrl import com.bitwarden.ui.util.asText import com.bitwarden.vault.CipherType import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData -import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl -import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.ui.autofill.fido2.manager.Fido2CompletionManager import com.x8bit.bitwarden.ui.autofill.fido2.manager.model.AssertFido2CredentialResult diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt index bc7d539706..88f0e46b07 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt @@ -12,6 +12,9 @@ import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.data.datasource.disk.base.FakeDispatcherManager +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.baseIconUrl +import com.bitwarden.data.repository.util.baseWebSendUrl import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -56,9 +59,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl -import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFolderView diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt index 194a643068..0db6c7796a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt @@ -3,6 +3,9 @@ package com.x8bit.bitwarden.ui.vault.feature.itemlisting.util import android.net.Uri import androidx.core.os.bundleOf import androidx.credentials.provider.ProviderCreateCredentialRequest +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.baseIconUrl +import com.bitwarden.data.repository.util.baseWebSendUrl import com.bitwarden.send.SendType import com.bitwarden.send.SendView import com.bitwarden.ui.util.asText @@ -13,9 +16,6 @@ import com.bitwarden.vault.FolderView import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.autofill.fido2.model.Fido2CreateCredentialRequest import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData -import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl -import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl import com.x8bit.bitwarden.data.platform.util.subtitle import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt index 38a71f7044..57262c1985 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.vault.feature.movetoorganization import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.repository.model.Environment import com.bitwarden.network.model.OrganizationType import com.bitwarden.ui.util.asText import com.bitwarden.ui.util.concat @@ -14,7 +15,6 @@ import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.Organization import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import com.x8bit.bitwarden.data.vault.repository.VaultRepository diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationExtensionsTest.kt index b8ee3258f7..a6e782ffed 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationExtensionsTest.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.ui.vault.feature.movetoorganization.util +import com.bitwarden.data.repository.model.Environment import com.bitwarden.network.model.OrganizationType import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R @@ -7,7 +8,6 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.model.Organization import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import com.x8bit.bitwarden.ui.vault.feature.movetoorganization.VaultMoveToOrganizationState diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt index 4bdb460a2d..f2d256c54a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt @@ -20,12 +20,12 @@ import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performScrollToNode import androidx.core.net.toUri import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.baseIconUrl +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.util.advanceTimeByAndRunCurrent import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.platform.components.snackbar.BitwardenSnackbarData import com.x8bit.bitwarden.ui.platform.manager.exit.ExitManager diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt index 784225301a..71e1fb3d8d 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt @@ -2,6 +2,8 @@ package com.x8bit.bitwarden.ui.vault.feature.vault import app.cash.turbine.test import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.baseIconUrl import com.bitwarden.network.model.OrganizationType import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.network.model.SyncResponseJson @@ -29,8 +31,6 @@ import com.x8bit.bitwarden.data.platform.manager.model.OrganizationEvent import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManager import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFolderView diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensionsTest.kt index e204b4103b..b1ffba559c 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensionsTest.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.ui.vault.feature.vault.util +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.repository.model.Environment import com.bitwarden.network.model.OrganizationType -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.repository.model.Organization import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.manager.model.FirstTimeState -import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterData import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt index 0fd6a57157..cf7f971629 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt @@ -1,21 +1,21 @@ package com.x8bit.bitwarden.ui.vault.feature.vault.util import android.net.Uri +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.baseIconUrl +import com.bitwarden.ui.util.asText import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherType import com.bitwarden.vault.FolderView import com.bitwarden.vault.LoginUriView import com.bitwarden.vault.UriMatchType import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFolderView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSshKeyView import com.x8bit.bitwarden.data.vault.repository.model.VaultData -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.components.model.IconData import com.x8bit.bitwarden.ui.vault.feature.itemlisting.model.ListingItemOverflowAction import com.x8bit.bitwarden.ui.vault.feature.util.toLabelIcons diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeScreenTest.kt index 0a6aa4eebc..03e1a6bfed 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeScreenTest.kt @@ -13,11 +13,11 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performScrollTo import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow -import com.x8bit.bitwarden.data.platform.manager.util.AppResumeStateManager -import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl -import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.baseIconUrl import com.bitwarden.ui.util.asText +import com.x8bit.bitwarden.data.platform.manager.util.AppResumeStateManager +import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.x8bit.bitwarden.ui.util.assertNoPopupExists import com.x8bit.bitwarden.ui.vault.feature.item.VaultItemArgs import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt index 09007b5a1c..4ab4802aeb 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt @@ -2,6 +2,12 @@ package com.x8bit.bitwarden.ui.vault.feature.verificationcode import android.net.Uri import app.cash.turbine.test +import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.baseIconUrl +import com.bitwarden.ui.util.Text +import com.bitwarden.ui.util.asText +import com.bitwarden.ui.util.concat import com.bitwarden.vault.CipherRepromptType import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.repository.AuthRepository @@ -9,16 +15,10 @@ import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository -import com.bitwarden.core.data.repository.model.DataState -import com.x8bit.bitwarden.data.platform.repository.model.Environment -import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.manager.model.VerificationCodeItem import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest -import com.bitwarden.ui.util.Text -import com.bitwarden.ui.util.asText -import com.bitwarden.ui.util.concat import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType import com.x8bit.bitwarden.ui.vault.feature.vault.util.toLoginIconData import com.x8bit.bitwarden.ui.vault.feature.verificationcode.util.createVerificationCodeItem diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/auth/datasource/disk/model/EnvironmentUrlDataJson.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/auth/datasource/disk/model/EnvironmentUrlDataJson.kt deleted file mode 100644 index 526b0a8dae..0000000000 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/auth/datasource/disk/model/EnvironmentUrlDataJson.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.bitwarden.authenticator.data.auth.datasource.disk.model - -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -/** - * Represents URLs for various Bitwarden domains. - * - * @property base The overall base URL. - * @property api Separate base URL for the "/api" domain (if applicable). - * @property identity Separate base URL for the "/identity" domain (if applicable). - * @property icon Separate base URL for the icon domain (if applicable). - * @property notifications Separate base URL for the notifications domain (if applicable). - * @property webVault Separate base URL for the web vault domain (if applicable). - * @property events Separate base URL for the events domain (if applicable). - */ -@Serializable -data class EnvironmentUrlDataJson( - @SerialName("base") - val base: String, - - @SerialName("api") - val api: String? = null, - - @SerialName("identity") - val identity: String? = null, - - @SerialName("icons") - val icon: String? = null, - - @SerialName("notifications") - val notifications: String? = null, - - @SerialName("webVault") - val webVault: String? = null, - - @SerialName("events") - val events: String? = null, -) { - @Suppress("UndocumentedPublicClass") - companion object { - /** - * Default [EnvironmentUrlDataJson] for the US region. - */ - val DEFAULT_US: EnvironmentUrlDataJson = - EnvironmentUrlDataJson(base = "https://vault.bitwarden.com") - - /** - * Default [EnvironmentUrlDataJson] for the EU region. - */ - val DEFAULT_EU: EnvironmentUrlDataJson = - EnvironmentUrlDataJson(base = "https://vault.bitwarden.eu") - } -} diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/interceptor/BaseUrlInterceptors.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/interceptor/BaseUrlInterceptors.kt index 30d0156cbe..ef00e02fe4 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/interceptor/BaseUrlInterceptors.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/interceptor/BaseUrlInterceptors.kt @@ -1,7 +1,7 @@ package com.bitwarden.authenticator.data.platform.datasource.network.interceptor -import com.bitwarden.authenticator.data.platform.repository.model.Environment -import com.bitwarden.authenticator.data.platform.repository.util.baseApiUrl +import com.bitwarden.data.repository.model.Environment +import com.bitwarden.data.repository.util.baseApiUrl import javax.inject.Inject import javax.inject.Singleton diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/model/Environment.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/model/Environment.kt deleted file mode 100644 index 9a2681da74..0000000000 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/model/Environment.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.bitwarden.authenticator.data.platform.repository.model - -import com.bitwarden.authenticator.data.auth.datasource.disk.model.EnvironmentUrlDataJson -import com.bitwarden.authenticator.data.platform.repository.util.labelOrBaseUrlHost - -/** - * A higher-level wrapper around [EnvironmentUrlDataJson] that provides type-safety, enumerability, - * and human-readable labels. - */ -sealed class Environment { - /** - * The [Type] of the environment. - */ - abstract val type: Type - - /** - * The raw [environmentUrlData] that contains specific base URLs for each relevant domain. - */ - abstract val environmentUrlData: EnvironmentUrlDataJson - - /** - * A human-readable label for the environment based in some way on its base URL. - */ - abstract val label: String - - /** - * The default US environment. - */ - data object Us : Environment() { - override val type: Type get() = Type.US - override val environmentUrlData: EnvironmentUrlDataJson - get() = EnvironmentUrlDataJson.DEFAULT_US - override val label: String - get() = "bitwarden.com" - } - - /** - * The default EU environment. - */ - data object Eu : Environment() { - override val type: Type get() = Type.EU - override val environmentUrlData: EnvironmentUrlDataJson - get() = EnvironmentUrlDataJson.DEFAULT_EU - override val label: String - get() = "bitwarden.eu" - } - - /** - * A custom self-hosted environment with a fully configurable [environmentUrlData]. - */ - data class SelfHosted( - override val environmentUrlData: EnvironmentUrlDataJson, - ) : Environment() { - override val type: Type get() = Type.SELF_HOSTED - override val label: String - get() = environmentUrlData.labelOrBaseUrlHost - } - - /** - * A summary of the various types that can be enumerated over and which contains a - * human-readable [label]. - */ - enum class Type { - US, - EU, - SELF_HOSTED, - } -} diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/util/EnvironmentUrlDataJsonExtensions.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/util/EnvironmentUrlDataJsonExtensions.kt deleted file mode 100644 index c183f36665..0000000000 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/util/EnvironmentUrlDataJsonExtensions.kt +++ /dev/null @@ -1,122 +0,0 @@ -package com.bitwarden.authenticator.data.platform.repository.util - -import com.bitwarden.authenticator.data.auth.datasource.disk.model.EnvironmentUrlDataJson -import com.bitwarden.authenticator.data.platform.repository.model.Environment -import java.net.URI - -private const val DEFAULT_API_URL: String = "https://api.bitwarden.com" -private const val DEFAULT_WEB_VAULT_URL: String = "https://vault.bitwarden.com" -private const val DEFAULT_WEB_SEND_URL: String = "https://send.bitwarden.com/#" -private const val DEFAULT_ICON_URL: String = "https://icons.bitwarden.net" - -/** - * Returns the base api URL or the default value if one is not present. - */ -val EnvironmentUrlDataJson.baseApiUrl: String - get() = this.base.sanitizeUrl?.let { "$it/api" } - ?: this.api.sanitizeUrl - ?: DEFAULT_API_URL - -/** - * Returns the base web vault URL. This will check for a custom [EnvironmentUrlDataJson.webVault] - * before falling back to the [EnvironmentUrlDataJson.base]. This can still return null if both are - * null or blank. - */ -val EnvironmentUrlDataJson.baseWebVaultUrlOrNull: String? - get() = this.webVault.sanitizeUrl - ?: this.base.sanitizeUrl - -/** - * Returns the base web vault URL or the default value if one is not present. - * - * See [baseWebVaultUrlOrNull] for more details. - */ -val EnvironmentUrlDataJson.baseWebVaultUrlOrDefault: String - get() = this.baseWebVaultUrlOrNull ?: DEFAULT_WEB_VAULT_URL - -/** - * Returns the base web send URL or the default value if one is not present. - */ -val EnvironmentUrlDataJson.baseWebSendUrl: String - get() = - this - .baseWebVaultUrlOrNull - ?.let { "$it/#/send/" } - ?: DEFAULT_WEB_SEND_URL - -/** - * Returns the base web vault import URL or the default value if one is not present. - */ -val EnvironmentUrlDataJson.toBaseWebVaultImportUrl: String - get() = - this - .baseWebVaultUrlOrDefault - .let { "$it/#/tools/import" } - -/** - * Returns a base icon url based on the environment or the default value if values are missing. - */ -val EnvironmentUrlDataJson.baseIconUrl: String - get() = this.icon.sanitizeUrl - ?: this.base.sanitizeUrl?.let { "$it/icons" } - ?: DEFAULT_ICON_URL - -/** - * Returns the appropriate pre-defined labels for environments matching the known US/EU values. - * Otherwise returns the host of the custom base URL. - * - * @see getSelfHostedUrlOrNull - */ -val EnvironmentUrlDataJson.labelOrBaseUrlHost: String - get() = when (this) { - EnvironmentUrlDataJson.DEFAULT_US -> Environment.Us.label - EnvironmentUrlDataJson.DEFAULT_EU -> Environment.Eu.label - else -> { - // Grab the domain - // Ex: - // - "https://www.abc.com/path-1/path-1" -> "www.abc.com" - URI - .create(getSelfHostedUrlOrNull().orEmpty()) - .host - .orEmpty() - } - } - -/** - * Returns the first self-hosted environment URL from - * [EnvironmentUrlDataJson.webVault], [EnvironmentUrlDataJson.base], - * [EnvironmentUrlDataJson.api], and finally [EnvironmentUrlDataJson.identity]. Returns `null` if - * all self-host environment URLs are null. - */ -private fun EnvironmentUrlDataJson.getSelfHostedUrlOrNull(): String? = - this.webVault.sanitizeUrl - ?: this.base.sanitizeUrl - ?: this.api.sanitizeUrl - ?: this.identity.sanitizeUrl - -/** - * A helper method to filter out blank urls and remove any trailing forward slashes. - */ -private val String?.sanitizeUrl: String? - get() = this?.trimEnd('/').takeIf { !it.isNullOrBlank() } - -/** - * Converts a raw [EnvironmentUrlDataJson] to an externally-consumable [Environment]. - */ -fun EnvironmentUrlDataJson.toEnvironmentUrls(): Environment = - when (this) { - EnvironmentUrlDataJson.DEFAULT_US, - -> Environment.Us - - EnvironmentUrlDataJson.DEFAULT_EU, - -> Environment.Eu - - else -> Environment.SelfHosted(environmentUrlData = this) - } - -/** - * Converts a nullable [EnvironmentUrlDataJson] to an [Environment], where `null` values default to - * the US environment. - */ -fun EnvironmentUrlDataJson?.toEnvironmentUrlsOrDefault(): Environment = - this?.toEnvironmentUrls() ?: Environment.Us diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/network/interceptor/BaseUrlInterceptorsTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/network/interceptor/BaseUrlInterceptorsTest.kt index f5e9487e81..220237a1a9 100644 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/network/interceptor/BaseUrlInterceptorsTest.kt +++ b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/network/interceptor/BaseUrlInterceptorsTest.kt @@ -1,7 +1,7 @@ package com.bitwarden.authenticator.data.platform.datasource.network.interceptor -import com.bitwarden.authenticator.data.auth.datasource.disk.model.EnvironmentUrlDataJson -import com.bitwarden.authenticator.data.platform.repository.model.Environment +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.repository.model.Environment import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/util/EnvironmentUrlsDataJsonExtensionsTest.kt b/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/util/EnvironmentUrlsDataJsonExtensionsTest.kt deleted file mode 100644 index 05f5a08d1f..0000000000 --- a/authenticator/src/test/java/com/bitwarden/authenticator/data/platform/repository/util/EnvironmentUrlsDataJsonExtensionsTest.kt +++ /dev/null @@ -1,278 +0,0 @@ -package com.bitwarden.authenticator.data.platform.repository.util - -import com.bitwarden.authenticator.data.auth.datasource.disk.model.EnvironmentUrlDataJson -import org.junit.jupiter.api.Assertions -import org.junit.jupiter.api.Test - -class EnvironmentUrlsDataJsonExtensionsTest { - @Test - fun `baseApiUrl should return base if it is present`() { - Assertions.assertEquals( - "base/api", - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA.baseApiUrl, - ) - } - - @Test - fun `baseApiUrl should return api value if base is empty`() { - Assertions.assertEquals( - "api", - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA.copy( - base = "", - ).baseApiUrl, - ) - } - - @Test - fun `baseApiUrl should return default url if base is empty and api is null`() { - Assertions.assertEquals( - "https://api.bitwarden.com", - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA.copy( - base = "", - api = null, - ).baseApiUrl, - ) - } - - @Test - fun `baseWebVaultUrlOrNull should return webVault when populated`() { - val result = - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA.baseWebVaultUrlOrNull - Assertions.assertEquals("webVault", result) - } - - @Test - fun `baseWebVaultUrlOrNull should return base when webvault is not populated`() { - val result = - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA - .copy(webVault = null) - .baseWebVaultUrlOrNull - Assertions.assertEquals("base", result) - } - - @Test - fun `baseWebVaultUrlOrNull should return null when webvault and base are not populated`() { - val result = - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA - .copy( - webVault = null, - base = "", - ) - .baseWebVaultUrlOrNull - Assertions.assertNull(result) - } - - @Test - fun `baseWebVaultUrlOrDefault should return webVault when populated`() { - val result = - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA.baseWebVaultUrlOrDefault - Assertions.assertEquals("webVault", result) - } - - @Test - fun `baseWebVaultUrlOrDefault should return base when webvault is not populated`() { - val result = - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA - .copy(webVault = null) - .baseWebVaultUrlOrDefault - Assertions.assertEquals("base", result) - } - - @Suppress("MaxLineLength") - @Test - fun `baseWebVaultUrlOrDefault should return the default when webvault and base are not populated`() { - val result = - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA - .copy( - webVault = null, - base = "", - ) - .baseWebVaultUrlOrDefault - Assertions.assertEquals("https://vault.bitwarden.com", result) - } - - @Test - fun `baseWebSendUrl should return the correct result when webVault when populated`() { - val result = - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA.baseWebSendUrl - Assertions.assertEquals("webVault/#/send/", result) - } - - @Test - fun `baseWebSendUrl should return the correct result when webvault is not populated`() { - val result = - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA - .copy(webVault = null) - .baseWebSendUrl - Assertions.assertEquals("base/#/send/", result) - } - - @Test - fun `baseWebSendUrl should return the default when webvault and base are not populated`() { - val result = - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA - .copy( - webVault = null, - base = "", - ) - .baseWebSendUrl - Assertions.assertEquals("https://send.bitwarden.com/#", result) - } - - @Test - fun `labelOrBaseUrlHost should correctly convert US environment to the correct label`() { - val environment = - EnvironmentUrlDataJson.Companion.DEFAULT_US - Assertions.assertEquals( - com.bitwarden.authenticator.data.platform.repository.model.Environment.Us.label, - environment.labelOrBaseUrlHost, - ) - } - - @Test - fun `labelOrBaseUrlHost should correctly convert EU environment to the correct label`() { - val environment = - EnvironmentUrlDataJson.Companion.DEFAULT_EU - Assertions.assertEquals( - com.bitwarden.authenticator.data.platform.repository.model.Environment.Eu.label, - environment.labelOrBaseUrlHost, - ) - } - - @Suppress("MaxLineLength") - @Test - fun `labelOrBaseUrlHost should correctly convert self hosted environment to the correct label`() { - val environment = - EnvironmentUrlDataJson(base = "https://vault.qa.bitwarden.pw") - Assertions.assertEquals( - "vault.qa.bitwarden.pw", - environment.labelOrBaseUrlHost, - ) - } - - @Test - fun `toEnvironmentUrls should correctly convert US urls to the expected type`() { - Assertions.assertEquals( - com.bitwarden.authenticator.data.platform.repository.model.Environment.Us, - EnvironmentUrlDataJson.Companion.DEFAULT_US.toEnvironmentUrls(), - ) - } - - @Test - fun `toEnvironmentUrls should correctly convert EU urls to the expected type`() { - Assertions.assertEquals( - com.bitwarden.authenticator.data.platform.repository.model.Environment.Eu, - EnvironmentUrlDataJson.Companion.DEFAULT_EU.toEnvironmentUrls(), - ) - } - - @Test - fun `toEnvironmentUrls should correctly convert custom urls to the expected type`() { - Assertions.assertEquals( - com.bitwarden.authenticator.data.platform.repository.model.Environment.SelfHosted( - environmentUrlData = DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA, - ), - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA.toEnvironmentUrls(), - ) - } - - @Test - fun `toEnvironmentUrlsOrDefault should correctly convert US urls to the expected type`() { - Assertions.assertEquals( - com.bitwarden.authenticator.data.platform.repository.model.Environment.Us, - EnvironmentUrlDataJson.Companion.DEFAULT_US.toEnvironmentUrlsOrDefault(), - ) - } - - @Test - fun `toEnvironmentUrlsOrDefault should correctly convert EU urls to the expected type`() { - Assertions.assertEquals( - com.bitwarden.authenticator.data.platform.repository.model.Environment.Eu, - EnvironmentUrlDataJson.Companion.DEFAULT_EU.toEnvironmentUrlsOrDefault(), - ) - } - - @Test - fun `toEnvironmentUrlsOrDefault should correctly convert custom urls to the expected type`() { - Assertions.assertEquals( - com.bitwarden.authenticator.data.platform.repository.model.Environment.SelfHosted( - environmentUrlData = DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA, - ), - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA.toEnvironmentUrlsOrDefault(), - ) - } - - @Test - fun `toEnvironmentUrlsOrDefault should convert null types to US values`() { - Assertions.assertEquals( - com.bitwarden.authenticator.data.platform.repository.model.Environment.Us, - (null as EnvironmentUrlDataJson?).toEnvironmentUrlsOrDefault(), - ) - } - - @Test - fun `toIconBaseurl should return icon if value is present`() { - Assertions.assertEquals( - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA.baseIconUrl, - "icon", - ) - } - - @Test - fun `toIconBaseurl should return base value if icon is null`() { - Assertions.assertEquals( - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA - .copy(icon = null) - .baseIconUrl, - "base/icons", - ) - } - - @Test - fun `toIconBaseurl should return default url if base is empty and icon is null`() { - val expectedUrl = "https://icons.bitwarden.net" - - Assertions.assertEquals( - expectedUrl, - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA - .copy( - base = "", - icon = null, - ) - .baseIconUrl, - ) - } - - @Test - fun `toBaseWebVaultImportUrl should return correct url if webVault is empty`() { - val expectedUrl = "base/#/tools/import" - - Assertions.assertEquals( - expectedUrl, - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA.copy( - webVault = null, - ) - .toBaseWebVaultImportUrl, - ) - } - - @Test - fun `toBaseWebVaultImportUrl should correctly convert to the import url`() { - val expectedUrl = "webVault/#/tools/import" - - Assertions.assertEquals( - expectedUrl, - DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA.toBaseWebVaultImportUrl, - ) - } -} - -private val DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA = EnvironmentUrlDataJson( - base = "base", - api = "api", - identity = "identity", - icon = "icon", - notifications = "notifications", - webVault = "webVault", - events = "events", -) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/EnvironmentUrlDataJson.kt b/data/src/main/kotlin/com/bitwarden/data/datasource/disk/model/EnvironmentUrlDataJson.kt similarity index 98% rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/EnvironmentUrlDataJson.kt rename to data/src/main/kotlin/com/bitwarden/data/datasource/disk/model/EnvironmentUrlDataJson.kt index b8f5426d5d..c313994935 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/EnvironmentUrlDataJson.kt +++ b/data/src/main/kotlin/com/bitwarden/data/datasource/disk/model/EnvironmentUrlDataJson.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.auth.datasource.disk.model +package com.bitwarden.data.datasource.disk.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/model/Environment.kt b/data/src/main/kotlin/com/bitwarden/data/repository/model/Environment.kt similarity index 89% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/repository/model/Environment.kt rename to data/src/main/kotlin/com/bitwarden/data/repository/model/Environment.kt index 35e7708b8c..ef7bbf435b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/model/Environment.kt +++ b/data/src/main/kotlin/com/bitwarden/data/repository/model/Environment.kt @@ -1,7 +1,7 @@ -package com.x8bit.bitwarden.data.platform.repository.model +package com.bitwarden.data.repository.model -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson -import com.x8bit.bitwarden.data.platform.repository.util.labelOrBaseUrlHost +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.repository.util.labelOrBaseUrlHost /** * A higher-level wrapper around [EnvironmentUrlDataJson] that provides type-safety, enumerability, diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/util/EnvironmentUrlDataJsonExtensions.kt b/data/src/main/kotlin/com/bitwarden/data/repository/util/EnvironmentUrlDataJsonExtensions.kt similarity index 96% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/repository/util/EnvironmentUrlDataJsonExtensions.kt rename to data/src/main/kotlin/com/bitwarden/data/repository/util/EnvironmentUrlDataJsonExtensions.kt index 70cbc661cc..ac5f163c42 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/util/EnvironmentUrlDataJsonExtensions.kt +++ b/data/src/main/kotlin/com/bitwarden/data/repository/util/EnvironmentUrlDataJsonExtensions.kt @@ -1,7 +1,7 @@ -package com.x8bit.bitwarden.data.platform.repository.util +package com.bitwarden.data.repository.util -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson -import com.x8bit.bitwarden.data.platform.repository.model.Environment +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.repository.model.Environment import java.net.URI private const val DEFAULT_API_URL: String = "https://api.bitwarden.com" diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/EnvironmentUrlsDataJsonExtensionsTest.kt b/data/src/test/kotlin/com/bitwarden/data/repository/util/EnvironmentUrlsDataJsonExtensionsTest.kt similarity index 98% rename from app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/EnvironmentUrlsDataJsonExtensionsTest.kt rename to data/src/test/kotlin/com/bitwarden/data/repository/util/EnvironmentUrlsDataJsonExtensionsTest.kt index e04ad9e2ec..0adac1fae5 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/EnvironmentUrlsDataJsonExtensionsTest.kt +++ b/data/src/test/kotlin/com/bitwarden/data/repository/util/EnvironmentUrlsDataJsonExtensionsTest.kt @@ -1,7 +1,7 @@ -package com.x8bit.bitwarden.data.platform.repository.util +package com.bitwarden.data.repository.util -import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson -import com.x8bit.bitwarden.data.platform.repository.model.Environment +import com.bitwarden.data.datasource.disk.model.EnvironmentUrlDataJson +import com.bitwarden.data.repository.model.Environment import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNull import org.junit.jupiter.api.Test