From 865a99fd67753d44cd1ebd94d3ffef2be3cc0435 Mon Sep 17 00:00:00 2001
From: Andrew Haisting <142518658+ahaisting-livefront@users.noreply.github.com>
Date: Thu, 26 Oct 2023 13:48:16 -0500
Subject: [PATCH] Remove references to HTTP constants in favor of raw ints
 (#167)

---
 .../datasource/network/service/AccountsServiceImpl.kt     | 8 ++------
 .../datasource/network/service/IdentityServiceImpl.kt     | 6 +++---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceImpl.kt
index 834edb2fad..0cedf0d85e 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceImpl.kt
@@ -8,7 +8,6 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterResponseJs
 import com.x8bit.bitwarden.data.platform.datasource.network.model.toBitwardenError
 import com.x8bit.bitwarden.data.platform.datasource.network.util.parseErrorBodyOrNull
 import kotlinx.serialization.json.Json
-import java.net.HttpURLConnection
 
 class AccountsServiceImpl constructor(
     private val accountsApi: AccountsApi,
@@ -25,13 +24,10 @@ class AccountsServiceImpl constructor(
             .recoverCatching { throwable ->
                 val bitwardenError = throwable.toBitwardenError()
                 bitwardenError.parseErrorBodyOrNull<RegisterResponseJson.CaptchaRequired>(
-                    code = HttpURLConnection.HTTP_BAD_REQUEST,
+                    code = 400,
                     json = json,
                 ) ?: bitwardenError.parseErrorBodyOrNull<RegisterResponseJson.Invalid>(
-                    codes = listOf(
-                        HttpURLConnection.HTTP_BAD_REQUEST,
-                        429,
-                    ),
+                    codes = listOf(400, 429),
                     json = json,
                 ) ?: bitwardenError.parseErrorBodyOrNull<RegisterResponseJson.Error>(
                     code = 429,
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt
index edf740bd11..b64b606d50 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt
@@ -7,7 +7,6 @@ import com.x8bit.bitwarden.data.platform.datasource.network.util.base64UrlEncode
 import com.x8bit.bitwarden.data.platform.datasource.network.util.parseErrorBodyOrNull
 import com.x8bit.bitwarden.data.platform.util.DeviceModelProvider
 import kotlinx.serialization.json.Json
-import java.net.HttpURLConnection.HTTP_BAD_REQUEST
 import java.util.UUID
 
 class IdentityServiceImpl constructor(
@@ -16,6 +15,7 @@ class IdentityServiceImpl constructor(
     private val deviceModelProvider: DeviceModelProvider = DeviceModelProvider(),
 ) : IdentityService {
 
+    @Suppress("MagicNumber")
     override suspend fun getToken(
         email: String,
         passwordHash: String,
@@ -37,10 +37,10 @@ class IdentityServiceImpl constructor(
         .recoverCatching { throwable ->
             val bitwardenError = throwable.toBitwardenError()
             bitwardenError.parseErrorBodyOrNull<GetTokenResponseJson.CaptchaRequired>(
-                code = HTTP_BAD_REQUEST,
+                code = 400,
                 json = json,
             ) ?: bitwardenError.parseErrorBodyOrNull<GetTokenResponseJson.Invalid>(
-                code = HTTP_BAD_REQUEST,
+                code = 400,
                 json = json,
             ) ?: throw throwable
         }