Upgrade to latest webauthn-server-core

Author: elpete

build/pom.xml

@@ -15,7 +15,7 @@
     <dependency>
         <groupId>com.yubico</groupId>
         <artifactId>webauthn-server-core</artifactId>
-        <version>2.5.2</version>
+        <version>2.6.0</version>
         <scope>compile</scope>
       </dependency>
   </dependencies>

includes/passkeys.js

@@ -288,40 +288,54 @@ const passkeys = {
 		const publicKeyCredential = await webauthnJSON.create(credentialCreateOptions);
 
 		// Return encoded PublicKeyCredential to server
-		await fetch("/cbsecurity/passkeys/registration", {
+		const registrationResponse = await fetch("/cbsecurity/passkeys/registration", {
 			method: "POST",
 			headers: {
 				"Content-Type": "application/json"
 			},
 			body: JSON.stringify({
 				"publicKeyCredentialJson": JSON.stringify(publicKeyCredential)
 			})
-		})
-		window.location = redirectLocation;
+		});
+
+		if (registrationResponse.ok) {
+			window.location = redirectLocation;
+		} else {
+			console.error("cbsecurity-passkeys - Registration failed:", registrationResponse);
+		}
 	},
-	async login(username, redirectLocation = "/") {
-			// Make the call that returns the credentialGetJson above
-			const credentialGetOptions = await fetch("/cbsecurity/passkeys/authentication/new?" + new URLSearchParams({
-				"username": username
-			}))
-				.then(resp => resp.json())
-				.then(json => JSON.parse(json));
+	async login(username, redirectLocation = "/", additionalParams = {}) {
+		if ( !username ) {
+			username = "";
+		}
+		// Make the call that returns the credentialGetJson above
+		const credentialGetOptions = await fetch("/cbsecurity/passkeys/authentication/new?" + new URLSearchParams({
+			...additionalParams,
+			"username": username,
+		}))
+			.then(resp => resp.json())
+			.then(json => JSON.parse(json));
+
+		// Call WebAuthn ceremony using webauthn-json wrapper
+		const publicKeyCredential = await webauthnJSON.get(credentialGetOptions);
 
-			// Call WebAuthn ceremony using webauthn-json wrapper
-			const publicKeyCredential = await webauthnJSON.get(credentialGetOptions);
+		// Return encoded PublicKeyCredential to server
+		const authenticationResponse = await fetch("/cbsecurity/passkeys/authentication", {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json"
+			},
+			body: JSON.stringify({
+				...additionalParams,
+				"publicKeyCredentialJson": JSON.stringify(publicKeyCredential)
+			})
+		});
 
-			// Return encoded PublicKeyCredential to server
-			await fetch("/cbsecurity/passkeys/authentication", {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json"
-				},
-				body: JSON.stringify({
-					"publicKeyCredentialJson": JSON.stringify(publicKeyCredential)
-				})
-			}).then( () => {
-				window.location = redirectLocation;
-			});
+		if (authenticationResponse.ok) {
+			window.location = redirectLocation;
+		} else {
+			console.error("cbsecurity-passkeys - Authentication failed:", authenticationResponse);
+		}
 	},
 };