@calimero-network/mero-js 29.7.3 → 29.7.4

package/README.md

@@ -110,7 +110,7 @@ Pinned measurements go through `policy.verifyQuote` (`createQuoteVerifier`).
 - **Operator** (ops token): `opsApps`, `opsOrgs`, `opsServedOrigins` (every custom domain the log holds, by package label), `setReleaseDeadline`, `liftReleaseDeadline`.
 - **Any route**: `get`, `post`, `put`, `delete`; `postConfirmed` and `deleteConfirmed` answer a `412 CONFIRM_REQUIRED` with a passkey.
 
-Refusals are typed (`LoginRequired`, `PasskeyUnknownHere`, `WrongNode`, `NotFound`, `ConfirmRequired`, `ConfirmCancelled`,
+Refusals are typed (`LoginRequired`, `PasskeyUnknownHere`, `WrongNode`, `NotFound`, `ConfirmRequired`, `ConfirmCancelled`, `ConfirmPromptBlocked`,
 `ArgsTooLarge`, `IdempotencyMismatch`, `ReleaseDeadlineError`, `ConsentStale`, `AppError`, `TrapError`,
 `UnavailableError`, `OriginNotRegistered`, `BadOrigin`, `OriginTaken`, `QuotaExceeded`),
 all extending `CalimeroError` with the node's `status` and `code`. A `401` once

package/dist/cloud-v2/client.d.ts

@@ -12,7 +12,7 @@
 import { type AttestationDoc, type CloudPolicy } from './attestation.js';
 import { type PasskeyProvider } from './passkey.js';
 import { type AppsReport, type ConsentRequest, type ConsentResult, type ConsentStarted, type OpenConsentOptions, type OpsAppsReport, type OpsOrgsReport, type PageOptions, type PendingApprovals, type PublisherBindingInfo, type PublisherProof, type ReleaseRules } from './approvals.js';
-export { AppError, ArgsTooLarge, BadOrigin, CalimeroError, ConfirmCancelled, ConfirmRequired, IdempotencyMismatch, LoginRequired, ConsentStale, NotFound, OriginNotRegistered, OriginTaken, PasskeyUnknownHere, QuotaExceeded, RecoveryNotReady, ReleaseDeadlineError, SignUpRefused, TrapError, UnavailableError, WrongNode, WrongRecoveryCode, errorFrom, } from './errors.js';
+export { AppError, ArgsTooLarge, BadOrigin, CalimeroError, ConfirmCancelled, ConfirmPromptBlocked, ConfirmRequired, IdempotencyMismatch, LoginRequired, ConsentStale, NotFound, OriginNotRegistered, OriginTaken, PasskeyUnknownHere, QuotaExceeded, RecoveryNotReady, ReleaseDeadlineError, SignUpRefused, TrapError, UnavailableError, WrongNode, WrongRecoveryCode, errorFrom, } from './errors.js';
 export type { Committed, SignUpRefusal } from './errors.js';
 export interface CalimeroSession {
     accountId: string;

package/dist/cloud-v2/client.js

@@ -12,11 +12,11 @@
 import { SealedTransportError, createSealedFetch } from '../sealed/sealed.js';
 import { fetchAttestedKey } from './attestation.js';
 import { DEFAULT_DIRECTORY, orderNodes, readDirectory } from './directory.js';
-import { CalimeroError, ConfirmCancelled, ConfirmRequired, LoginRequired, OriginNotRegistered, UnavailableError, WrongNode, WrongRecoveryCode, errorFrom, } from './errors.js';
+import { CalimeroError, ConfirmCancelled, ConfirmPromptBlocked, ConfirmRequired, LoginRequired, OriginNotRegistered, UnavailableError, WrongNode, WrongRecoveryCode, errorFrom, } from './errors.js';
 import { b64url, fromB64url } from './passkey.js';
 import { signRecovery } from './recovery.js';
 import { confirmationCode, pageQuery, pendingApprovalsFrom, } from './approvals.js';
-export { AppError, ArgsTooLarge, BadOrigin, CalimeroError, ConfirmCancelled, ConfirmRequired, IdempotencyMismatch, LoginRequired, ConsentStale, NotFound, OriginNotRegistered, OriginTaken, PasskeyUnknownHere, QuotaExceeded, RecoveryNotReady, ReleaseDeadlineError, SignUpRefused, TrapError, UnavailableError, WrongNode, WrongRecoveryCode, errorFrom, } from './errors.js';
+export { AppError, ArgsTooLarge, BadOrigin, CalimeroError, ConfirmCancelled, ConfirmPromptBlocked, ConfirmRequired, IdempotencyMismatch, LoginRequired, ConsentStale, NotFound, OriginNotRegistered, OriginTaken, PasskeyUnknownHere, QuotaExceeded, RecoveryNotReady, ReleaseDeadlineError, SignUpRefused, TrapError, UnavailableError, WrongNode, WrongRecoveryCode, errorFrom, } from './errors.js';
 /** A deployer's key, as `GET /deployers` lists it and `DELETE /deployers/{key}` takes it. */
 export function deployerKey(deployer) {
     return 'account' in deployer ? `account:${deployer.account}` : `org:${deployer.org}`;
@@ -55,6 +55,33 @@ export function pageDeployment(href) {
         return null;
     }
 }
+/**
+ * The user verification a confirmation asks the passkey for: what the node's
+ * `412` details name, if it names one WebAuthn knows, else `required` (the
+ * node takes a confirmation only with the user verified).
+ */
+function userVerificationOf(named) {
+    return named === 'required' || named === 'preferred' || named === 'discouraged' ? named : 'required';
+}
+/**
+ * What a failed confirmation prompt means to the caller. The browser or a
+ * password manager refusing to show the prompt (the page not focused because
+ * an extension's popup still holds focus, or another prompt still open) is
+ * {@link ConfirmPromptBlocked}; the user dismissing it (`NotAllowedError`, or
+ * `AbortError` when it was aborted) is {@link ConfirmCancelled}; anything
+ * else is a real failure, passed through.
+ */
+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;
+}
 /** One URL path segment, so an id cannot reach another route. */
 function seg(value) {
     return encodeURIComponent(value);
@@ -891,15 +918,15 @@ export class CalimeroClient {
             const d = error.details;
             let assertion;
             try {
-                assertion = await passkey.get(fromB64url(d.challenge), d.rpId, d.allowCredentials);
+                // The node takes a confirmation only with the user verified (PIN or
+                // biometric); `preferred` lets a password manager skip it, and the
+                // node then refuses. A requirement the node names itself wins.
+                assertion = await passkey.get(fromB64url(d.challenge), d.rpId, d.allowCredentials, {
+                    userVerification: userVerificationOf(d.userVerification),
+                });
             }
             catch (declined) {
-                // WebAuthn rejects a prompt the user dismissed with `NotAllowedError`
-                // (`AbortError` when it was aborted); anything else is a real failure.
-                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 } });
         }

package/dist/cloud-v2/errors.d.ts

@@ -86,6 +86,18 @@ export declare class ConfirmCancelled extends Error {
     readonly cause?: unknown;
     constructor(cause?: unknown);
 }
+/**
+ * The browser or a password manager refused to show the passkey prompt a
+ * confirmation asked for: the page was not focused (an extension's popup
+ * still held focus), or another prompt was still open. The user did not
+ * decline; nothing was sent. Ask them to try again from a click, e.g. "Your
+ * password manager or browser blocked the second prompt. Click to try again."
+ * `cause` is the browser's error.
+ */
+export declare class ConfirmPromptBlocked extends Error {
+    readonly cause?: unknown;
+    constructor(cause?: unknown);
+}
 /** `413 ARGS_TOO_LARGE`: the call's arguments are over the node's limit; it did not run. */
 export declare class ArgsTooLarge extends CalimeroError {
     constructor(message: string, details?: Record<string, unknown>);

package/dist/cloud-v2/errors.js

@@ -107,6 +107,21 @@ export class ConfirmCancelled extends Error {
         this.name = 'ConfirmCancelled';
     }
 }
+/**
+ * The browser or a password manager refused to show the passkey prompt a
+ * confirmation asked for: the page was not focused (an extension's popup
+ * still held focus), or another prompt was still open. The user did not
+ * decline; nothing was sent. Ask them to try again from a click, e.g. "Your
+ * password manager or browser blocked the second prompt. Click to try again."
+ * `cause` is the browser's error.
+ */
+export class ConfirmPromptBlocked extends Error {
+    constructor(cause) {
+        super('the passkey prompt was blocked by the browser or a password manager');
+        this.cause = cause;
+        this.name = 'ConfirmPromptBlocked';
+    }
+}
 /** `413 ARGS_TOO_LARGE`: the call's arguments are over the node's limit; it did not run. */
 export class ArgsTooLarge extends CalimeroError {
     constructor(message, details = {}) {

package/dist/cloud-v2/index.d.ts

@@ -1,14 +1,14 @@
 export { CalimeroClient, deployerKey, frontendManifest, pageDeployment } from './client.js';
 export { DEFAULT_DIRECTORY, DirectoryError } from './directory.js';
 export type { DirectoryFailure } from './directory.js';
-export { AppError, ArgsTooLarge, BadOrigin, CalimeroError, ClusterNotUpgraded, ConfirmCancelled, ConfirmRequired, IdempotencyMismatch, LoginRequired, ConsentStale, NotFound, NotServing, OriginNotRegistered, OriginTaken, PasskeyUnknownHere, QuotaExceeded, RecoveryNotReady, ReleaseDeadlineError, SignUpRefused, TrapError, UnavailableError, WrongNode, WrongRecoveryCode, errorFrom, } from './errors.js';
+export { AppError, ArgsTooLarge, BadOrigin, CalimeroError, ClusterNotUpgraded, ConfirmCancelled, ConfirmPromptBlocked, ConfirmRequired, IdempotencyMismatch, LoginRequired, ConsentStale, NotFound, NotServing, OriginNotRegistered, OriginTaken, PasskeyUnknownHere, QuotaExceeded, RecoveryNotReady, ReleaseDeadlineError, SignUpRefused, TrapError, UnavailableError, WrongNode, WrongRecoveryCode, errorFrom, } from './errors.js';
 export type { Committed, SignUpRefusal } from './errors.js';
 export type { AppInfo, AppXcalls, BlobContent, BlobInfo, DeadLetter, Deployer, DeployerGrant, DeployersInfo, DeploymentInfo, DeploymentOffer, DeploymentOrgs, FrontendManifest, MeInfo, PackageOrigin, PackageOriginAdded, PackageOriginRemoved, PackageOrigins, ServedOrigin, ServedOrigins, SignInOptions, AccountRecovery, SignUpOptions, SignUpPolicy, PublicDeployment, CallResult, CalimeroClientOptions, CalimeroConnectOptions, CloudEvent, CalimeroSession, PackageInfo, PackageInstalled, CloudRetryOptions, OrgInfo, OrgRecovery, RecoveryTimes, OrgUpgradeTarget, PresenceEntry, UpgradeRun, ViewResult, } from './client.js';
 export { claimedRelease, fetchAttestedKey, freshCollateral, MOCK_QUOTE_HEADER } from './attestation.js';
 export type { AttestationDoc, CloudPolicy, CloudReleasePolicy } from './attestation.js';
 export { browserPasskey, b64url, fromB64url } from './passkey.js';
 export { MAX_RECOVERY_NONCE_BYTES, RECOVERY_DOMAIN, newRecoverySeed, parseRecoverySeed, recoveryMessage, recoveryPublicKey, recoverySeedText, signRecovery, } from './recovery.js';
-export type { AssertionJSON, PasskeyProvider, RegistrationJSON } from './passkey.js';
+export type { AssertionJSON, PasskeyGetOptions, PasskeyProvider, PasskeyUserVerification, RegistrationJSON, } from './passkey.js';
 export { MAX_REPORT_PAGE, RELEASE_VERIFIER, compareVersions, confirmationCode, consentReturn, pageQuery, pendingApprovalsFrom, publisherBindingBytes, publisherBindingMessage, releaseConsent, releaseNotesUrl, stalledBy, upgradeConsent, verifyReleaseUrl, withdrawConsent, } from './approvals.js';
 export type { ActorKind, AppsReport, Authority, ClusterRelease, ConsentReleaseModel, ConsentRequest, ConsentResult, ConsentScope, ConsentStarted, ConsentStatus, OpenConsentOptions, Governance, LastUpgrade, OpsAppsReport, OpsOrgsReport, PageOptions, PendingApprovals, PendingRelease, PendingUpgrade, PublisherBindingInfo, PublisherProof, ReleaseDeadline, ReleaseRules, ReportScope, ReportedApp, ReportedBundle, ReportedRelease, ReportedReplica, UpgradeAuthority, } from './approvals.js';
 export { DEFAULT_ORG_CAPABILITIES, ORG_CAPABILITIES, orgCapabilities } from './capabilities.js';

package/dist/cloud-v2/index.js

@@ -1,6 +1,6 @@
 export { CalimeroClient, deployerKey, frontendManifest, pageDeployment } from './client.js';
 export { DEFAULT_DIRECTORY, DirectoryError } from './directory.js';
-export { AppError, ArgsTooLarge, BadOrigin, CalimeroError, ClusterNotUpgraded, ConfirmCancelled, ConfirmRequired, IdempotencyMismatch, LoginRequired, ConsentStale, NotFound, NotServing, OriginNotRegistered, OriginTaken, PasskeyUnknownHere, QuotaExceeded, RecoveryNotReady, ReleaseDeadlineError, SignUpRefused, TrapError, UnavailableError, WrongNode, WrongRecoveryCode, errorFrom, } from './errors.js';
+export { AppError, ArgsTooLarge, BadOrigin, CalimeroError, ClusterNotUpgraded, ConfirmCancelled, ConfirmPromptBlocked, ConfirmRequired, IdempotencyMismatch, LoginRequired, ConsentStale, NotFound, NotServing, OriginNotRegistered, OriginTaken, PasskeyUnknownHere, QuotaExceeded, RecoveryNotReady, ReleaseDeadlineError, SignUpRefused, TrapError, UnavailableError, WrongNode, WrongRecoveryCode, errorFrom, } from './errors.js';
 export { claimedRelease, fetchAttestedKey, freshCollateral, MOCK_QUOTE_HEADER } from './attestation.js';
 export { browserPasskey, b64url, fromB64url } from './passkey.js';
 export { MAX_RECOVERY_NONCE_BYTES, RECOVERY_DOMAIN, newRecoverySeed, parseRecoverySeed, recoveryMessage, recoveryPublicKey, recoverySeedText, signRecovery, } from './recovery.js';

package/dist/cloud-v2/passkey.d.ts

@@ -14,12 +14,28 @@ export interface AssertionJSON {
     clientDataJson: string;
     signature: string;
 }
+/** How strongly an assertion must verify the user (WebAuthn's `UserVerificationRequirement`). */
+export type PasskeyUserVerification = "required" | "preferred" | "discouraged";
+/** What a confirmation asks of the passkey beyond the challenge. */
+export interface PasskeyGetOptions {
+    /**
+     * `"required"` for a confirmation (`412 CONFIRM_REQUIRED`): the node
+     * accepts only an assertion with the user-verified flag (PIN or
+     * biometric). Absent for a plain sign-in, where `"preferred"` is enough.
+     */
+    userVerification?: PasskeyUserVerification;
+}
 /** Something that holds a passkey. */
 export interface PasskeyProvider {
     /** Answer `navigator.credentials.create` for the node's options. */
     create(options: Record<string, unknown>): Promise<RegistrationJSON>;
-    /** Sign `challenge` (an assertion), optionally limited to `allowCredentials`. */
-    get(challenge: Uint8Array, rpId: string, allowCredentials?: string[]): Promise<AssertionJSON>;
+    /**
+     * Sign `challenge` (an assertion), optionally limited to
+     * `allowCredentials`. `options.userVerification` is `"required"` when the
+     * client answers a confirmation; a provider that always verifies the user
+     * may ignore it.
+     */
+    get(challenge: Uint8Array, rpId: string, allowCredentials?: string[], options?: PasskeyGetOptions): Promise<AssertionJSON>;
 }
 export declare function b64url(bytes: Uint8Array): string;
 export declare function fromB64url(s: string): Uint8Array;

package/dist/cloud-v2/passkey.js

@@ -70,12 +70,12 @@ export 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)),