From 35cef94e9cb24407fedae4dd571d9a1b74f4e72a Mon Sep 17 00:00:00 2001
From: Emil Lundberg <emil@yubico.com>
Date: Thu, 16 Jan 2025 14:52:58 +0100
Subject: [PATCH] fixup! fixup! Revert new experimental interfaces and classes

---
 .../webauthn/RelyingPartyAssertionSpec.scala  | 74 +++++++++----------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/webauthn-server-core/src/test/scala/com/yubico/webauthn/RelyingPartyAssertionSpec.scala b/webauthn-server-core/src/test/scala/com/yubico/webauthn/RelyingPartyAssertionSpec.scala
index 8e1eb804d..5c1755947 100644
--- a/webauthn-server-core/src/test/scala/com/yubico/webauthn/RelyingPartyAssertionSpec.scala
+++ b/webauthn-server-core/src/test/scala/com/yubico/webauthn/RelyingPartyAssertionSpec.scala
@@ -1662,25 +1662,24 @@ class RelyingPartyAssertionSpec
                 backupFlagsGen = arbitrary[Boolean].map(bs => (true, bs)),
               )
             ) { authData =>
-              val step: FinishAssertionSteps#PendingStep16 =
-                finishAssertion(
-                  authenticatorData = authData,
-                  credentialRepository = Some(
-                    Helpers.CredentialRepository.withUser(
-                      Defaults.user,
-                      RegisteredCredential
-                        .builder()
-                        .credentialId(Defaults.credentialId)
-                        .userHandle(Defaults.userHandle)
-                        .publicKeyCose(
-                          getPublicKeyBytes(Defaults.credentialKey)
-                        )
-                        .backupEligible(false)
-                        .backupState(false)
-                        .build(),
-                    )
-                  ),
-                ).begin.next.next.next.next.next.next.next.next.next.next.next.next
+              val step: FinishAssertionSteps#PendingStep16 = finishAssertion(
+                authenticatorData = authData,
+                credentialRepository = Some(
+                  Helpers.CredentialRepository.withUser(
+                    Defaults.user,
+                    RegisteredCredential
+                      .builder()
+                      .credentialId(Defaults.credentialId)
+                      .userHandle(Defaults.userHandle)
+                      .publicKeyCose(
+                        getPublicKeyBytes(Defaults.credentialKey)
+                      )
+                      .backupEligible(false)
+                      .backupState(false)
+                      .build(),
+                  )
+                ),
+              ).begin.next.next.next.next.next.next.next.next.next.next.next.next
 
               step.validations shouldBe a[Failure[_]]
               step.validations.failed.get shouldBe an[IllegalArgumentException]
@@ -1700,25 +1699,24 @@ class RelyingPartyAssertionSpec
               arbitrary[Boolean],
             ) {
               case (authData, storedBs) =>
-                val step: FinishAssertionSteps#PendingStep16 =
-                  finishAssertion(
-                    authenticatorData = authData,
-                    credentialRepository = Some(
-                      Helpers.CredentialRepository.withUser(
-                        Defaults.user,
-                        RegisteredCredential
-                          .builder()
-                          .credentialId(Defaults.credentialId)
-                          .userHandle(Defaults.userHandle)
-                          .publicKeyCose(
-                            getPublicKeyBytes(Defaults.credentialKey)
-                          )
-                          .backupEligible(true)
-                          .backupState(storedBs)
-                          .build(),
-                      )
-                    ),
-                  ).begin.next.next.next.next.next.next.next.next.next.next.next.next
+                val step: FinishAssertionSteps#PendingStep16 = finishAssertion(
+                  authenticatorData = authData,
+                  credentialRepository = Some(
+                    Helpers.CredentialRepository.withUser(
+                      Defaults.user,
+                      RegisteredCredential
+                        .builder()
+                        .credentialId(Defaults.credentialId)
+                        .userHandle(Defaults.userHandle)
+                        .publicKeyCose(
+                          getPublicKeyBytes(Defaults.credentialKey)
+                        )
+                        .backupEligible(true)
+                        .backupState(storedBs)
+                        .build(),
+                    )
+                  ),
+                ).begin.next.next.next.next.next.next.next.next.next.next.next.next
 
                 step.validations shouldBe a[Failure[_]]
                 step.validations.failed.get shouldBe an[