From 899689ba7b79ca502a6d1677828bcf445895a864 Mon Sep 17 00:00:00 2001 From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com> Date: Tue, 15 Apr 2025 12:35:47 -0400 Subject: [PATCH] [PM-20189] Migrate IdentityService and related components to `network` module (#5047) --- .../auth/datasource/network/di/AuthNetworkModule.kt | 4 ++-- .../bitwarden/data/auth/repository/AuthRepository.kt | 2 +- .../data/auth/repository/AuthRepositoryImpl.kt | 10 +++++----- .../data/auth/repository/di/AuthRepositoryModule.kt | 2 +- .../twofactorlogin/TwoFactorLoginViewModel.kt | 2 +- .../data/auth/repository/AuthRepositoryTest.kt | 10 +++++----- .../twofactorlogin/TwoFactorLoginViewModelTest.kt | 2 +- .../network/model/IdentityTokenAuthModel.kt | 2 +- .../model/SendVerificationEmailResponseJson.kt | 2 +- .../bitwarden}/network/model/TwoFactorDataModel.kt | 2 +- .../network/model/VerifyEmailTokenResponseJson.kt | 2 +- .../bitwarden}/network/service/IdentityService.kt | 10 +++++----- .../network/service/IdentityServiceImpl.kt | 12 ++++++------ .../bitwarden/network}/util/DeviceModelProvider.kt | 2 +- .../network/service/IdentityServiceTest.kt | 10 +++++----- 15 files changed, 37 insertions(+), 37 deletions(-) rename {app/src/main/java/com/x8bit/bitwarden/data/auth/datasource => network/src/main/kotlin/com/bitwarden}/network/model/IdentityTokenAuthModel.kt (97%) rename {app/src/main/java/com/x8bit/bitwarden/data/auth/datasource => network/src/main/kotlin/com/bitwarden}/network/model/SendVerificationEmailResponseJson.kt (95%) rename {app/src/main/java/com/x8bit/bitwarden/data/auth/datasource => network/src/main/kotlin/com/bitwarden}/network/model/TwoFactorDataModel.kt (84%) rename {app/src/main/java/com/x8bit/bitwarden/data/auth/datasource => network/src/main/kotlin/com/bitwarden}/network/model/VerifyEmailTokenResponseJson.kt (94%) rename {app/src/main/java/com/x8bit/bitwarden/data/auth/datasource => network/src/main/kotlin/com/bitwarden}/network/service/IdentityService.kt (87%) rename {app/src/main/java/com/x8bit/bitwarden/data/auth/datasource => network/src/main/kotlin/com/bitwarden}/network/service/IdentityServiceImpl.kt (94%) rename {app/src/main/java/com/x8bit/bitwarden/data/platform => network/src/main/kotlin/com/bitwarden/network}/util/DeviceModelProvider.kt (86%) rename {app/src/test/java/com/x8bit/bitwarden/data/auth/datasource => network/src/test/kotlin/com/bitwarden}/network/service/IdentityServiceTest.kt (98%) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/di/AuthNetworkModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/di/AuthNetworkModule.kt index ddba0b2755..d57fb7fefc 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/di/AuthNetworkModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/di/AuthNetworkModule.kt @@ -8,8 +8,8 @@ import com.bitwarden.network.service.DevicesService import com.bitwarden.network.service.DevicesServiceImpl import com.bitwarden.network.service.HaveIBeenPwnedService import com.bitwarden.network.service.HaveIBeenPwnedServiceImpl -import com.x8bit.bitwarden.data.auth.datasource.network.service.IdentityService -import com.x8bit.bitwarden.data.auth.datasource.network.service.IdentityServiceImpl +import com.bitwarden.network.service.IdentityService +import com.bitwarden.network.service.IdentityServiceImpl import com.x8bit.bitwarden.data.auth.datasource.network.service.NewAuthRequestService import com.x8bit.bitwarden.data.auth.datasource.network.service.NewAuthRequestServiceImpl import com.x8bit.bitwarden.data.auth.datasource.network.service.OrganizationService diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt index c1faf21f6c..e950d6cf8b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt @@ -2,9 +2,9 @@ package com.x8bit.bitwarden.data.auth.repository import com.bitwarden.network.model.GetTokenResponseJson import com.bitwarden.network.model.SyncResponseJson +import com.bitwarden.network.model.TwoFactorDataModel 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.network.model.TwoFactorDataModel import com.x8bit.bitwarden.data.auth.manager.AuthRequestManager import com.x8bit.bitwarden.data.auth.repository.model.AuthState import com.x8bit.bitwarden.data.auth.repository.model.BreachCountResult 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 d26e4cb5b3..33723fa6c9 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 @@ -12,6 +12,7 @@ import com.bitwarden.data.datasource.disk.ConfigDiskSource import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.model.DeleteAccountResponseJson import com.bitwarden.network.model.GetTokenResponseJson +import com.bitwarden.network.model.IdentityTokenAuthModel import com.bitwarden.network.model.OrganizationType import com.bitwarden.network.model.PasswordHintResponseJson import com.bitwarden.network.model.PolicyTypeJson @@ -24,14 +25,18 @@ import com.bitwarden.network.model.ResendEmailRequestJson import com.bitwarden.network.model.ResendNewDeviceOtpRequestJson import com.bitwarden.network.model.ResetPasswordRequestJson import com.bitwarden.network.model.SendVerificationEmailRequestJson +import com.bitwarden.network.model.SendVerificationEmailResponseJson import com.bitwarden.network.model.SetPasswordRequestJson import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.TwoFactorAuthMethod +import com.bitwarden.network.model.TwoFactorDataModel import com.bitwarden.network.model.VerifyEmailTokenRequestJson +import com.bitwarden.network.model.VerifyEmailTokenResponseJson import com.bitwarden.network.service.AccountsService import com.bitwarden.network.service.DevicesService import com.bitwarden.network.service.HaveIBeenPwnedService +import com.bitwarden.network.service.IdentityService import com.bitwarden.network.util.isSslHandShakeError import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson @@ -40,11 +45,6 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetRea import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson import com.x8bit.bitwarden.data.auth.datasource.network.model.DeviceDataModel -import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel -import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson -import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel -import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenResponseJson -import com.x8bit.bitwarden.data.auth.datasource.network.service.IdentityService import com.x8bit.bitwarden.data.auth.datasource.network.service.OrganizationService import com.x8bit.bitwarden.data.auth.datasource.sdk.AuthSdkSource import com.x8bit.bitwarden.data.auth.datasource.sdk.util.toInt diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/AuthRepositoryModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/AuthRepositoryModule.kt index 13e3d1215b..2f027e660c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/AuthRepositoryModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/AuthRepositoryModule.kt @@ -5,8 +5,8 @@ import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.service.AccountsService import com.bitwarden.network.service.DevicesService import com.bitwarden.network.service.HaveIBeenPwnedService +import com.bitwarden.network.service.IdentityService import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource -import com.x8bit.bitwarden.data.auth.datasource.network.service.IdentityService import com.x8bit.bitwarden.data.auth.datasource.network.service.OrganizationService import com.x8bit.bitwarden.data.auth.datasource.sdk.AuthSdkSource import com.x8bit.bitwarden.data.auth.manager.AuthRequestManager 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 c88933f276..4c3244325f 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 @@ -7,6 +7,7 @@ import androidx.core.net.toUri import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import com.bitwarden.network.model.TwoFactorAuthMethod +import com.bitwarden.network.model.TwoFactorDataModel import com.bitwarden.network.util.availableAuthMethods import com.bitwarden.network.util.preferredAuthMethod import com.bitwarden.network.util.twoFactorDisplayEmail @@ -14,7 +15,6 @@ import com.bitwarden.network.util.twoFactorDuoAuthUrl import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.LoginResult import com.x8bit.bitwarden.data.auth.repository.model.ResendEmailResult 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 9c1dc42260..073a3d531e 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 @@ -22,6 +22,7 @@ import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.model.ConfigResponseJson import com.bitwarden.network.model.DeleteAccountResponseJson import com.bitwarden.network.model.GetTokenResponseJson +import com.bitwarden.network.model.IdentityTokenAuthModel import com.bitwarden.network.model.KdfTypeJson import com.bitwarden.network.model.KeyConnectorMasterKeyResponseJson import com.bitwarden.network.model.OrganizationAutoEnrollStatusResponseJson @@ -39,18 +40,22 @@ import com.bitwarden.network.model.RegisterResponseJson import com.bitwarden.network.model.ResendEmailRequestJson import com.bitwarden.network.model.ResetPasswordRequestJson import com.bitwarden.network.model.SendVerificationEmailRequestJson +import com.bitwarden.network.model.SendVerificationEmailResponseJson import com.bitwarden.network.model.SetPasswordRequestJson import com.bitwarden.network.model.SyncResponseJson import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.TwoFactorAuthMethod +import com.bitwarden.network.model.TwoFactorDataModel import com.bitwarden.network.model.UserDecryptionOptionsJson import com.bitwarden.network.model.VerifiedOrganizationDomainSsoDetailsResponse import com.bitwarden.network.model.VerifyEmailTokenRequestJson +import com.bitwarden.network.model.VerifyEmailTokenResponseJson import com.bitwarden.network.model.createMockOrganization import com.bitwarden.network.model.createMockPolicy import com.bitwarden.network.service.AccountsService import com.bitwarden.network.service.DevicesService import com.bitwarden.network.service.HaveIBeenPwnedService +import com.bitwarden.network.service.IdentityService 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 @@ -59,11 +64,6 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson 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.datasource.network.model.IdentityTokenAuthModel -import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson -import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel -import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenResponseJson -import com.x8bit.bitwarden.data.auth.datasource.network.service.IdentityService import com.x8bit.bitwarden.data.auth.datasource.network.service.OrganizationService import com.x8bit.bitwarden.data.auth.datasource.sdk.AuthSdkSource import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength.LEVEL_0 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 25a51c3086..d4e3fb5665 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 @@ -7,10 +7,10 @@ import app.cash.turbine.test import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.network.model.GetTokenResponseJson import com.bitwarden.network.model.TwoFactorAuthMethod +import com.bitwarden.network.model.TwoFactorDataModel import com.bitwarden.network.util.base64UrlDecodeOrNull import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.LoginResult import com.x8bit.bitwarden.data.auth.repository.model.ResendEmailResult diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/IdentityTokenAuthModel.kt b/network/src/main/kotlin/com/bitwarden/network/model/IdentityTokenAuthModel.kt similarity index 97% rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/IdentityTokenAuthModel.kt rename to network/src/main/kotlin/com/bitwarden/network/model/IdentityTokenAuthModel.kt index 07d20ea26d..10bcb89ed5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/IdentityTokenAuthModel.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/IdentityTokenAuthModel.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.auth.datasource.network.model +package com.bitwarden.network.model /** * Hold the authentication information for different login methods. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/SendVerificationEmailResponseJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/SendVerificationEmailResponseJson.kt similarity index 95% rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/SendVerificationEmailResponseJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/SendVerificationEmailResponseJson.kt index ddf460ddc6..b4eba7d89c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/SendVerificationEmailResponseJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/SendVerificationEmailResponseJson.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.auth.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.SerialName diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TwoFactorDataModel.kt b/network/src/main/kotlin/com/bitwarden/network/model/TwoFactorDataModel.kt similarity index 84% rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TwoFactorDataModel.kt rename to network/src/main/kotlin/com/bitwarden/network/model/TwoFactorDataModel.kt index 3ad69ed9fa..e60a6a9d18 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TwoFactorDataModel.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/TwoFactorDataModel.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.auth.datasource.network.model +package com.bitwarden.network.model /** * Hold the information necessary to add two-factor authorization diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/VerifyEmailTokenResponseJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/VerifyEmailTokenResponseJson.kt similarity index 94% rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/VerifyEmailTokenResponseJson.kt rename to network/src/main/kotlin/com/bitwarden/network/model/VerifyEmailTokenResponseJson.kt index a43bafeea8..ff7ce5bbf5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/VerifyEmailTokenResponseJson.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/VerifyEmailTokenResponseJson.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.auth.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityService.kt b/network/src/main/kotlin/com/bitwarden/network/service/IdentityService.kt similarity index 87% rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityService.kt rename to network/src/main/kotlin/com/bitwarden/network/service/IdentityService.kt index 3e4f4f0c98..5ad04426a3 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityService.kt +++ b/network/src/main/kotlin/com/bitwarden/network/service/IdentityService.kt @@ -1,6 +1,7 @@ -package com.x8bit.bitwarden.data.auth.datasource.network.service +package com.bitwarden.network.service import com.bitwarden.network.model.GetTokenResponseJson +import com.bitwarden.network.model.IdentityTokenAuthModel import com.bitwarden.network.model.PreLoginResponseJson import com.bitwarden.network.model.PrevalidateSsoResponseJson import com.bitwarden.network.model.RefreshTokenResponseJson @@ -8,11 +9,10 @@ import com.bitwarden.network.model.RegisterFinishRequestJson import com.bitwarden.network.model.RegisterRequestJson import com.bitwarden.network.model.RegisterResponseJson import com.bitwarden.network.model.SendVerificationEmailRequestJson +import com.bitwarden.network.model.SendVerificationEmailResponseJson +import com.bitwarden.network.model.TwoFactorDataModel import com.bitwarden.network.model.VerifyEmailTokenRequestJson -import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel -import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson -import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel -import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenResponseJson +import com.bitwarden.network.model.VerifyEmailTokenResponseJson /** * Provides an API for querying identity endpoints. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt b/network/src/main/kotlin/com/bitwarden/network/service/IdentityServiceImpl.kt similarity index 94% rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt rename to network/src/main/kotlin/com/bitwarden/network/service/IdentityServiceImpl.kt index 365c9c823b..55b0a523bb 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt +++ b/network/src/main/kotlin/com/bitwarden/network/service/IdentityServiceImpl.kt @@ -1,7 +1,8 @@ -package com.x8bit.bitwarden.data.auth.datasource.network.service +package com.bitwarden.network.service import com.bitwarden.network.api.UnauthenticatedIdentityApi import com.bitwarden.network.model.GetTokenResponseJson +import com.bitwarden.network.model.IdentityTokenAuthModel import com.bitwarden.network.model.PreLoginRequestJson import com.bitwarden.network.model.PreLoginResponseJson import com.bitwarden.network.model.PrevalidateSsoResponseJson @@ -10,18 +11,17 @@ import com.bitwarden.network.model.RegisterFinishRequestJson import com.bitwarden.network.model.RegisterRequestJson import com.bitwarden.network.model.RegisterResponseJson import com.bitwarden.network.model.SendVerificationEmailRequestJson +import com.bitwarden.network.model.SendVerificationEmailResponseJson +import com.bitwarden.network.model.TwoFactorDataModel import com.bitwarden.network.model.VerifyEmailTokenRequestJson +import com.bitwarden.network.model.VerifyEmailTokenResponseJson import com.bitwarden.network.model.toBitwardenError +import com.bitwarden.network.util.DeviceModelProvider import com.bitwarden.network.util.NetworkErrorCode import com.bitwarden.network.util.base64UrlEncode import com.bitwarden.network.util.executeForNetworkResult import com.bitwarden.network.util.parseErrorBodyOrNull import com.bitwarden.network.util.toResult -import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel -import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson -import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel -import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenResponseJson -import com.x8bit.bitwarden.data.platform.util.DeviceModelProvider import kotlinx.serialization.json.Json class IdentityServiceImpl( diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/DeviceModelProvider.kt b/network/src/main/kotlin/com/bitwarden/network/util/DeviceModelProvider.kt similarity index 86% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/util/DeviceModelProvider.kt rename to network/src/main/kotlin/com/bitwarden/network/util/DeviceModelProvider.kt index 89cf2e7a49..ba66be1c49 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/DeviceModelProvider.kt +++ b/network/src/main/kotlin/com/bitwarden/network/util/DeviceModelProvider.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.platform.util +package com.bitwarden.network.util import android.os.Build import com.bitwarden.core.annotation.OmitFromCoverage diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceTest.kt b/network/src/test/kotlin/com/bitwarden/network/service/IdentityServiceTest.kt similarity index 98% rename from app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceTest.kt rename to network/src/test/kotlin/com/bitwarden/network/service/IdentityServiceTest.kt index 8291242a26..bc19076b08 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceTest.kt +++ b/network/src/test/kotlin/com/bitwarden/network/service/IdentityServiceTest.kt @@ -1,9 +1,10 @@ -package com.x8bit.bitwarden.data.auth.datasource.network.service +package com.bitwarden.network.service import com.bitwarden.core.data.util.asSuccess import com.bitwarden.network.api.UnauthenticatedIdentityApi import com.bitwarden.network.base.BaseServiceTest import com.bitwarden.network.model.GetTokenResponseJson +import com.bitwarden.network.model.IdentityTokenAuthModel import com.bitwarden.network.model.KdfTypeJson import com.bitwarden.network.model.KeyConnectorUserDecryptionOptionsJson import com.bitwarden.network.model.MasterPasswordPolicyOptionsJson @@ -14,14 +15,13 @@ import com.bitwarden.network.model.RegisterFinishRequestJson import com.bitwarden.network.model.RegisterRequestJson import com.bitwarden.network.model.RegisterResponseJson import com.bitwarden.network.model.SendVerificationEmailRequestJson +import com.bitwarden.network.model.SendVerificationEmailResponseJson import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.TwoFactorAuthMethod import com.bitwarden.network.model.UserDecryptionOptionsJson import com.bitwarden.network.model.VerifyEmailTokenRequestJson -import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel -import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson -import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenResponseJson -import com.x8bit.bitwarden.data.platform.util.DeviceModelProvider +import com.bitwarden.network.model.VerifyEmailTokenResponseJson +import com.bitwarden.network.util.DeviceModelProvider import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest