From a6bc90ccdb0b9c3ebc47e2be87969dfdb6f938b4 Mon Sep 17 00:00:00 2001
From: Artem Chepurnyi <mail@artemchep.com>
Date: Wed, 24 Jul 2024 10:20:39 +0300
Subject: [PATCH] fix: Migrate to /identity/accounts/prelogin endpoint

---
 .../provider/bitwarden/api/builder/ServerEnvApi.kt       | 2 --
 .../bitwarden/api/builder/ServerEnvNotifications.kt      | 9 +++++++++
 .../artemchep/keyguard/provider/bitwarden/api/login.kt   | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/builder/ServerEnvApi.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/builder/ServerEnvApi.kt
index a6d6cff..b75e53c 100644
--- a/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/builder/ServerEnvApi.kt
+++ b/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/builder/ServerEnvApi.kt
@@ -88,8 +88,6 @@ value class ServerEnvApi @Deprecated("Use the [ServerEnv.api] property instead."
     value class Accounts(
         private val url: String,
     ) {
-        val prelogin get() = url + "prelogin"
-
         /**
          * Send a PUT request to change the avatar
          * color of the account.
diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/builder/ServerEnvNotifications.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/builder/ServerEnvNotifications.kt
index 0bbc596..27055a4 100644
--- a/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/builder/ServerEnvNotifications.kt
+++ b/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/builder/ServerEnvNotifications.kt
@@ -14,12 +14,21 @@ value class ServerEnvIdentity @Deprecated("Use the [ServerEnv.identity] property
 ) {
     val connect get() = Connect(url = url + "connect/")
 
+    val accounts get() = Accounts(url = url + "accounts/")
+
     @JvmInline
     value class Connect(
         private val url: String,
     ) {
         val token get() = url + "token"
     }
+
+    @JvmInline
+    value class Accounts(
+        private val url: String,
+    ) {
+        val prelogin get() = url + "prelogin"
+    }
 }
 
 @Suppress("DEPRECATION")
diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/login.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/login.kt
index da05f11..f53dae9 100644
--- a/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/login.kt
+++ b/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/login.kt
@@ -280,7 +280,7 @@ private suspend fun prelogin(
     env: ServerEnv,
     email: String,
 ): PreLogin = httpClient
-    .post(env.api.accounts.prelogin) {
+    .post(env.identity.accounts.prelogin) {
         headers(env)
         contentType(ContentType.Application.Json)
         setBody(