@calimero-network/mero-js 29.7.3 → 29.7.5

package/dist/index.mjs

@@ -1379,6 +1379,13 @@ var ConfirmCancelled = class extends Error {
     this.name = "ConfirmCancelled";
   }
 };
+var ConfirmPromptBlocked = class extends Error {
+  constructor(cause) {
+    super("the passkey prompt was blocked by the browser or a password manager");
+    this.cause = cause;
+    this.name = "ConfirmPromptBlocked";
+  }
+};
 var ArgsTooLarge = class extends CalimeroError {
   constructor(message, details = {}) {
     super(413, "ARGS_TOO_LARGE", message, details);
@@ -1587,19 +1594,13 @@ function cancelled(message) {
 }
 async function ask(method, options) {
   const container = navigator.credentials;
-  const page = container[method];
-  try {
-    return await page.call(container, options);
-  } catch (error) {
-    const own = globalThis.CredentialsContainer?.prototype?.[method];
-    if (!own || own === page || !stuck(error)) throw error;
-    return own.call(container, options);
-  }
+  const own = globalThis.CredentialsContainer?.prototype?.[method];
+  const call = own ?? container[method];
+  return call.call(container, options);
 }
-function stuck(error) {
-  return /request is already pending/i.test(
-    error?.message?.toString() ?? ""
-  );
+function es256First(params) {
+  const es256 = params.filter((p) => p.alg === -7);
+  return es256.length ? es256 : params;
 }
 function browserPasskey() {
   return {
@@ -1610,7 +1611,7 @@ function browserPasskey() {
           challenge: buf(fromB64url(o.challenge)),
           rp: o.rp,
           user: { ...o.user, id: buf(fromB64url(o.user.id)) },
-          pubKeyCredParams: o.pubKeyCredParams,
+          pubKeyCredParams: es256First(o.pubKeyCredParams),
           excludeCredentials: (o.excludeCredentials ?? []).map((c) => ({
             type: c.type,
             id: buf(fromB64url(c.id))
@@ -1627,12 +1628,12 @@ function browserPasskey() {
         clientDataJson: b64url(new Uint8Array(r.clientDataJSON))
       };
     },
-    async get(challenge, rpId, allowCredentials) {
+    async get(challenge, rpId, allowCredentials, options) {
       const cred = await ask("get", {
         publicKey: {
           challenge: buf(challenge),
           rpId,
-          userVerification: "preferred",
+          userVerification: options?.userVerification ?? "preferred",
           allowCredentials: (allowCredentials ?? []).map((id) => ({
             type: "public-key",
             id: buf(fromB64url(id))
@@ -1856,6 +1857,19 @@ function pageDeployment(href) {
     return null;
   }
 }
+function userVerificationOf(named) {
+  return named === "required" || named === "preferred" || named === "discouraged" ? named : "required";
+}
+function promptFailure(error) {
+  const e = error;
+  const name = e?.name;
+  const message = typeof e?.message === "string" ? e.message : "";
+  if (name === "InvalidStateError" || /not focused|already pending/i.test(message)) {
+    return new ConfirmPromptBlocked(error);
+  }
+  if (name === "NotAllowedError" || name === "AbortError") return new ConfirmCancelled(error);
+  return error;
+}
 function seg(value) {
   return encodeURIComponent(value);
 }
@@ -2633,11 +2647,11 @@ var CalimeroClient = class _CalimeroClient {
       const d = error.details;
       let assertion;
       try {
-        assertion = await passkey.get(fromB64url(d.challenge), d.rpId, d.allowCredentials);
+        assertion = await passkey.get(fromB64url(d.challenge), d.rpId, d.allowCredentials, {
+          userVerification: userVerificationOf(d.userVerification)
+        });
       } catch (declined) {
-        const name = declined?.name;
-        if (name === "NotAllowedError" || name === "AbortError") throw new ConfirmCancelled(declined);
-        throw declined;
+        throw promptFailure(declined);
       }
       return send({ ...body, confirm: { challengeId: d.challengeId, assertion } });
     }
@@ -3629,6 +3643,7 @@ export {
   CalimeroError,
   ClusterNotUpgraded,
   ConfirmCancelled,
+  ConfirmPromptBlocked,
   ConfirmRequired,
   ConsentStale,
   DEFAULT_COLLATERAL_MIRROR,