@zoreal/oauth2-react 0.2.23 → 0.2.25

package/dist/index.d.cts

@@ -228,7 +228,8 @@ interface ZorealOAuthProviderProps {
     pairingUI?: PairingUI;
     /**
      * 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;
     children: ReactNode;
@@ -270,8 +271,12 @@ declare function ZorealMark({ size, brand, className, }: {
  * the rest of a sign-in form for the person's attention at the one moment they
  * need to look at their phone.
  */
-/** 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 PairingModalProps {
     state: PairingState;
     qrUrl: string;

package/dist/index.d.ts

@@ -228,7 +228,8 @@ interface ZorealOAuthProviderProps {
     pairingUI?: PairingUI;
     /**
      * 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;
     children: ReactNode;
@@ -270,8 +271,12 @@ declare function ZorealMark({ size, brand, className, }: {
  * the rest of a sign-in form for the person's attention at the one moment they
  * need to look at their phone.
  */
-/** 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 PairingModalProps {
     state: PairingState;
     qrUrl: string;

package/dist/index.js

@@ -5,7 +5,7 @@ import { createContext, useContext, useMemo, useState as useState2 } from "react
 
 // src/wire.ts
 var WIRE_VERSION = 1;
-var SDK_VERSION = "0.2.23";
+var SDK_VERSION = "0.2.25";
 var DEFAULT_ISSUER = "https://id.zoreal.com";
 var POLL_INTERVAL_MS = 2e3;
 var POLL_INTERVAL_ENROLLING_MS = 5e3;
@@ -1425,7 +1425,7 @@ function ensureStyles() {
 
 // src/PairingModal.tsx
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
-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);
@@ -1447,14 +1447,14 @@ function PairingModal({
   onCancel,
   locale,
   theme = "auto",
-  timeoutMs = DEFAULT_PAIRING_TIMEOUT_MS,
+  timeoutMs,
   intent = "sign-in"
 }) {
   const t = strings(locale);
   const titleId = useId();
   const closeRef = useRef(null);
   const deadlineRef = useRef(0);
-  const [remaining, setRemaining] = useState(Math.round(timeoutMs / 1e3));
+  const [remaining, setRemaining] = useState(Math.round((timeoutMs ?? DEFAULT_PAIRING_TIMEOUT_MS) / 1e3));
   const settled = state.status === "claimed" || state.status === "enrolling";
   const [frameUrl, setFrameUrl] = useState(qrUrl);
   useEffect(() => {
@@ -1480,8 +1480,10 @@ function PairingModal({
   }, []);
   useEffect(() => {
     const serverMs = typeof state.expiresIn === "number" ? state.expiresIn * 1e3 : Infinity;
-    deadlineRef.current = Date.now() + Math.min(timeoutMs, serverMs);
-    setRemaining(Math.round(Math.min(timeoutMs, serverMs) / 1e3));
+    const capMs = timeoutMs ?? (Number.isFinite(serverMs) ? serverMs : DEFAULT_PAIRING_TIMEOUT_MS);
+    const ms = Math.min(capMs, serverMs);
+    deadlineRef.current = Date.now() + ms;
+    setRemaining(Math.round(ms / 1e3));
     const id = setInterval(() => {
       const left = Math.max(0, Math.ceil((deadlineRef.current - Date.now()) / 1e3));
       setRemaining(left);
@@ -1615,9 +1617,16 @@ var SVG_NS = "http://www.w3.org/2000/svg";
 var TAIL = 0.3;
 var STACK = Array.from({ length: 12 }, (_, i) => 12 - i);
 var HALO = [3, 2, 1];
-function radiusOf(control) {
-  const value = parseFloat(getComputedStyle(control).borderTopLeftRadius);
-  return Number.isFinite(value) ? value : 8;
+function cornerOf(radius, width, height) {
+  const raw = radius.trim();
+  const value = parseFloat(raw);
+  const offset = 2;
+  if (raw.endsWith("%") && Number.isFinite(value)) {
+    return [width * value / 100 + offset, height * value / 100 + offset];
+  }
+  const px = Number.isFinite(value) ? value : /infinity/i.test(raw) ? Infinity : 8;
+  const r = Math.min(px, width / 2, height / 2) + offset;
+  return [r, r];
 }
 function holdBusy(control) {
   if (typeof document === "undefined") return () => {
@@ -1638,12 +1647,11 @@ function holdBusy(control) {
   overlay.setAttribute("aria-hidden", "true");
   const svg = document.createElementNS(SVG_NS, "svg");
   svg.setAttribute("class", cx("ring-svg"));
-  const rx = radiusOf(control) + 2;
+  const rects = [];
   const layer = (name, len, alpha) => {
     const rect = document.createElementNS(SVG_NS, "rect");
     rect.setAttribute("class", cx(name));
-    rect.setAttribute("rx", String(rx));
-    rect.setAttribute("ry", String(rx));
+    rects.push(rect);
     rect.style.strokeDasharray = `calc(var(--zrl-l) * ${len}) calc(var(--zrl-l) * ${1 - len})`;
     rect.style.setProperty("--zrl-s", `calc(var(--zrl-l) * ${-(TAIL - len)})`);
     rect.style.opacity = alpha;
@@ -1666,6 +1674,11 @@ function holdBusy(control) {
     overlay.style.top = `${box.top}px`;
     overlay.style.width = `${box.width}px`;
     overlay.style.height = `${box.height}px`;
+    const [rx, ry] = cornerOf(getComputedStyle(control).borderTopLeftRadius, box.width, box.height);
+    for (const rect of rects) {
+      rect.setAttribute("rx", String(rx));
+      rect.setAttribute("ry", String(ry));
+    }
     const length = typeof measured?.getTotalLength === "function" ? measured.getTotalLength() : 0;
     if (length > 0) overlay.style.setProperty("--zrl-ring-len", `${length}px`);
   };