fix: catch fetch error during webauthn authentication

numerique-gouv · Feb 7, 2025 · 99bc601 · 99bc601
1 parent 367f2c7
commit 99bc601
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/assets/js/webauthn-authentication.js b/assets/js/webauthn-authentication.js
@@ -33,12 +33,13 @@ document.addEventListener(
       errorElement.innerText = "";
       beginElement.disabled = true;
 
-      // GET registration options from the endpoint that calls
-      // @simplewebauthn/server -> generateRegistrationOptions()
-      const authOptions = await fetch(authOptionsUrl);
-
       let asseResp;
+
       try {
+        // GET registration options from the endpoint that calls
+        // @simplewebauthn/server -> generateRegistrationOptions()
+        const authOptions = await fetch(authOptionsUrl);
+
         // Pass the options to the authenticator and wait for a response
         asseResp = await startAuthentication(await authOptions.json());
       } catch (error) {
@@ -66,8 +67,9 @@ document.addEventListener(
       const hasNotification = urlParams.get("notification") !== null;
 
       if (!hasNotification) {
-        const authOptions = await fetch(authOptionsUrl);
         try {
+          const authOptions = await fetch(authOptionsUrl);
+
           let asseResp = await startAuthentication(
             await authOptions.json(),
             true,
@@ -78,6 +80,7 @@ document.addEventListener(
           authenticationResponseForm.requestSubmit();
         } catch (e) {
           // fail silently
+          console.error(e);
         }
       }
     };

diff --git a/assets/js/webauthn-registration.js b/assets/js/webauthn-registration.js
@@ -32,12 +32,13 @@ document.addEventListener(
       clearDisplay();
       beginElement.disabled = true;
 
-      // GET registration options from the endpoint that calls
-      // @simplewebauthn/server -> generateRegistrationOptions()
-      const resp = await fetch("/api/webauthn/generate-registration-options");
-
       let attResp;
+
       try {
+        // GET registration options from the endpoint that calls
+        // @simplewebauthn/server -> generateRegistrationOptions()
+        const resp = await fetch("/api/webauthn/generate-registration-options");
+
         // Pass the options to the authenticator and wait for a response
         attResp = await startRegistration(await resp.json());
       } catch (error) {