From 709f5db0e5d0b86806c45f9a54c9e57ffdb19b97 Mon Sep 17 00:00:00 2001 From: Tran Ngoc Nhan Date: Mon, 2 Jun 2025 16:18:25 +0700 Subject: [PATCH] Polish Webauthn4JRelyingPartyOperations Signed-off-by: Tran Ngoc Nhan --- .../management/Webauthn4JRelyingPartyOperations.java | 5 +---- .../management/Webauthn4jRelyingPartyOperationsTests.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/web/src/main/java/org/springframework/security/web/webauthn/management/Webauthn4JRelyingPartyOperations.java b/web/src/main/java/org/springframework/security/web/webauthn/management/Webauthn4JRelyingPartyOperations.java index 59d0729288..74ea3fa5f6 100644 --- a/web/src/main/java/org/springframework/security/web/webauthn/management/Webauthn4JRelyingPartyOperations.java +++ b/web/src/main/java/org/springframework/security/web/webauthn/management/Webauthn4JRelyingPartyOperations.java @@ -199,7 +199,7 @@ public class Webauthn4JRelyingPartyOperations implements WebAuthnRelyingPartyOpe } private static List credentialDescriptors(List credentialRecords) { - List result = new ArrayList(); + List result = new ArrayList<>(); for (CredentialRecord credentialRecord : credentialRecords) { Bytes id = Bytes.fromBase64(credentialRecord.getCredentialId().toBase64UrlString()); PublicKeyCredentialDescriptor credentialDescriptor = PublicKeyCredentialDescriptor.builder() @@ -372,9 +372,6 @@ public class Webauthn4JRelyingPartyOperations implements WebAuthnRelyingPartyOpe Authenticator authenticator = new AuthenticatorImpl(data, attestationObject.getAttestationStatement(), credentialRecord.getSignatureCount()); - if (authenticator == null) { - throw new IllegalStateException("No authenticator found"); - } Set origins = toOrigins(); Challenge challenge = new DefaultChallenge(requestOptions.getChallenge().getBytes()); // FIXME: should populate this diff --git a/web/src/test/java/org/springframework/security/web/webauthn/management/Webauthn4jRelyingPartyOperationsTests.java b/web/src/test/java/org/springframework/security/web/webauthn/management/Webauthn4jRelyingPartyOperationsTests.java index 57c551c215..5b4ca74145 100644 --- a/web/src/test/java/org/springframework/security/web/webauthn/management/Webauthn4jRelyingPartyOperationsTests.java +++ b/web/src/test/java/org/springframework/security/web/webauthn/management/Webauthn4jRelyingPartyOperationsTests.java @@ -138,7 +138,7 @@ class Webauthn4jRelyingPartyOperationsTests { @Test void createPublicKeyCredentialCreationOptionsWhenAnonymousThenIllegalArgumentException() { AnonymousAuthenticationToken anonymous = new AnonymousAuthenticationToken("key", "notAuthenticated", - Set.of(() -> "ROLE_ANOYMOUS")); + Set.of(() -> "ROLE_ANONYMOUS")); assertThatIllegalArgumentException() .isThrownBy(() -> this.rpOperations.createPublicKeyCredentialCreationOptions( new ImmutablePublicKeyCredentialCreationOptionsRequest(anonymous)));