Add public builder to CredentialPropertiesOutput

Author: emlun

NEWS

@@ -6,6 +6,7 @@ New features:
   `RegistrationResult` and `RegisteredCredential`.
  ** Thanks to Jakob Heher (A-SIT) for the contribution, see
     https://github.com/Yubico/java-webauthn-server/pull/299
+* Added public builder to `CredentialPropertiesOutput`.
 * (Experimental) Added option `isSecurePaymentConfirmation(boolean)` to
   `FinishAssertionOptions`. When set, `RelyingParty.finishAssertion()` will
   adapt the validation logic for a Secure Payment Confirmation (SPC) response

webauthn-server-core/src/main/java/com/yubico/webauthn/data/Extensions.java

@@ -14,6 +14,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import lombok.Builder;
 import lombok.NonNull;
 import lombok.Value;
 import lombok.experimental.UtilityClass;
@@ -63,12 +64,13 @@ public static class CredentialProperties {
      *     Credential Properties Extension (credProps)</a>
      */
     @Value
+    @Builder
     public static class CredentialPropertiesOutput {
       @JsonProperty("rk")
       private final Boolean rk;
 
       @JsonCreator
-      CredentialPropertiesOutput(@JsonProperty("rk") Boolean rk) {
+      private CredentialPropertiesOutput(@JsonProperty("rk") Boolean rk) {
         this.rk = rk;
       }
 

webauthn-server-core/src/test/scala/com/yubico/webauthn/RelyingPartyRegistrationSpec.scala

@@ -52,14 +52,14 @@ import com.yubico.webauthn.data.ByteArray
 import com.yubico.webauthn.data.COSEAlgorithmIdentifier
 import com.yubico.webauthn.data.ClientRegistrationExtensionOutputs
 import com.yubico.webauthn.data.CollectedClientData
+import com.yubico.webauthn.data.Extensions.CredentialProperties.CredentialPropertiesOutput
 import com.yubico.webauthn.data.Extensions.LargeBlob.LargeBlobRegistrationInput.LargeBlobSupport
 import com.yubico.webauthn.data.Extensions.Uvm.UvmEntry
 import com.yubico.webauthn.data.Generators._
 import com.yubico.webauthn.data.PublicKeyCredential
 import com.yubico.webauthn.data.PublicKeyCredentialCreationOptions
 import com.yubico.webauthn.data.PublicKeyCredentialParameters
 import com.yubico.webauthn.data.ReexportHelpers
-import com.yubico.webauthn.data.ReexportHelpers.newCredentialPropertiesOutput
 import com.yubico.webauthn.data.RegistrationExtensionInputs
 import com.yubico.webauthn.data.RelyingPartyIdentity
 import com.yubico.webauthn.data.UserIdentity
@@ -4232,7 +4232,7 @@ class RelyingPartyRegistrationSpec
                     ClientRegistrationExtensionOutputs
                       .builder()
                       .credProps(
-                        newCredentialPropertiesOutput(true)
+                        CredentialPropertiesOutput.builder().rk(true).build()
                       )
                       .build()
                   )
@@ -4255,7 +4255,7 @@ class RelyingPartyRegistrationSpec
                     ClientRegistrationExtensionOutputs
                       .builder()
                       .credProps(
-                        newCredentialPropertiesOutput(false)
+                        CredentialPropertiesOutput.builder().rk(false).build()
                       )
                       .build()
                   )

webauthn-server-core/src/test/scala/com/yubico/webauthn/RelyingPartyV2RegistrationSpec.scala

@@ -52,14 +52,14 @@ import com.yubico.webauthn.data.ByteArray
 import com.yubico.webauthn.data.COSEAlgorithmIdentifier
 import com.yubico.webauthn.data.ClientRegistrationExtensionOutputs
 import com.yubico.webauthn.data.CollectedClientData
+import com.yubico.webauthn.data.Extensions.CredentialProperties.CredentialPropertiesOutput
 import com.yubico.webauthn.data.Extensions.LargeBlob.LargeBlobRegistrationInput.LargeBlobSupport
 import com.yubico.webauthn.data.Extensions.Uvm.UvmEntry
 import com.yubico.webauthn.data.Generators._
 import com.yubico.webauthn.data.PublicKeyCredential
 import com.yubico.webauthn.data.PublicKeyCredentialCreationOptions
 import com.yubico.webauthn.data.PublicKeyCredentialParameters
 import com.yubico.webauthn.data.ReexportHelpers
-import com.yubico.webauthn.data.ReexportHelpers.newCredentialPropertiesOutput
 import com.yubico.webauthn.data.RegistrationExtensionInputs
 import com.yubico.webauthn.data.RelyingPartyIdentity
 import com.yubico.webauthn.data.UserIdentity
@@ -4227,7 +4227,7 @@ class RelyingPartyV2RegistrationSpec
                     ClientRegistrationExtensionOutputs
                       .builder()
                       .credProps(
-                        newCredentialPropertiesOutput(true)
+                        CredentialPropertiesOutput.builder().rk(true).build()
                       )
                       .build()
                   )
@@ -4250,7 +4250,7 @@ class RelyingPartyV2RegistrationSpec
                     ClientRegistrationExtensionOutputs
                       .builder()
                       .credProps(
-                        newCredentialPropertiesOutput(false)
+                        CredentialPropertiesOutput.builder().rk(false).build()
                       )
                       .build()
                   )

webauthn-server-core/src/test/scala/com/yubico/webauthn/data/Generators.scala

@@ -868,7 +868,7 @@ object Generators {
       def credentialPropertiesOutput: Gen[CredentialPropertiesOutput] =
         for {
           rk <- arbitrary[Boolean]
-        } yield new CredentialPropertiesOutput(rk)
+        } yield CredentialPropertiesOutput.builder().rk(rk).build()
     }
 
     object LargeBlob {

webauthn-server-core/src/test/scala/com/yubico/webauthn/data/ReexportHelpers.scala

@@ -1,6 +1,5 @@
 package com.yubico.webauthn.data
 
-import com.yubico.webauthn.data.Extensions.CredentialProperties.CredentialPropertiesOutput
 import com.yubico.webauthn.data.Extensions.LargeBlob.LargeBlobAuthenticationOutput
 import com.yubico.webauthn.data.Extensions.LargeBlob.LargeBlobRegistrationOutput
 
@@ -10,9 +9,6 @@ import com.yubico.webauthn.data.Extensions.LargeBlob.LargeBlobRegistrationOutput
   */
 object ReexportHelpers {
 
-  def newCredentialPropertiesOutput(rk: Boolean): CredentialPropertiesOutput =
-    new CredentialPropertiesOutput(rk)
-
   def newLargeBlobRegistrationOutput(
       supported: Boolean
   ): LargeBlobRegistrationOutput = new LargeBlobRegistrationOutput(supported)