From b0c7995cb7564e612295a2fac2c7dbcf68dd98d5 Mon Sep 17 00:00:00 2001
From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com>
Date: Mon, 18 Aug 2025 13:31:59 -0400
Subject: [PATCH] Support both camel and pascal case for AccountKeysJson
 (#5724)

---
 .../network/model/AccountKeysJson.kt          | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/network/src/main/kotlin/com/bitwarden/network/model/AccountKeysJson.kt b/network/src/main/kotlin/com/bitwarden/network/model/AccountKeysJson.kt
index 45f9cf22e5..d7c95fdb30 100644
--- a/network/src/main/kotlin/com/bitwarden/network/model/AccountKeysJson.kt
+++ b/network/src/main/kotlin/com/bitwarden/network/model/AccountKeysJson.kt
@@ -1,7 +1,9 @@
 package com.bitwarden.network.model
 
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonNames
 
 /**
  * Represents private keys in the vault response.
@@ -10,15 +12,19 @@ import kotlinx.serialization.Serializable
  * @property publicKeyEncryptionKeyPair The public key encryption key pair of the profile.
  * @property securityState The security state of the profile (nullable).
  */
+@OptIn(ExperimentalSerializationApi::class)
 @Serializable
 data class AccountKeysJson(
-    @SerialName("signatureKeyPair")
+    @SerialName("SignatureKeyPair")
+    @JsonNames("signatureKeyPair")
     val signatureKeyPair: SignatureKeyPair?,
 
-    @SerialName("publicKeyEncryptionKeyPair")
+    @SerialName("PublicKeyEncryptionKeyPair")
+    @JsonNames("publicKeyEncryptionKeyPair")
     val publicKeyEncryptionKeyPair: PublicKeyEncryptionKeyPair,
 
-    @SerialName("securityState")
+    @SerialName("SecurityState")
+    @JsonNames("securityState")
     val securityState: SecurityState?,
 ) {
 
@@ -30,10 +36,12 @@ data class AccountKeysJson(
      */
     @Serializable
     data class SignatureKeyPair(
-        @SerialName("wrappedSigningKey")
+        @SerialName("WrappedSigningKey")
+        @JsonNames("wrappedSigningKey")
         val wrappedSigningKey: String,
 
-        @SerialName("verifyingKey")
+        @SerialName("VerifyingKey")
+        @JsonNames("verifyingKey")
         val verifyingKey: String,
     )
 
@@ -48,13 +56,16 @@ data class AccountKeysJson(
      */
     @Serializable
     data class PublicKeyEncryptionKeyPair(
-        @SerialName("wrappedPrivateKey")
+        @SerialName("WrappedPrivateKey")
+        @JsonNames("wrappedPrivateKey")
         val wrappedPrivateKey: String,
 
-        @SerialName("publicKey")
+        @SerialName("PublicKey")
+        @JsonNames("publicKey")
         val publicKey: String,
 
-        @SerialName("signedPublicKey")
+        @SerialName("SignedPublicKey")
+        @JsonNames("signedPublicKey")
         val signedPublicKey: String?,
     )
 
@@ -66,10 +77,12 @@ data class AccountKeysJson(
      */
     @Serializable
     data class SecurityState(
-        @SerialName("securityState")
+        @SerialName("SecurityState")
+        @JsonNames("securityState")
         val securityState: String,
 
-        @SerialName("securityVersion")
+        @SerialName("SecurityVersion")
+        @JsonNames("securityVersion")
         val securityVersion: Int,
     )
 }