From dcd2d26d6c82bd22635d223fdde8453a6f3e4bc2 Mon Sep 17 00:00:00 2001 From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:28:34 -0400 Subject: [PATCH] [PM-20187] Migrate DevicesService to the network module (#5040) --- .../data/auth/datasource/network/di/AuthNetworkModule.kt | 4 ++-- .../bitwarden/data/auth/manager/TrustedDeviceManagerImpl.kt | 2 +- .../bitwarden/data/auth/manager/di/AuthManagerModule.kt | 2 +- .../bitwarden/data/auth/repository/AuthRepositoryImpl.kt | 2 +- .../data/auth/repository/di/AuthRepositoryModule.kt | 2 +- .../bitwarden/data/auth/manager/TrustedDeviceManagerTests.kt | 2 +- .../bitwarden/data/auth/repository/AuthRepositoryTest.kt | 2 +- .../kotlin/com/bitwarden}/network/service/DevicesService.kt | 2 +- .../com/bitwarden}/network/service/DevicesServiceImpl.kt | 5 ++++- .../com/bitwarden}/network/service/DevicesServiceTest.kt | 2 +- 10 files changed, 14 insertions(+), 11 deletions(-) rename {app/src/main/java/com/x8bit/bitwarden/data/auth/datasource => network/src/main/kotlin/com/bitwarden}/network/service/DevicesService.kt (91%) rename {app/src/main/java/com/x8bit/bitwarden/data/auth/datasource => network/src/main/kotlin/com/bitwarden}/network/service/DevicesServiceImpl.kt (93%) rename {app/src/test/java/com/x8bit/bitwarden/data/auth/datasource => network/src/test/kotlin/com/bitwarden}/network/service/DevicesServiceTest.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 5855c96498..c9833b9e99 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 @@ -4,8 +4,8 @@ import com.bitwarden.network.service.AccountsService import com.bitwarden.network.service.AccountsServiceImpl import com.bitwarden.network.service.AuthRequestsService import com.bitwarden.network.service.AuthRequestsServiceImpl -import com.x8bit.bitwarden.data.auth.datasource.network.service.DevicesService -import com.x8bit.bitwarden.data.auth.datasource.network.service.DevicesServiceImpl +import com.bitwarden.network.service.DevicesService +import com.bitwarden.network.service.DevicesServiceImpl import com.x8bit.bitwarden.data.auth.datasource.network.service.HaveIBeenPwnedService import com.x8bit.bitwarden.data.auth.datasource.network.service.HaveIBeenPwnedServiceImpl import com.x8bit.bitwarden.data.auth.datasource.network.service.IdentityService diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerImpl.kt index a14647751f..acc861604f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerImpl.kt @@ -3,8 +3,8 @@ package com.x8bit.bitwarden.data.auth.manager import com.bitwarden.core.data.util.asSuccess import com.bitwarden.core.data.util.flatMap import com.bitwarden.crypto.TrustDeviceResponse +import com.bitwarden.network.service.DevicesService import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource -import com.x8bit.bitwarden.data.auth.datasource.network.service.DevicesService import com.x8bit.bitwarden.data.auth.manager.util.toUserStateJson import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/di/AuthManagerModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/di/AuthManagerModule.kt index 500e6520b6..5fbdf5124c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/di/AuthManagerModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/di/AuthManagerModule.kt @@ -4,8 +4,8 @@ import android.content.Context import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.service.AccountsService import com.bitwarden.network.service.AuthRequestsService +import com.bitwarden.network.service.DevicesService import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource -import com.x8bit.bitwarden.data.auth.datasource.network.service.DevicesService import com.x8bit.bitwarden.data.auth.datasource.network.service.NewAuthRequestService import com.x8bit.bitwarden.data.auth.datasource.sdk.AuthSdkSource import com.x8bit.bitwarden.data.auth.manager.AddTotpItemFromAuthenticatorManager 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 a7752d89fd..62c56be88c 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 @@ -30,6 +30,7 @@ import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson import com.bitwarden.network.model.TwoFactorAuthMethod import com.bitwarden.network.model.VerifyEmailTokenRequestJson import com.bitwarden.network.service.AccountsService +import com.bitwarden.network.service.DevicesService 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 @@ -42,7 +43,6 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthM 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.DevicesService import com.x8bit.bitwarden.data.auth.datasource.network.service.HaveIBeenPwnedService import com.x8bit.bitwarden.data.auth.datasource.network.service.IdentityService import com.x8bit.bitwarden.data.auth.datasource.network.service.OrganizationService 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 7cf4385b20..f9174ceb30 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 @@ -3,8 +3,8 @@ package com.x8bit.bitwarden.data.auth.repository.di import com.bitwarden.data.datasource.disk.ConfigDiskSource import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.service.AccountsService +import com.bitwarden.network.service.DevicesService import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource -import com.x8bit.bitwarden.data.auth.datasource.network.service.DevicesService import com.x8bit.bitwarden.data.auth.datasource.network.service.HaveIBeenPwnedService import com.x8bit.bitwarden.data.auth.datasource.network.service.IdentityService import com.x8bit.bitwarden.data.auth.datasource.network.service.OrganizationService 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 13a11a9ed6..fbe0f193a7 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 @@ -7,11 +7,11 @@ 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.datasource.network.service.DevicesService import com.x8bit.bitwarden.data.auth.manager.util.toUserStateJson import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import io.mockk.coEvery 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 66bcb91a14..e0ac6d7086 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 @@ -49,6 +49,7 @@ import com.bitwarden.network.model.VerifyEmailTokenRequestJson 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.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 @@ -61,7 +62,6 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthM 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.DevicesService import com.x8bit.bitwarden.data.auth.datasource.network.service.HaveIBeenPwnedService import com.x8bit.bitwarden.data.auth.datasource.network.service.IdentityService import com.x8bit.bitwarden.data.auth.datasource.network.service.OrganizationService diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesService.kt b/network/src/main/kotlin/com/bitwarden/network/service/DevicesService.kt similarity index 91% rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesService.kt rename to network/src/main/kotlin/com/bitwarden/network/service/DevicesService.kt index db613d4698..9d675a0637 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesService.kt +++ b/network/src/main/kotlin/com/bitwarden/network/service/DevicesService.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.auth.datasource.network.service +package com.bitwarden.network.service import com.bitwarden.network.model.TrustedDeviceKeysResponseJson diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceImpl.kt b/network/src/main/kotlin/com/bitwarden/network/service/DevicesServiceImpl.kt similarity index 93% rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceImpl.kt rename to network/src/main/kotlin/com/bitwarden/network/service/DevicesServiceImpl.kt index 435945b781..042c76020e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceImpl.kt +++ b/network/src/main/kotlin/com/bitwarden/network/service/DevicesServiceImpl.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.auth.datasource.network.service +package com.bitwarden.network.service import com.bitwarden.network.api.AuthenticatedDevicesApi import com.bitwarden.network.api.UnauthenticatedDevicesApi @@ -7,6 +7,9 @@ import com.bitwarden.network.model.TrustedDeviceKeysResponseJson import com.bitwarden.network.util.base64UrlEncode import com.bitwarden.network.util.toResult +/** + * The default implementation of the [DevicesService]. + */ class DevicesServiceImpl( private val authenticatedDevicesApi: AuthenticatedDevicesApi, private val unauthenticatedDevicesApi: UnauthenticatedDevicesApi, diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceTest.kt b/network/src/test/kotlin/com/bitwarden/network/service/DevicesServiceTest.kt similarity index 98% rename from app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceTest.kt rename to network/src/test/kotlin/com/bitwarden/network/service/DevicesServiceTest.kt index f758d0a5f0..54335cd3b2 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceTest.kt +++ b/network/src/test/kotlin/com/bitwarden/network/service/DevicesServiceTest.kt @@ -1,4 +1,4 @@ -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.AuthenticatedDevicesApi