Merge branch 'bwa-86/network-layer-retrofit' into bwa-86/config-service

Author: andrebispo5

app/src/main/kotlin/com/bitwarden/authenticator/data/auth/datasource/disk/model/EnvironmentUrlDataJson.kt

@@ -45,38 +45,10 @@ data class EnvironmentUrlDataJson(
         val DEFAULT_US: EnvironmentUrlDataJson =
             EnvironmentUrlDataJson(base = "https://vault.bitwarden.com")
 
-        /**
-         * Default [EnvironmentUrlDataJson] for the US region as written to disk by the legacy
-         * Xamarin app.
-         */
-        val DEFAULT_LEGACY_US: EnvironmentUrlDataJson = EnvironmentUrlDataJson(
-            base = "https://vault.bitwarden.com",
-            api = "https://api.bitwarden.com",
-            identity = "https://identity.bitwarden.com",
-            icon = "https://icons.bitwarden.net",
-            notifications = "https://notifications.bitwarden.com",
-            webVault = "https://vault.bitwarden.com",
-            events = "https://events.bitwarden.com",
-        )
-
         /**
          * Default [EnvironmentUrlDataJson] for the EU region.
          */
         val DEFAULT_EU: EnvironmentUrlDataJson =
             EnvironmentUrlDataJson(base = "https://vault.bitwarden.eu")
-
-        /**
-         * Default [EnvironmentUrlDataJson] for the EU region as written to disk by the legacy
-         * Xamarin app.
-         */
-        val DEFAULT_LEGACY_EU: EnvironmentUrlDataJson = EnvironmentUrlDataJson(
-            base = "https://vault.bitwarden.eu",
-            api = "https://api.bitwarden.eu",
-            identity = "https://identity.bitwarden.eu",
-            icon = "https://icons.bitwarden.eu",
-            notifications = "https://notifications.bitwarden.eu",
-            webVault = "https://vault.bitwarden.eu",
-            events = "https://events.bitwarden.eu",
-        )
     }
 }

app/src/main/kotlin/com/bitwarden/authenticator/data/platform/repository/util/EnvironmentUrlDataJsonExtensions.kt

@@ -124,11 +124,9 @@ private val String?.sanitizeUrl: String?
 fun EnvironmentUrlDataJson.toEnvironmentUrls(): Environment =
     when (this) {
         EnvironmentUrlDataJson.DEFAULT_US,
-        EnvironmentUrlDataJson.DEFAULT_LEGACY_US,
             -> Environment.Us
 
         EnvironmentUrlDataJson.DEFAULT_EU,
-        EnvironmentUrlDataJson.DEFAULT_LEGACY_EU,
             -> Environment.Eu
 
         else -> Environment.SelfHosted(environmentUrlData = this)

app/src/test/java/com/bitwarden/authenticator/data/platform/repository/util/EnvironmentUrlsDataJsonExtensionsTest.kt

@@ -246,15 +246,6 @@ class EnvironmentUrlsDataJsonExtensionsTest {
         )
     }
 
-    @Suppress("MaxLineLength")
-    @Test
-    fun `toEnvironmentUrlsOrDefault should correctly convert legacy US urls to the expected type`() {
-        Assertions.assertEquals(
-            com.bitwarden.authenticator.data.platform.repository.model.Environment.Us,
-            EnvironmentUrlDataJson.Companion.DEFAULT_LEGACY_US.toEnvironmentUrlsOrDefault(),
-        )
-    }
-
     @Test
     fun `toEnvironmentUrlsOrDefault should correctly convert EU urls to the expected type`() {
         Assertions.assertEquals(
@@ -263,15 +254,6 @@ class EnvironmentUrlsDataJsonExtensionsTest {
         )
     }
 
-    @Suppress("MaxLineLength")
-    @Test
-    fun `toEnvironmentUrlsOrDefault should correctly convert legacy EU urls to the expected type`() {
-        Assertions.assertEquals(
-            com.bitwarden.authenticator.data.platform.repository.model.Environment.Eu,
-            EnvironmentUrlDataJson.Companion.DEFAULT_LEGACY_EU.toEnvironmentUrlsOrDefault(),
-        )
-    }
-
     @Test
     fun `toEnvironmentUrlsOrDefault should correctly convert custom urls to the expected type`() {
         Assertions.assertEquals(