@ai-matrx/vault 0.1.49 → 0.1.51

package/dist/index.cjs

@@ -435,6 +435,7 @@ function IdentityGate({ identity, children }) {
     setAsking(false);
     return () => {
       activeIdentity.current = null;
+      identity?.cancel?.();
       for (const waiter of waiters.current.splice(0)) waiter.reject(new Error(CANCELLED));
     };
   }, [identityVersion]);
@@ -483,6 +484,7 @@ function IdentityGate({ identity, children }) {
   };
   const settle = (ok) => {
     if (activeIdentity.current !== identityVersion) return;
+    if (!ok) identity?.cancel?.();
     const w = waiters.current;
     waiters.current = [];
     if (ok) confirmationVersion.current += 1;
@@ -492,7 +494,7 @@ function IdentityGate({ identity, children }) {
   };
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Ctx2.Provider, { value: confirmed, children: [
     children,
-    identity ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(ConfirmIdentityDialog, { open: asking, identity, onDone: () => settle(true), onCancel: () => settle(false) }, identityVersion.key) : null,
+    identity && asking ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(ConfirmIdentityDialog, { open: true, identity, onDone: () => settle(true), onCancel: () => settle(false) }, identityVersion.key) : null,
     /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_design_system2.Dialog, { open: returnProblem !== null, onOpenChange: (o) => o ? void 0 : setReturnProblem(null), children: /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_design_system2.DialogContent, { size: "sm", children: [
       /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_design_system2.DialogHeader, { children: [
         /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_design_system2.DialogTitle, { children: "Different account" }),
@@ -504,6 +506,16 @@ function IdentityGate({ identity, children }) {
 }
 var wasCancelled = (e) => e instanceof Error && e.message === CANCELLED;
 function ConfirmIdentityDialog({ open, identity, onDone, onCancel }) {
+  const live = (0, import_react2.useRef)(false);
+  (0, import_react2.useLayoutEffect)(() => {
+    live.current = true;
+    return () => {
+      live.current = false;
+    };
+  }, []);
+  const finish = () => {
+    if (live.current) onDone();
+  };
   const [account10, setAccount] = (0, import_react2.useState)(null);
   const [password, setPassword] = (0, import_react2.useState)("");
   const [code, setCode] = (0, import_react2.useState)("");
@@ -516,18 +528,29 @@ function ConfirmIdentityDialog({ open, identity, onDone, onCancel }) {
     setCode("");
     setCodeSent(false);
     setError(null);
-    identity.account().then(setAccount, (e) => setError(e instanceof Error ? e.message : "Your account could not be read."));
+    let current = true;
+    identity.account().then(
+      (value) => {
+        if (current && live.current) setAccount(value);
+      },
+      (e) => {
+        if (current && live.current) setError(e instanceof Error ? e.message : "Your account could not be read.");
+      }
+    );
+    return () => {
+      current = false;
+    };
   }, [open, identity]);
   const attempt = async (step, done = true) => {
     setBusy(true);
     setError(null);
     try {
       await step();
-      if (done) onDone();
+      if (done) finish();
     } catch (e) {
-      setError(e instanceof Error ? e.message : "That did not work. Try again.");
+      if (live.current) setError(e instanceof Error ? e.message : "That did not work. Try again.");
     } finally {
-      setBusy(false);
+      if (live.current) setBusy(false);
     }
   };
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_design_system2.Dialog, { open, onOpenChange: (o) => o ? void 0 : onCancel(), children: /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_design_system2.DialogContent, { size: "sm", children: [
@@ -550,7 +573,7 @@ function ConfirmIdentityDialog({ open, identity, onDone, onCancel }) {
           variant: identity.dev ? "outline" : "primary",
           disabled: busy,
           onClick: () => void attempt(async () => {
-            if (await identity.withProvider(p) === "confirmed") onDone();
+            if (await identity.withProvider(p) === "confirmed") finish();
           }, false),
           children: [
             "Continue with ",
@@ -574,7 +597,7 @@ function ConfirmIdentityDialog({ open, identity, onDone, onCancel }) {
         /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_controls.Button, { variant: "outline", type: "submit", disabled: busy || !code.trim(), children: "Confirm" })
       ] }) : /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_controls.Button, { variant: "quiet", disabled: busy, onClick: () => void attempt(async () => {
         await identity.sendEmailCode();
-        setCodeSent(true);
+        if (live.current) setCodeSent(true);
       }, false), children: "Email me a code instead" }) : null,
       error ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("p", { role: "alert", className: "text-sm text-destructive", children: error }) : null
     ] })
@@ -2179,8 +2202,10 @@ var import_icons5 = require("@ai-matrx/design-system/icons");
 // src/authenticator/port.ts
 var OTP_SEED_KEY = "totp_seed";
 function mfaMethodOf(item) {
-  const v = item.custom.find((c) => c.key === MFA_METHOD_KEY)?.value;
-  return v === "sms" ? "sms" : v ? "push_or_other" : null;
+  const declarations = item.custom.filter((c) => c.key === MFA_METHOD_KEY);
+  if (declarations.length !== 1) return null;
+  const value = declarations[0]?.value;
+  return value === "sms" || value === "push_or_other" ? value : null;
 }
 
 // src/authenticator/TotpRows.tsx
@@ -5534,7 +5559,7 @@ function withMfaMethod(custom, v) {
   return v === "sms" || v === "push_or_other" ? [...rest, { key: MFA_METHOD_KEY, label: "Two-factor method", value: v }] : rest;
 }
 function DraftTwoFactorRow({ custom, onCustom }) {
-  const value = custom.find((c) => c.key === MFA_METHOD_KEY)?.value || "none";
+  const value = mfaMethodOf({ custom }) ?? "none";
   return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(VaultRow, { label: "Two-factor", children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
     import_controls18.Select,
     {