Skip to content

Commit 899689b

Browse files
SaintPatrckSaintPatrck
authored
[PM-20189] Migrate IdentityService and related components to network module (#5047)
1 parent 71237cb commit 899689b

File tree

15 files changed

+37
-37
lines changed

15 files changed

+37
-37
lines changed

Diff for: ‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/di/AuthNetworkModule.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import com.bitwarden.network.service.DevicesService
88
import com.bitwarden.network.service.DevicesServiceImpl
99
import com.bitwarden.network.service.HaveIBeenPwnedService
1010
import com.bitwarden.network.service.HaveIBeenPwnedServiceImpl
11-
import com.x8bit.bitwarden.data.auth.datasource.network.service.IdentityService
12-
import com.x8bit.bitwarden.data.auth.datasource.network.service.IdentityServiceImpl
11+
import com.bitwarden.network.service.IdentityService
12+
import com.bitwarden.network.service.IdentityServiceImpl
1313
import com.x8bit.bitwarden.data.auth.datasource.network.service.NewAuthRequestService
1414
import com.x8bit.bitwarden.data.auth.datasource.network.service.NewAuthRequestServiceImpl
1515
import com.x8bit.bitwarden.data.auth.datasource.network.service.OrganizationService

Diff for: ‎app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt

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

33
import com.bitwarden.network.model.GetTokenResponseJson
44
import com.bitwarden.network.model.SyncResponseJson
5+
import com.bitwarden.network.model.TwoFactorDataModel
56
import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetReason
67
import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus
7-
import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel
88
import com.x8bit.bitwarden.data.auth.manager.AuthRequestManager
99
import com.x8bit.bitwarden.data.auth.repository.model.AuthState
1010
import com.x8bit.bitwarden.data.auth.repository.model.BreachCountResult

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.bitwarden.data.datasource.disk.ConfigDiskSource
1212
import com.bitwarden.data.manager.DispatcherManager
1313
import com.bitwarden.network.model.DeleteAccountResponseJson
1414
import com.bitwarden.network.model.GetTokenResponseJson
15+
import com.bitwarden.network.model.IdentityTokenAuthModel
1516
import com.bitwarden.network.model.OrganizationType
1617
import com.bitwarden.network.model.PasswordHintResponseJson
1718
import com.bitwarden.network.model.PolicyTypeJson
@@ -24,14 +25,18 @@ import com.bitwarden.network.model.ResendEmailRequestJson
2425
import com.bitwarden.network.model.ResendNewDeviceOtpRequestJson
2526
import com.bitwarden.network.model.ResetPasswordRequestJson
2627
import com.bitwarden.network.model.SendVerificationEmailRequestJson
28+
import com.bitwarden.network.model.SendVerificationEmailResponseJson
2729
import com.bitwarden.network.model.SetPasswordRequestJson
2830
import com.bitwarden.network.model.SyncResponseJson
2931
import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson
3032
import com.bitwarden.network.model.TwoFactorAuthMethod
33+
import com.bitwarden.network.model.TwoFactorDataModel
3134
import com.bitwarden.network.model.VerifyEmailTokenRequestJson
35+
import com.bitwarden.network.model.VerifyEmailTokenResponseJson
3236
import com.bitwarden.network.service.AccountsService
3337
import com.bitwarden.network.service.DevicesService
3438
import com.bitwarden.network.service.HaveIBeenPwnedService
39+
import com.bitwarden.network.service.IdentityService
3540
import com.bitwarden.network.util.isSslHandShakeError
3641
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
3742
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson
@@ -40,11 +45,6 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetRea
4045
import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus
4146
import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson
4247
import com.x8bit.bitwarden.data.auth.datasource.network.model.DeviceDataModel
43-
import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel
44-
import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson
45-
import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel
46-
import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenResponseJson
47-
import com.x8bit.bitwarden.data.auth.datasource.network.service.IdentityService
4848
import com.x8bit.bitwarden.data.auth.datasource.network.service.OrganizationService
4949
import com.x8bit.bitwarden.data.auth.datasource.sdk.AuthSdkSource
5050
import com.x8bit.bitwarden.data.auth.datasource.sdk.util.toInt

Diff for: ‎app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/AuthRepositoryModule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import com.bitwarden.data.manager.DispatcherManager
55
import com.bitwarden.network.service.AccountsService
66
import com.bitwarden.network.service.DevicesService
77
import com.bitwarden.network.service.HaveIBeenPwnedService
8+
import com.bitwarden.network.service.IdentityService
89
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
9-
import com.x8bit.bitwarden.data.auth.datasource.network.service.IdentityService
1010
import com.x8bit.bitwarden.data.auth.datasource.network.service.OrganizationService
1111
import com.x8bit.bitwarden.data.auth.datasource.sdk.AuthSdkSource
1212
import com.x8bit.bitwarden.data.auth.manager.AuthRequestManager

Diff for: ‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import androidx.core.net.toUri
77
import androidx.lifecycle.SavedStateHandle
88
import androidx.lifecycle.viewModelScope
99
import com.bitwarden.network.model.TwoFactorAuthMethod
10+
import com.bitwarden.network.model.TwoFactorDataModel
1011
import com.bitwarden.network.util.availableAuthMethods
1112
import com.bitwarden.network.util.preferredAuthMethod
1213
import com.bitwarden.network.util.twoFactorDisplayEmail
1314
import com.bitwarden.network.util.twoFactorDuoAuthUrl
1415
import com.bitwarden.ui.util.Text
1516
import com.bitwarden.ui.util.asText
1617
import com.x8bit.bitwarden.R
17-
import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel
1818
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
1919
import com.x8bit.bitwarden.data.auth.repository.model.LoginResult
2020
import com.x8bit.bitwarden.data.auth.repository.model.ResendEmailResult

Diff for: ‎app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import com.bitwarden.data.manager.DispatcherManager
2222
import com.bitwarden.network.model.ConfigResponseJson
2323
import com.bitwarden.network.model.DeleteAccountResponseJson
2424
import com.bitwarden.network.model.GetTokenResponseJson
25+
import com.bitwarden.network.model.IdentityTokenAuthModel
2526
import com.bitwarden.network.model.KdfTypeJson
2627
import com.bitwarden.network.model.KeyConnectorMasterKeyResponseJson
2728
import com.bitwarden.network.model.OrganizationAutoEnrollStatusResponseJson
@@ -39,18 +40,22 @@ import com.bitwarden.network.model.RegisterResponseJson
3940
import com.bitwarden.network.model.ResendEmailRequestJson
4041
import com.bitwarden.network.model.ResetPasswordRequestJson
4142
import com.bitwarden.network.model.SendVerificationEmailRequestJson
43+
import com.bitwarden.network.model.SendVerificationEmailResponseJson
4244
import com.bitwarden.network.model.SetPasswordRequestJson
4345
import com.bitwarden.network.model.SyncResponseJson
4446
import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson
4547
import com.bitwarden.network.model.TwoFactorAuthMethod
48+
import com.bitwarden.network.model.TwoFactorDataModel
4649
import com.bitwarden.network.model.UserDecryptionOptionsJson
4750
import com.bitwarden.network.model.VerifiedOrganizationDomainSsoDetailsResponse
4851
import com.bitwarden.network.model.VerifyEmailTokenRequestJson
52+
import com.bitwarden.network.model.VerifyEmailTokenResponseJson
4953
import com.bitwarden.network.model.createMockOrganization
5054
import com.bitwarden.network.model.createMockPolicy
5155
import com.bitwarden.network.service.AccountsService
5256
import com.bitwarden.network.service.DevicesService
5357
import com.bitwarden.network.service.HaveIBeenPwnedService
58+
import com.bitwarden.network.service.IdentityService
5459
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson
5560
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson
5661
import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson
@@ -59,11 +64,6 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.model.OnboardingStatus
5964
import com.x8bit.bitwarden.data.auth.datasource.disk.model.PendingAuthRequestJson
6065
import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson
6166
import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource
62-
import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel
63-
import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson
64-
import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel
65-
import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenResponseJson
66-
import com.x8bit.bitwarden.data.auth.datasource.network.service.IdentityService
6767
import com.x8bit.bitwarden.data.auth.datasource.network.service.OrganizationService
6868
import com.x8bit.bitwarden.data.auth.datasource.sdk.AuthSdkSource
6969
import com.x8bit.bitwarden.data.auth.datasource.sdk.model.PasswordStrength.LEVEL_0

Diff for: ‎app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import app.cash.turbine.test
77
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
88
import com.bitwarden.network.model.GetTokenResponseJson
99
import com.bitwarden.network.model.TwoFactorAuthMethod
10+
import com.bitwarden.network.model.TwoFactorDataModel
1011
import com.bitwarden.network.util.base64UrlDecodeOrNull
1112
import com.bitwarden.ui.util.asText
1213
import com.x8bit.bitwarden.R
13-
import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel
1414
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
1515
import com.x8bit.bitwarden.data.auth.repository.model.LoginResult
1616
import com.x8bit.bitwarden.data.auth.repository.model.ResendEmailResult

Diff for: ‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/IdentityTokenAuthModel.kt renamed to ‎network/src/main/kotlin/com/bitwarden/network/model/IdentityTokenAuthModel.kt

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

33
/**
44
* Hold the authentication information for different login methods.

Diff for: ‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/SendVerificationEmailResponseJson.kt renamed to ‎network/src/main/kotlin/com/bitwarden/network/model/SendVerificationEmailResponseJson.kt

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

33
import kotlinx.serialization.ExperimentalSerializationApi
44
import kotlinx.serialization.SerialName

Diff for: ‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/TwoFactorDataModel.kt renamed to ‎network/src/main/kotlin/com/bitwarden/network/model/TwoFactorDataModel.kt

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

33
/**
44
* Hold the information necessary to add two-factor authorization

Diff for: ‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/VerifyEmailTokenResponseJson.kt renamed to ‎network/src/main/kotlin/com/bitwarden/network/model/VerifyEmailTokenResponseJson.kt

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

33
import kotlinx.serialization.SerialName
44
import kotlinx.serialization.Serializable

Diff for: ‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityService.kt renamed to ‎network/src/main/kotlin/com/bitwarden/network/service/IdentityService.kt

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

33
import com.bitwarden.network.model.GetTokenResponseJson
4+
import com.bitwarden.network.model.IdentityTokenAuthModel
45
import com.bitwarden.network.model.PreLoginResponseJson
56
import com.bitwarden.network.model.PrevalidateSsoResponseJson
67
import com.bitwarden.network.model.RefreshTokenResponseJson
78
import com.bitwarden.network.model.RegisterFinishRequestJson
89
import com.bitwarden.network.model.RegisterRequestJson
910
import com.bitwarden.network.model.RegisterResponseJson
1011
import com.bitwarden.network.model.SendVerificationEmailRequestJson
12+
import com.bitwarden.network.model.SendVerificationEmailResponseJson
13+
import com.bitwarden.network.model.TwoFactorDataModel
1114
import com.bitwarden.network.model.VerifyEmailTokenRequestJson
12-
import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel
13-
import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson
14-
import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel
15-
import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenResponseJson
15+
import com.bitwarden.network.model.VerifyEmailTokenResponseJson
1616

1717
/**
1818
* Provides an API for querying identity endpoints.

Diff for: ‎app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt renamed to ‎network/src/main/kotlin/com/bitwarden/network/service/IdentityServiceImpl.kt

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

33
import com.bitwarden.network.api.UnauthenticatedIdentityApi
44
import com.bitwarden.network.model.GetTokenResponseJson
5+
import com.bitwarden.network.model.IdentityTokenAuthModel
56
import com.bitwarden.network.model.PreLoginRequestJson
67
import com.bitwarden.network.model.PreLoginResponseJson
78
import com.bitwarden.network.model.PrevalidateSsoResponseJson
@@ -10,18 +11,17 @@ import com.bitwarden.network.model.RegisterFinishRequestJson
1011
import com.bitwarden.network.model.RegisterRequestJson
1112
import com.bitwarden.network.model.RegisterResponseJson
1213
import com.bitwarden.network.model.SendVerificationEmailRequestJson
14+
import com.bitwarden.network.model.SendVerificationEmailResponseJson
15+
import com.bitwarden.network.model.TwoFactorDataModel
1316
import com.bitwarden.network.model.VerifyEmailTokenRequestJson
17+
import com.bitwarden.network.model.VerifyEmailTokenResponseJson
1418
import com.bitwarden.network.model.toBitwardenError
19+
import com.bitwarden.network.util.DeviceModelProvider
1520
import com.bitwarden.network.util.NetworkErrorCode
1621
import com.bitwarden.network.util.base64UrlEncode
1722
import com.bitwarden.network.util.executeForNetworkResult
1823
import com.bitwarden.network.util.parseErrorBodyOrNull
1924
import com.bitwarden.network.util.toResult
20-
import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel
21-
import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson
22-
import com.x8bit.bitwarden.data.auth.datasource.network.model.TwoFactorDataModel
23-
import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenResponseJson
24-
import com.x8bit.bitwarden.data.platform.util.DeviceModelProvider
2525
import kotlinx.serialization.json.Json
2626

2727
class IdentityServiceImpl(

Diff for: ‎app/src/main/java/com/x8bit/bitwarden/data/platform/util/DeviceModelProvider.kt renamed to ‎network/src/main/kotlin/com/bitwarden/network/util/DeviceModelProvider.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.x8bit.bitwarden.data.platform.util
1+
package com.bitwarden.network.util
22

33
import android.os.Build
44
import com.bitwarden.core.annotation.OmitFromCoverage

Diff for: ‎app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceTest.kt renamed to ‎network/src/test/kotlin/com/bitwarden/network/service/IdentityServiceTest.kt

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

33
import com.bitwarden.core.data.util.asSuccess
44
import com.bitwarden.network.api.UnauthenticatedIdentityApi
55
import com.bitwarden.network.base.BaseServiceTest
66
import com.bitwarden.network.model.GetTokenResponseJson
7+
import com.bitwarden.network.model.IdentityTokenAuthModel
78
import com.bitwarden.network.model.KdfTypeJson
89
import com.bitwarden.network.model.KeyConnectorUserDecryptionOptionsJson
910
import com.bitwarden.network.model.MasterPasswordPolicyOptionsJson
@@ -14,14 +15,13 @@ import com.bitwarden.network.model.RegisterFinishRequestJson
1415
import com.bitwarden.network.model.RegisterRequestJson
1516
import com.bitwarden.network.model.RegisterResponseJson
1617
import com.bitwarden.network.model.SendVerificationEmailRequestJson
18+
import com.bitwarden.network.model.SendVerificationEmailResponseJson
1719
import com.bitwarden.network.model.TrustedDeviceUserDecryptionOptionsJson
1820
import com.bitwarden.network.model.TwoFactorAuthMethod
1921
import com.bitwarden.network.model.UserDecryptionOptionsJson
2022
import com.bitwarden.network.model.VerifyEmailTokenRequestJson
21-
import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel
22-
import com.x8bit.bitwarden.data.auth.datasource.network.model.SendVerificationEmailResponseJson
23-
import com.x8bit.bitwarden.data.auth.datasource.network.model.VerifyEmailTokenResponseJson
24-
import com.x8bit.bitwarden.data.platform.util.DeviceModelProvider
23+
import com.bitwarden.network.model.VerifyEmailTokenResponseJson
24+
import com.bitwarden.network.util.DeviceModelProvider
2525
import io.mockk.every
2626
import io.mockk.mockk
2727
import kotlinx.coroutines.test.runTest

0 commit comments

Comments
 (0)