Unify account number naming

Use variations of "account number" rather than
"account token" throughout the kotlin code base.

7 files changed, 32 insertions, 32 deletions

diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
index 2200fa2ce2..6cc6d25c36 100644
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
+++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
@@ -41,7 +41,7 @@ import net.mullvad.mullvadvpn.lib.daemon.grpc.mapper.toDomain
 import net.mullvad.mullvadvpn.lib.daemon.grpc.util.LogInterceptor
 import net.mullvad.mullvadvpn.lib.daemon.grpc.util.connectivityFlow
 import net.mullvad.mullvadvpn.lib.model.AccountData
-import net.mullvad.mullvadvpn.lib.model.AccountToken
+import net.mullvad.mullvadvpn.lib.model.AccountNumber
 import net.mullvad.mullvadvpn.lib.model.AddSplitTunnelingAppError
 import net.mullvad.mullvadvpn.lib.model.AppId
 import net.mullvad.mullvadvpn.lib.model.AppVersionInfo as ModelAppVersionInfo
@@ -210,13 +210,13 @@ class ManagementService(
             .map { it.toDomain() }
             .mapLeft { GetDeviceStateError.Unknown(it) }
 
-    suspend fun getDeviceList(token: AccountToken): Either<GetDeviceListError, List<Device>> =
+    suspend fun getDeviceList(token: AccountNumber): Either<GetDeviceListError, List<Device>> =
         Either.catch { grpc.listDevices(StringValue.of(token.value)) }
             .map { it.devicesList.map(ManagementInterface.Device::toDomain) }
             .mapLeft { GetDeviceListError.Unknown(it) }
 
     suspend fun removeDevice(
-        token: AccountToken,
+        token: AccountNumber,
         deviceId: DeviceId
     ): Either<DeleteDeviceError, Unit> =
         Either.catch {
@@ -257,13 +257,13 @@ class ManagementService(
         grpc.logoutAccount(Empty.getDefaultInstance())
     }
 
-    suspend fun loginAccount(accountToken: AccountToken): Either<LoginAccountError, Unit> =
-        Either.catch { grpc.loginAccount(StringValue.of(accountToken.value)) }
+    suspend fun loginAccount(accountNumber: AccountNumber): Either<LoginAccountError, Unit> =
+        Either.catch { grpc.loginAccount(StringValue.of(accountNumber.value)) }
             .mapLeftStatus {
                 when (it.status.code) {
                     Status.Code.UNAUTHENTICATED -> LoginAccountError.InvalidAccount
                     Status.Code.RESOURCE_EXHAUSTED ->
-                        LoginAccountError.MaxDevicesReached(accountToken)
+                        LoginAccountError.MaxDevicesReached(accountNumber)
                     Status.Code.UNAVAILABLE -> LoginAccountError.RpcError
                     else -> LoginAccountError.Unknown(it)
                 }
@@ -274,11 +274,11 @@ class ManagementService(
         grpc.clearAccountHistory(Empty.getDefaultInstance())
     }
 
-    suspend fun getAccountHistory(): Either<GetAccountHistoryError, AccountToken?> =
+    suspend fun getAccountHistory(): Either<GetAccountHistoryError, AccountNumber?> =
         Either.catch {
                 val history = grpc.getAccountHistory(Empty.getDefaultInstance())
                 if (history.hasToken()) {
-                    AccountToken(history.token.value)
+                    AccountNumber(history.token.value)
                 } else {
                     null
                 }
@@ -298,15 +298,15 @@ class ManagementService(
     }
 
     suspend fun getAccountData(
-        accountToken: AccountToken
+        accountNumber: AccountNumber
     ): Either<GetAccountDataError, AccountData> =
-        Either.catch { grpc.getAccountData(StringValue.of(accountToken.value)).toDomain() }
+        Either.catch { grpc.getAccountData(StringValue.of(accountNumber.value)).toDomain() }
             .mapLeft(GetAccountDataError::Unknown)
 
-    suspend fun createAccount(): Either<CreateAccountError, AccountToken> =
+    suspend fun createAccount(): Either<CreateAccountError, AccountNumber> =
         Either.catch {
-                val accountTokenStringValue = grpc.createNewAccount(Empty.getDefaultInstance())
-                AccountToken(accountTokenStringValue.value)
+                val accountNumberStringValue = grpc.createNewAccount(Empty.getDefaultInstance())
+                AccountNumber(accountNumberStringValue.value)
             }
             .mapLeft(CreateAccountError::Unknown)
 
diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
index 0fe64e09f2..59a94f62dc 100644
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
+++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
@@ -11,7 +11,7 @@ import net.mullvad.mullvadvpn.lib.daemon.grpc.GrpcConnectivityState
 import net.mullvad.mullvadvpn.lib.daemon.grpc.RelayNameComparator
 import net.mullvad.mullvadvpn.lib.model.AccountData
 import net.mullvad.mullvadvpn.lib.model.AccountId
-import net.mullvad.mullvadvpn.lib.model.AccountToken
+import net.mullvad.mullvadvpn.lib.model.AccountNumber
 import net.mullvad.mullvadvpn.lib.model.ActionAfterDisconnect
 import net.mullvad.mullvadvpn.lib.model.AppId
 import net.mullvad.mullvadvpn.lib.model.AppVersionInfo
@@ -491,7 +491,7 @@ internal fun ManagementInterface.Device.toDomain(): Device =
 internal fun ManagementInterface.DeviceState.toDomain(): DeviceState =
     when (state) {
         ManagementInterface.DeviceState.State.LOGGED_IN ->
-            DeviceState.LoggedIn(AccountToken(device.accountToken), device.device.toDomain())
+            DeviceState.LoggedIn(AccountNumber(device.accountToken), device.device.toDomain())
         ManagementInterface.DeviceState.State.LOGGED_OUT -> DeviceState.LoggedOut
         ManagementInterface.DeviceState.State.REVOKED -> DeviceState.Revoked
         ManagementInterface.DeviceState.State.UNRECOGNIZED ->
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/AccountToken.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/AccountNumber.kt
index d03a0d6721..995e3550f7 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/AccountToken.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/AccountNumber.kt
@@ -3,4 +3,4 @@ package net.mullvad.mullvadvpn.lib.model
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
-@JvmInline @Parcelize value class AccountToken(val value: String) : Parcelable
+@JvmInline @Parcelize value class AccountNumber(val value: String) : Parcelable
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DeviceState.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DeviceState.kt
index 4546cd46b3..ccec166a47 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DeviceState.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DeviceState.kt
@@ -5,7 +5,7 @@ import kotlinx.parcelize.Parcelize
 
 sealed class DeviceState : Parcelable {
     @Parcelize
-    data class LoggedIn(val accountToken: AccountToken, val device: Device) : DeviceState()
+    data class LoggedIn(val accountNumber: AccountNumber, val device: Device) : DeviceState()
 
     @Parcelize data object LoggedOut : DeviceState()
 
@@ -15,7 +15,7 @@ sealed class DeviceState : Parcelable {
         return (this as? LoggedIn)?.device?.displayName()
     }
 
-    fun token(): AccountToken? {
-        return (this as? LoggedIn)?.accountToken
+    fun token(): AccountNumber? {
+        return (this as? LoggedIn)?.accountNumber
     }
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/LoginAccountError.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/LoginAccountError.kt
index 1c58f80bee..99c36bc9d2 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/LoginAccountError.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/LoginAccountError.kt
@@ -7,7 +7,7 @@ import kotlinx.parcelize.Parcelize
 sealed class LoginAccountError : Parcelable {
     data object InvalidAccount : LoginAccountError()
 
-    data class MaxDevicesReached(val accountToken: AccountToken) : LoginAccountError()
+    data class MaxDevicesReached(val accountNumber: AccountNumber) : LoginAccountError()
 
     data object RpcError : LoginAccountError()
 
diff --git a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/AccountRepository.kt b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/AccountRepository.kt
index 432d113fba..a71dbe8efb 100644
--- a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/AccountRepository.kt
+++ b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/AccountRepository.kt
@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import net.mullvad.mullvadvpn.lib.daemon.grpc.ManagementService
 import net.mullvad.mullvadvpn.lib.model.AccountData
-import net.mullvad.mullvadvpn.lib.model.AccountToken
+import net.mullvad.mullvadvpn.lib.model.AccountNumber
 import net.mullvad.mullvadvpn.lib.model.CreateAccountError
 import net.mullvad.mullvadvpn.lib.model.DeviceState
 import net.mullvad.mullvadvpn.lib.model.LoginAccountError
@@ -37,7 +37,7 @@ class AccountRepository(
                 managementService.deviceState.filterNotNull().map { deviceState ->
                     when (deviceState) {
                         is DeviceState.LoggedIn -> {
-                            managementService.getAccountData(deviceState.accountToken).getOrNull()
+                            managementService.getAccountData(deviceState.accountNumber).getOrNull()
                         }
                         DeviceState.LoggedOut,
                         DeviceState.Revoked -> null
@@ -48,18 +48,18 @@ class AccountRepository(
             .distinctUntilChanged()
             .stateIn(scope = scope, SharingStarted.Eagerly, null)
 
-    suspend fun createAccount(): Either<CreateAccountError, AccountToken> =
+    suspend fun createAccount(): Either<CreateAccountError, AccountNumber> =
         managementService.createAccount().onRight { _isNewAccount.update { true } }
 
-    suspend fun login(accountToken: AccountToken): Either<LoginAccountError, Unit> =
-        managementService.loginAccount(accountToken)
+    suspend fun login(accountNumber: AccountNumber): Either<LoginAccountError, Unit> =
+        managementService.loginAccount(accountNumber)
 
     suspend fun logout() {
         managementService.logoutAccount()
         _isNewAccount.update { false }
     }
 
-    suspend fun fetchAccountHistory(): AccountToken? =
+    suspend fun fetchAccountHistory(): AccountNumber? =
         managementService.getAccountHistory().getOrNull()
 
     suspend fun clearAccountHistory() = managementService.clearAccountHistory()
@@ -68,7 +68,7 @@ class AccountRepository(
         val deviceState = ensureNotNull(deviceRepository.deviceState.value as? DeviceState.LoggedIn)
 
         val accountData =
-            managementService.getAccountData(deviceState.accountToken).getOrNull().bind()
+            managementService.getAccountData(deviceState.accountNumber).getOrNull().bind()
 
         // Update stateflow cache
         _mutableAccountDataCache.emit(accountData)
diff --git a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt
index b1b8f4fa41..f518dc02d1 100644
--- a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt
+++ b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt
@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.stateIn
 import net.mullvad.mullvadvpn.lib.daemon.grpc.ManagementService
-import net.mullvad.mullvadvpn.lib.model.AccountToken
+import net.mullvad.mullvadvpn.lib.model.AccountNumber
 import net.mullvad.mullvadvpn.lib.model.DeleteDeviceError
 import net.mullvad.mullvadvpn.lib.model.Device
 import net.mullvad.mullvadvpn.lib.model.DeviceId
@@ -27,10 +27,10 @@ class DeviceRepository(
         )
 
     suspend fun removeDevice(
-        accountToken: AccountToken,
+        accountNumber: AccountNumber,
         deviceId: DeviceId
-    ): Either<DeleteDeviceError, Unit> = managementService.removeDevice(accountToken, deviceId)
+    ): Either<DeleteDeviceError, Unit> = managementService.removeDevice(accountNumber, deviceId)
 
-    suspend fun deviceList(accountToken: AccountToken): Either<GetDeviceListError, List<Device>> =
-        managementService.getDeviceList(accountToken)
+    suspend fun deviceList(accountNumber: AccountNumber): Either<GetDeviceListError, List<Device>> =
+        managementService.getDeviceList(accountNumber)
 }