From d2b018c49ab923b383c9794240d64288d775a2ae Mon Sep 17 00:00:00 2001
From: Emil Lundberg <emil@yubico.com>
Date: Thu, 11 Mar 2021 19:53:31 +0100
Subject: [PATCH] Allow PublicKeyCredential JSON to have both id and rawId if
 equal

---
 NEWS                                          |  3 +++
 .../webauthn/data/PublicKeyCredential.java    | 21 +++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index a42a06d88..9728482a0 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,9 @@ Changes:
 
   Note that `webauthn-server-attestation` still depends on BouncyCastle.
 
+* Jackson deserializer for `PublicKeyCredential` now allows a `rawId` property
+  to be present if `id` is not present, or if `rawId` equals `id`.
+
 
 == Version 1.7.0 ==
 
diff --git a/webauthn-server-core/src/main/java/com/yubico/webauthn/data/PublicKeyCredential.java b/webauthn-server-core/src/main/java/com/yubico/webauthn/data/PublicKeyCredential.java
index 426df09b1..f6e8c8f91 100644
--- a/webauthn-server-core/src/main/java/com/yubico/webauthn/data/PublicKeyCredential.java
+++ b/webauthn-server-core/src/main/java/com/yubico/webauthn/data/PublicKeyCredential.java
@@ -84,17 +84,34 @@ public class PublicKeyCredential<A extends AuthenticatorResponse, B extends Clie
 
     @JsonCreator
     private PublicKeyCredential(
-        @NonNull @JsonProperty("id") ByteArray id,
+        @JsonProperty("id") ByteArray id,
+        @JsonProperty("rawId") ByteArray rawId,
         @NonNull @JsonProperty("response") A response,
         @NonNull @JsonProperty("clientExtensionResults") B clientExtensionResults,
         @NonNull @JsonProperty("type") PublicKeyCredentialType type
     ) {
-        this.id = id;
+        if (id == null && rawId == null) {
+            throw new NullPointerException("At least one of \"id\" and \"rawId\" must be non-null.");
+        }
+        if (id != null && rawId != null && !id.equals(rawId)) {
+            throw new IllegalArgumentException(String.format("\"id\" and \"rawId\" are not equal: %s != %s", id, rawId));
+        }
+
+        this.id = id == null ? rawId : id;
         this.response = response;
         this.clientExtensionResults = clientExtensionResults;
         this.type = type;
     }
 
+    private PublicKeyCredential(
+            ByteArray id,
+            @NonNull A response,
+            @NonNull B clientExtensionResults,
+            @NonNull PublicKeyCredentialType type
+    ) {
+        this(id, null, response, clientExtensionResults, type);
+    }
+
     public static <A extends AuthenticatorResponse, B extends ClientExtensionOutputs> PublicKeyCredentialBuilder<A, B>.MandatoryStages builder() {
         return new PublicKeyCredentialBuilder<A, B>().start();
     }