@zoreal/oauth2-js 0.1.23 → 0.1.24

package/dist/index.d.cts

@@ -159,7 +159,8 @@ interface StartLoginOptions {
     theme?: ZorealTheme;
     /**
      * How long the modal stays open before giving up and cancelling, in ms.
-     * Defaults to 120000. The provider's own expiry wins when it is shorter.
+     * Defaults to the provider's own expiry (five minutes today), or 300000
+     * when it states none; a shorter value of yours wins.
      */
     pairingTimeoutMs?: number;
 }
@@ -243,8 +244,12 @@ declare function resumeLogin(options: Pick<StartLoginOptions, 'clientId' | 'issu
  * settles. Callers who want their own UI pass `pairingUI: 'none'`.
  */
 
-/** Our own cap on how long a pairing sits on screen. See `pairingTimeoutMs`. */
-declare const DEFAULT_PAIRING_TIMEOUT_MS = 120000;
+/**
+ * How long a pairing sits on screen when the provider states no expiry of
+ * its own. The provider does state one (`expires_in`, five minutes today),
+ * and that is the deadline unless the site sets a shorter `pairingTimeoutMs`.
+ */
+declare const DEFAULT_PAIRING_TIMEOUT_MS = 300000;
 interface PairingModalOptions {
     onCancel: () => void;
     locale?: string;
@@ -328,7 +333,7 @@ declare function mountPairingModal(state: PairingState, options: PairingModalOpt
  *                                  auth-code mode leaves it to the RP backend.
  */
 declare const WIRE_VERSION = 1;
-declare const SDK_VERSION = "0.1.23";
+declare const SDK_VERSION = "0.1.24";
 declare const SDK_NAME = "@zoreal/oauth2-js";
 declare const DEFAULT_ISSUER = "https://id.zoreal.com";
 /** Pending TTL is short. Poll gently; over-polling cancels the request. */

package/dist/index.d.ts

@@ -159,7 +159,8 @@ interface StartLoginOptions {
     theme?: ZorealTheme;
     /**
      * How long the modal stays open before giving up and cancelling, in ms.
-     * Defaults to 120000. The provider's own expiry wins when it is shorter.
+     * Defaults to the provider's own expiry (five minutes today), or 300000
+     * when it states none; a shorter value of yours wins.
      */
     pairingTimeoutMs?: number;
 }
@@ -243,8 +244,12 @@ declare function resumeLogin(options: Pick<StartLoginOptions, 'clientId' | 'issu
  * settles. Callers who want their own UI pass `pairingUI: 'none'`.
  */
 
-/** Our own cap on how long a pairing sits on screen. See `pairingTimeoutMs`. */
-declare const DEFAULT_PAIRING_TIMEOUT_MS = 120000;
+/**
+ * How long a pairing sits on screen when the provider states no expiry of
+ * its own. The provider does state one (`expires_in`, five minutes today),
+ * and that is the deadline unless the site sets a shorter `pairingTimeoutMs`.
+ */
+declare const DEFAULT_PAIRING_TIMEOUT_MS = 300000;
 interface PairingModalOptions {
     onCancel: () => void;
     locale?: string;
@@ -328,7 +333,7 @@ declare function mountPairingModal(state: PairingState, options: PairingModalOpt
  *                                  auth-code mode leaves it to the RP backend.
  */
 declare const WIRE_VERSION = 1;
-declare const SDK_VERSION = "0.1.23";
+declare const SDK_VERSION = "0.1.24";
 declare const SDK_NAME = "@zoreal/oauth2-js";
 declare const DEFAULT_ISSUER = "https://id.zoreal.com";
 /** Pending TTL is short. Poll gently; over-polling cancels the request. */

package/dist/index.js

@@ -14,7 +14,7 @@ function unsafeClaims(idToken) {
 
 // src/wire.ts
 var WIRE_VERSION = 1;
-var SDK_VERSION = "0.1.23";
+var SDK_VERSION = "0.1.24";
 var SDK_NAME = "@zoreal/oauth2-js";
 var DEFAULT_ISSUER = "https://id.zoreal.com";
 var POLL_INTERVAL_MS = 2e3;
@@ -1715,7 +1715,7 @@ function interpolate(template, time) {
 }
 
 // src/modal.ts
-var DEFAULT_PAIRING_TIMEOUT_MS = 12e4;
+var DEFAULT_PAIRING_TIMEOUT_MS = 3e5;
 var URGENT_SECONDS = 20;
 function mmss(totalSeconds) {
   const m = Math.floor(totalSeconds / 60);
@@ -1787,7 +1787,7 @@ function mountPairingModal(state, options) {
   if (typeof document === "undefined") return null;
   ensureStyles();
   const t = strings(options.locale);
-  const timeoutMs = options.timeoutMs ?? DEFAULT_PAIRING_TIMEOUT_MS;
+  const timeoutMs = options.timeoutMs;
   let closed = false;
   const scrim = el("div", `${cx("root")} ${cx("scrim")}`);
   scrim.dataset.theme = options.theme ?? "auto";
@@ -1845,7 +1845,8 @@ function mountPairingModal(state, options) {
   card.append(closeBtn, body, help, footer);
   scrim.appendChild(card);
   const serverMs = typeof state.expiresIn === "number" ? state.expiresIn * 1e3 : Infinity;
-  const deadline = Date.now() + Math.min(timeoutMs, serverMs);
+  const capMs = timeoutMs ?? (Number.isFinite(serverMs) ? serverMs : DEFAULT_PAIRING_TIMEOUT_MS);
+  const deadline = Date.now() + Math.min(capMs, serverMs);
   let shown = state.qrUrl;
   let loading = null;
   const spent = () => qr.dataset.spent === "true";