Skip to content

Commit d1e4078

Browse files
SaintPatrckSaintPatrck
authored
[PM-19851] Migrate network AuthenticatedAccountsApi to network module (#4982)
1 parent 241a89f commit d1e4078

38 files changed

+62
-59
lines changed

‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/model/AccountJson.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.x8bit.bitwarden.data.auth.datasource.disk.model
22

3-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
3+
import com.bitwarden.network.model.KdfTypeJson
44
import com.x8bit.bitwarden.data.auth.datasource.network.model.UserDecryptionOptionsJson
55
import kotlinx.serialization.Contextual
66
import kotlinx.serialization.ExperimentalSerializationApi

‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/UnauthenticatedIdentityApi.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.x8bit.bitwarden.data.auth.datasource.network.api
22

33
import com.bitwarden.network.model.NetworkResult
4+
import com.bitwarden.network.model.RegisterRequestJson
45
import com.x8bit.bitwarden.data.auth.datasource.network.model.GetTokenResponseJson
56
import com.x8bit.bitwarden.data.auth.datasource.network.model.PreLoginRequestJson
67
import com.x8bit.bitwarden.data.auth.datasource.network.model.PreLoginResponseJson
78
import com.x8bit.bitwarden.data.auth.datasource.network.model.PrevalidateSsoResponseJson
89
import com.x8bit.bitwarden.data.auth.datasource.network.model.RefreshTokenResponseJson
910
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterFinishRequestJson
10-
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterRequestJson
1111
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterResponseJson
1212
import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailRequestJson
1313
import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenRequestJson

‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/GetTokenResponseJson.kt

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.x8bit.bitwarden.data.auth.datasource.network.model
22

3+
import com.bitwarden.network.model.KdfTypeJson
34
import kotlinx.serialization.ExperimentalSerializationApi
45
import kotlinx.serialization.SerialName
56
import kotlinx.serialization.Serializable

‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/InternalPreLoginResponseJson.kt

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.x8bit.bitwarden.data.auth.datasource.network.model
22

3+
import com.bitwarden.network.model.KdfTypeJson
34
import kotlinx.serialization.SerialName
45
import kotlinx.serialization.Serializable
56

‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/KeyConnectorKeyRequestJson.kt

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.x8bit.bitwarden.data.auth.datasource.network.model
22

3+
import com.bitwarden.network.model.KdfTypeJson
34
import kotlinx.serialization.SerialName
45
import kotlinx.serialization.Serializable
56

‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/PreLoginResponseJson.kt

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.x8bit.bitwarden.data.auth.datasource.network.model
22

3+
import com.bitwarden.network.model.KdfTypeJson
34
import com.x8bit.bitwarden.data.platform.datasource.network.serializer.BaseSurrogateSerializer
45
import kotlinx.serialization.Serializable
56

‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/RegisterFinishRequestJson.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.x8bit.bitwarden.data.auth.datasource.network.model
22

3-
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterFinishRequestJson.Keys
3+
import com.bitwarden.network.model.KdfTypeJson
44
import kotlinx.serialization.SerialName
55
import kotlinx.serialization.Serializable
66

‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsService.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.x8bit.bitwarden.data.auth.datasource.network.service
22

3+
import com.bitwarden.network.model.ResetPasswordRequestJson
4+
import com.bitwarden.network.model.SetPasswordRequestJson
35
import com.x8bit.bitwarden.data.auth.datasource.network.model.DeleteAccountResponseJson
46
import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorKeyRequestJson
57
import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorMasterKeyResponseJson
68
import com.x8bit.bitwarden.data.auth.datasource.network.model.PasswordHintResponseJson
79
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendEmailRequestJson
810
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendNewDeviceOtpRequestJson
9-
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResetPasswordRequestJson
10-
import com.x8bit.bitwarden.data.auth.datasource.network.model.SetPasswordRequestJson
1111

1212
/**
1313
* Provides an API for querying accounts endpoints.

‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceImpl.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
package com.x8bit.bitwarden.data.auth.datasource.network.service
22

3+
import com.bitwarden.network.api.AuthenticatedAccountsApi
34
import com.bitwarden.network.api.AuthenticatedKeyConnectorApi
5+
import com.bitwarden.network.model.CreateAccountKeysRequest
6+
import com.bitwarden.network.model.DeleteAccountRequestJson
47
import com.bitwarden.network.model.KeyConnectorMasterKeyRequestJson
8+
import com.bitwarden.network.model.ResetPasswordRequestJson
9+
import com.bitwarden.network.model.SetPasswordRequestJson
10+
import com.bitwarden.network.model.VerifyOtpRequestJson
511
import com.bitwarden.network.model.toBitwardenError
612
import com.bitwarden.network.util.NetworkErrorCode
713
import com.bitwarden.network.util.parseErrorBodyOrNull
814
import com.bitwarden.network.util.toResult
9-
import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedAccountsApi
1015
import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedAccountsApi
1116
import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedKeyConnectorApi
12-
import com.x8bit.bitwarden.data.auth.datasource.network.model.CreateAccountKeysRequest
13-
import com.x8bit.bitwarden.data.auth.datasource.network.model.DeleteAccountRequestJson
1417
import com.x8bit.bitwarden.data.auth.datasource.network.model.DeleteAccountResponseJson
1518
import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorKeyRequestJson
1619
import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorMasterKeyResponseJson
1720
import com.x8bit.bitwarden.data.auth.datasource.network.model.PasswordHintRequestJson
1821
import com.x8bit.bitwarden.data.auth.datasource.network.model.PasswordHintResponseJson
1922
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendEmailRequestJson
2023
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendNewDeviceOtpRequestJson
21-
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResetPasswordRequestJson
22-
import com.x8bit.bitwarden.data.auth.datasource.network.model.SetPasswordRequestJson
23-
import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyOtpRequestJson
2424
import com.x8bit.bitwarden.data.platform.datasource.network.util.HEADER_VALUE_BEARER_PREFIX
2525
import kotlinx.serialization.json.Json
2626

‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.x8bit.bitwarden.data.auth.datasource.network.service
22

3+
import com.bitwarden.network.model.RegisterRequestJson
34
import com.x8bit.bitwarden.data.auth.datasource.network.model.GetTokenResponseJson
45
import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel
56
import com.x8bit.bitwarden.data.auth.datasource.network.model.PreLoginResponseJson
67
import com.x8bit.bitwarden.data.auth.datasource.network.model.PrevalidateSsoResponseJson
78
import com.x8bit.bitwarden.data.auth.datasource.network.model.RefreshTokenResponseJson
89
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterFinishRequestJson
9-
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterRequestJson
1010
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterResponseJson
1111
import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailRequestJson
1212
import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson

‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.x8bit.bitwarden.data.auth.datasource.network.service
22

3+
import com.bitwarden.network.model.RegisterRequestJson
34
import com.bitwarden.network.model.toBitwardenError
45
import com.bitwarden.network.util.NetworkErrorCode
56
import com.bitwarden.network.util.base64UrlEncode
@@ -14,7 +15,6 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.PreLoginResponseJs
1415
import com.x8bit.bitwarden.data.auth.datasource.network.model.PrevalidateSsoResponseJson
1516
import com.x8bit.bitwarden.data.auth.datasource.network.model.RefreshTokenResponseJson
1617
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterFinishRequestJson
17-
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterRequestJson
1818
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterResponseJson
1919
import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailRequestJson
2020
import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson

‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/util/KdfExtensions.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.x8bit.bitwarden.data.auth.datasource.sdk.util
22

33
import com.bitwarden.crypto.Kdf
4-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
5-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson.ARGON2_ID
6-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson.PBKDF2_SHA256
4+
import com.bitwarden.network.model.KdfTypeJson
5+
import com.bitwarden.network.model.KdfTypeJson.ARGON2_ID
6+
import com.bitwarden.network.model.KdfTypeJson.PBKDF2_SHA256
77

88
/**
99
* Convert a [Kdf] to a [KdfTypeJson].

‎app/src/main/java/com/x8bit/bitwarden/data/auth/manager/KeyConnectorManager.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.x8bit.bitwarden.data.auth.manager
22

33
import com.bitwarden.core.KeyConnectorResponse
44
import com.bitwarden.crypto.Kdf
5-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
5+
import com.bitwarden.network.model.KdfTypeJson
66
import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorMasterKeyResponseJson
77

88
/**

‎app/src/main/java/com/x8bit/bitwarden/data/auth/manager/KeyConnectorManagerImpl.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.x8bit.bitwarden.data.auth.manager
33
import com.bitwarden.core.KeyConnectorResponse
44
import com.bitwarden.core.data.util.flatMap
55
import com.bitwarden.crypto.Kdf
6-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
6+
import com.bitwarden.network.model.KdfTypeJson
77
import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorKeyRequestJson
88
import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorMasterKeyResponseJson
99
import com.x8bit.bitwarden.data.auth.datasource.network.service.AccountsService

‎app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import com.bitwarden.core.data.util.asSuccess
88
import com.bitwarden.core.data.util.flatMap
99
import com.bitwarden.crypto.HashPurpose
1010
import com.bitwarden.crypto.Kdf
11+
import com.bitwarden.network.model.RegisterRequestJson
12+
import com.bitwarden.network.model.ResetPasswordRequestJson
13+
import com.bitwarden.network.model.SetPasswordRequestJson
1114
import com.bitwarden.network.util.isSslHandShakeError
1215
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
1316
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson
@@ -25,14 +28,11 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.PasswordHintRespon
2528
import com.x8bit.bitwarden.data.auth.datasource.network.model.PrevalidateSsoResponseJson
2629
import com.x8bit.bitwarden.data.auth.datasource.network.model.RefreshTokenResponseJson
2730
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterFinishRequestJson
28-
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterRequestJson
2931
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterResponseJson
3032
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendEmailRequestJson
3133
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendNewDeviceOtpRequestJson
32-
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResetPasswordRequestJson
3334
import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailRequestJson
3435
import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson
35-
import com.x8bit.bitwarden.data.auth.datasource.network.model.SetPasswordRequestJson
3636
import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceUserDecryptionOptionsJson
3737
import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorAuthMethod
3838
import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel

‎app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/AccountJsonExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.x8bit.bitwarden.data.auth.repository.util
22

33
import com.bitwarden.crypto.Kdf
4+
import com.bitwarden.network.model.KdfTypeJson
45
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson
5-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
66
import com.x8bit.bitwarden.data.auth.util.KdfParamsConstants
77

88
/**

‎app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import androidx.core.content.edit
44
import app.cash.turbine.test
55
import com.bitwarden.authenticatorbridge.util.generateSecretKey
66
import com.bitwarden.core.di.CoreModule
7+
import com.bitwarden.network.model.KdfTypeJson
78
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson
89
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson
910
import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson
@@ -13,7 +14,6 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.model.NewDeviceNoticeState
1314
import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus
1415
import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson
1516
import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson
16-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
1717
import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorUserDecryptionOptionsJson
1818
import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceUserDecryptionOptionsJson
1919
import com.x8bit.bitwarden.data.auth.datasource.network.model.UserDecryptionOptionsJson

‎app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceTest.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package com.x8bit.bitwarden.data.auth.datasource.network.service
22

33
import com.bitwarden.core.data.util.asSuccess
4+
import com.bitwarden.network.api.AuthenticatedAccountsApi
45
import com.bitwarden.network.api.AuthenticatedKeyConnectorApi
56
import com.bitwarden.network.base.BaseServiceTest
6-
import com.x8bit.bitwarden.data.auth.datasource.network.api.AuthenticatedAccountsApi
7+
import com.bitwarden.network.model.KdfTypeJson
8+
import com.bitwarden.network.model.RegisterRequestJson
9+
import com.bitwarden.network.model.ResetPasswordRequestJson
10+
import com.bitwarden.network.model.SetPasswordRequestJson
711
import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedAccountsApi
812
import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedKeyConnectorApi
9-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
1013
import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorKeyRequestJson
1114
import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorMasterKeyResponseJson
1215
import com.x8bit.bitwarden.data.auth.datasource.network.model.PasswordHintResponseJson
13-
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterRequestJson
1416
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendEmailRequestJson
1517
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendNewDeviceOtpRequestJson
16-
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResetPasswordRequestJson
17-
import com.x8bit.bitwarden.data.auth.datasource.network.model.SetPasswordRequestJson
1818
import kotlinx.coroutines.test.runTest
1919
import okhttp3.mockwebserver.MockResponse
2020
import org.junit.jupiter.api.Assertions.assertEquals

‎app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ package com.x8bit.bitwarden.data.auth.datasource.network.service
22

33
import com.bitwarden.core.data.util.asSuccess
44
import com.bitwarden.network.base.BaseServiceTest
5+
import com.bitwarden.network.model.KdfTypeJson
6+
import com.bitwarden.network.model.RegisterRequestJson
57
import com.x8bit.bitwarden.data.auth.datasource.network.api.UnauthenticatedIdentityApi
68
import com.x8bit.bitwarden.data.auth.datasource.network.model.GetTokenResponseJson
79
import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel
8-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
910
import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorUserDecryptionOptionsJson
1011
import com.x8bit.bitwarden.data.auth.datasource.network.model.MasterPasswordPolicyOptionsJson
1112
import com.x8bit.bitwarden.data.auth.datasource.network.model.PreLoginResponseJson
1213
import com.x8bit.bitwarden.data.auth.datasource.network.model.PrevalidateSsoResponseJson
1314
import com.x8bit.bitwarden.data.auth.datasource.network.model.RefreshTokenResponseJson
1415
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterFinishRequestJson
15-
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterRequestJson
1616
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterResponseJson
1717
import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailRequestJson
1818
import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson

‎app/src/test/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestManagerTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import com.bitwarden.core.data.util.asFailure
66
import com.bitwarden.core.data.util.asSuccess
77
import com.bitwarden.network.model.AuthRequestTypeJson
88
import com.bitwarden.network.model.AuthRequestsResponseJson
9+
import com.bitwarden.network.model.KdfTypeJson
910
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson
1011
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson
1112
import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson
1213
import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson
1314
import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource
14-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
1515
import com.x8bit.bitwarden.data.auth.datasource.network.service.AuthRequestsService
1616
import com.x8bit.bitwarden.data.auth.datasource.network.service.NewAuthRequestService
1717
import com.x8bit.bitwarden.data.auth.datasource.sdk.AuthSdkSource

‎app/src/test/java/com/x8bit/bitwarden/data/auth/manager/KeyConnectorManagerTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.bitwarden.core.data.util.asFailure
55
import com.bitwarden.core.data.util.asSuccess
66
import com.bitwarden.crypto.Kdf
77
import com.bitwarden.crypto.RsaKeyPair
8-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
8+
import com.bitwarden.network.model.KdfTypeJson
99
import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorKeyRequestJson
1010
import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorMasterKeyResponseJson
1111
import com.x8bit.bitwarden.data.auth.datasource.network.service.AccountsService

‎app/src/test/java/com/x8bit/bitwarden/data/auth/manager/TrustedDeviceManagerTests.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package com.x8bit.bitwarden.data.auth.manager
33
import com.bitwarden.core.data.util.asFailure
44
import com.bitwarden.core.data.util.asSuccess
55
import com.bitwarden.crypto.TrustDeviceResponse
6+
import com.bitwarden.network.model.KdfTypeJson
67
import com.bitwarden.network.model.TrustedDeviceKeysResponseJson
78
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson
89
import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson
910
import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson
1011
import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource
11-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
1212
import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceUserDecryptionOptionsJson
1313
import com.x8bit.bitwarden.data.auth.datasource.network.model.UserDecryptionOptionsJson
1414
import com.x8bit.bitwarden.data.auth.datasource.network.service.DevicesService

‎app/src/test/java/com/x8bit/bitwarden/data/auth/manager/UserLogoutManagerTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package com.x8bit.bitwarden.data.auth.manager
33
import android.content.Context
44
import android.widget.Toast
55
import androidx.annotation.StringRes
6+
import com.bitwarden.network.model.KdfTypeJson
67
import com.x8bit.bitwarden.R
78
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
89
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson
910
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson
1011
import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson
11-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
1212
import com.x8bit.bitwarden.data.auth.repository.model.LogoutReason
1313
import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager
1414
import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource

‎app/src/test/java/com/x8bit/bitwarden/data/auth/manager/util/TrustDeviceResponseExtensionsTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.x8bit.bitwarden.data.auth.manager.util
22

33
import com.bitwarden.crypto.TrustDeviceResponse
4+
import com.bitwarden.network.model.KdfTypeJson
45
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson
56
import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson
67
import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson
7-
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
88
import com.x8bit.bitwarden.data.auth.datasource.network.model.TrustedDeviceUserDecryptionOptionsJson
99
import com.x8bit.bitwarden.data.auth.datasource.network.model.UserDecryptionOptionsJson
1010
import org.junit.jupiter.api.Assertions.assertEquals

0 commit comments

Comments
 (0)