@orangecheck/auth-client 2.1.0 → 2.1.1

package/dist/index.mjs

@@ -1279,12 +1279,21 @@ function useWebAuthnRegister(opts) {
         });
         const optsBody = await optsRes.json();
         if (!optsRes.ok || !optsBody.ok || !optsBody.options || !optsBody.challenge_token) {
-          throw new Error(optsBody.reason ?? `options_failed_${optsRes.status}`);
+          const reason = optsBody.reason ?? `options_failed_${optsRes.status}`;
+          setError(new Error(reason));
+          setStatus("error");
+          return { ok: false, reason };
         }
         setStatus("authenticating");
-        const attestation = await startRegistration({
-          optionsJSON: optsBody.options
-        });
+        let attestation;
+        try {
+          attestation = await startRegistration({ optionsJSON: optsBody.options });
+        } catch (e) {
+          const reason = isAbortError(e) ? "cancelled" : e.message;
+          setError(new Error(reason));
+          setStatus("error");
+          return { ok: false, reason };
+        }
         setStatus("verifying");
         const verifyRes = await fetch(`${authOrigin}/api/auth/webauthn/register/verify`, {
           method: "POST",
@@ -1298,18 +1307,18 @@ function useWebAuthnRegister(opts) {
         });
         const verifyBody = await verifyRes.json();
         if (!verifyRes.ok || !verifyBody.ok || !verifyBody.credential) {
-          throw new Error(verifyBody.reason ?? `verify_failed_${verifyRes.status}`);
+          const reason = verifyBody.reason ?? `verify_failed_${verifyRes.status}`;
+          setError(new Error(reason));
+          setStatus("error");
+          return { ok: false, reason };
         }
         setStatus("success");
-        return verifyBody.credential;
+        return { ok: true, credential: verifyBody.credential };
       } catch (e) {
-        const err = e instanceof Error ? e : new Error(String(e));
-        setError(err);
+        const reason = e instanceof Error ? e.message : String(e);
+        setError(new Error(reason));
         setStatus("error");
-        if (isAbortError(err)) {
-          setError(new Error("cancelled"));
-        }
-        return null;
+        return { ok: false, reason };
       }
     },
     [authOrigin]
@@ -1421,12 +1430,21 @@ function useStepUpAuth(opts) {
         });
         const optsBody = await optsRes.json();
         if (!optsRes.ok || !optsBody.ok || !optsBody.options || !optsBody.challenge_token) {
-          throw new Error(optsBody.reason ?? `options_failed_${optsRes.status}`);
+          const reason = optsBody.reason ?? `options_failed_${optsRes.status}`;
+          setError(new Error(reason));
+          setStatus("error");
+          return { ok: false, reason };
         }
         setStatus("authenticating");
-        const assertion = await startAuthentication({
-          optionsJSON: optsBody.options
-        });
+        let assertion;
+        try {
+          assertion = await startAuthentication({ optionsJSON: optsBody.options });
+        } catch (e) {
+          const reason = isAbortError(e) ? "cancelled" : e.message;
+          setError(new Error(reason));
+          setStatus("error");
+          return { ok: false, reason };
+        }
         setStatus("verifying");
         const verifyRes = await fetch(
           `${authOrigin}/api/auth/webauthn/assertion/verify`,
@@ -1442,16 +1460,19 @@ function useStepUpAuth(opts) {
         );
         const verifyBody = await verifyRes.json();
         if (!verifyRes.ok || !verifyBody.ok || typeof verifyBody.step_up_at !== "number") {
-          throw new Error(verifyBody.reason ?? `verify_failed_${verifyRes.status}`);
+          const reason = verifyBody.reason ?? `verify_failed_${verifyRes.status}`;
+          setError(new Error(reason));
+          setStatus("error");
+          return { ok: false, reason };
         }
         await refresh();
         setStatus("success");
-        return { step_up_at: verifyBody.step_up_at };
+        return { ok: true, step_up_at: verifyBody.step_up_at };
       } catch (e) {
-        const err = isAbortError(e) ? new Error("cancelled") : e instanceof Error ? e : new Error(String(e));
-        setError(err);
+        const reason = e instanceof Error ? e.message : String(e);
+        setError(new Error(reason));
         setStatus("error");
-        return null;
+        return { ok: false, reason };
       }
     },
     [authOrigin, refresh]