@iqauth/sdk 2.7.0 → 2.8.1

package/dist/{chunk-RR2MGPTK.mjs → chunk-WHT6WKTY.mjs}

@@ -9,60 +9,22 @@ import {
   requestMagicLink,
   signInWithPasskey,
   unlinkProvider
-} from "./chunk-RTJAIBXY.mjs";
+} from "./chunk-4V7FKOTG.mjs";
 import {
   handleAuthCallback,
   redirectToSignIn,
   signIn,
   signOut
 } from "./chunk-GN37E64I.mjs";
+import {
+  sanitizeReturnTo
+} from "./chunk-JRDVUWAL.mjs";
 import {
   defaultBundle,
   localizeErrorCode,
   resolveBundle,
   t
-} from "./chunk-5T7GHBX6.mjs";
-
-// src/browser/returnTo.ts
-function normalizeOrigin(o) {
-  try {
-    return new URL(o).origin;
-  } catch {
-    return o.replace(/\/+$/, "");
-  }
-}
-function sanitizeReturnTo(input, options = {}) {
-  const fallback = options.fallback ?? "/";
-  if (!input || typeof input !== "string") return fallback;
-  const trimmed = input.trim();
-  if (!trimmed) return fallback;
-  if (trimmed.startsWith("//")) return fallback;
-  if (trimmed.startsWith("/") || trimmed.startsWith("#") || trimmed.startsWith("?")) {
-    return trimmed;
-  }
-  if (!/^[a-z][a-z0-9+\-.]*:/i.test(trimmed)) {
-    return trimmed.startsWith("/") ? trimmed : `/${trimmed}`;
-  }
-  let parsed;
-  try {
-    parsed = new URL(trimmed);
-  } catch {
-    return fallback;
-  }
-  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return fallback;
-  const currentOrigin = options.currentOrigin ?? (typeof window !== "undefined" ? window.location.origin : "");
-  const allowed = /* @__PURE__ */ new Set();
-  if (currentOrigin) allowed.add(normalizeOrigin(currentOrigin));
-  for (const o of options.allowedOrigins ?? []) allowed.add(normalizeOrigin(o));
-  if (allowed.has(parsed.origin)) return parsed.toString();
-  return fallback;
-}
-function isReturnToAllowed(input, options = {}) {
-  const fallback = options.fallback ?? "/";
-  const out = sanitizeReturnTo(input, options);
-  if (!input) return false;
-  return out !== fallback || input === fallback;
-}
+} from "./chunk-TLET552H.mjs";
 
 // src/react/index.tsx
 import {
@@ -495,6 +457,65 @@ function RedirectToSignIn(props = {}) {
   }
   return null;
 }
+async function performScopeSwitch(manager, base, target) {
+  const res = await manager.fetch(`${base}/api/v1/auth/switch-scope`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ scopeType: target.type, scopeId: target.id })
+  });
+  const body = await res.json().catch(() => ({}));
+  if (!res.ok) {
+    throw new Error(body?.error?.message || `HTTP ${res.status}`);
+  }
+  const newToken = body?.data?.accessToken;
+  if (newToken) {
+    manager.adoptAccessToken(newToken);
+    void manager.refresh().catch(() => void 0);
+    return;
+  }
+  const ok = await manager.refresh();
+  if (!ok) {
+    throw new Error("scope switch succeeded server-side but token refresh failed; reload to recover");
+  }
+}
+async function performTenantSwitch(manager, base, tenantId) {
+  const res = await manager.fetch(`${base.replace(/\/$/, "")}/api/v1/auth/select-tenant`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ tenantId })
+  });
+  const body = await res.json().catch(() => ({}));
+  if (!res.ok) {
+    throw new Error(body?.error?.message || `HTTP ${res.status}`);
+  }
+  if (body?.data?.mfaChallengeToken) {
+    return {
+      kind: "mfa_required",
+      tenantId: body?.data?.tenantId || tenantId,
+      mfaChallengeToken: body.data.mfaChallengeToken,
+      availableMethods: Array.isArray(body.data.availableMethods) ? body.data.availableMethods : []
+    };
+  }
+  if (body?.data?.type === "scope_selection" || body?.data?.scopeSelectionToken) {
+    return {
+      kind: "scope_selection_required",
+      tenantId: body?.data?.tenantId || tenantId,
+      scopeSelectionToken: body?.data?.scopeSelectionToken || "",
+      scopes: Array.isArray(body?.data?.scopes) ? body.data.scopes : []
+    };
+  }
+  const newToken = body?.data?.accessToken;
+  if (newToken) {
+    manager.adoptAccessToken(newToken);
+    void manager.refresh().catch(() => void 0);
+    return { kind: "ok", tenantId: body?.data?.user?.tenantId || tenantId };
+  }
+  const ok = await manager.refresh();
+  if (!ok) {
+    throw new Error("tenant switch succeeded server-side but token refresh failed; reload to recover");
+  }
+  return { kind: "ok", tenantId };
+}
 function asArray(v) {
   if (v == null) return [];
   return Array.isArray(v) ? v : [v];
@@ -521,7 +542,14 @@ function claimPermissions(c) {
   }
   return Array.from(out);
 }
-function Protect({ role, permission, condition, fallback = null, children }) {
+function claimSatisfiesScope(claims, required) {
+  if (!claims) return false;
+  const ctx = claims.scopeContext;
+  if (!ctx || !ctx.type || !ctx.id) return false;
+  const list = Array.isArray(required) ? required : [required];
+  return list.some((r) => r.type === ctx.type && r.id === ctx.id);
+}
+function Protect({ role, permission, scope, condition, fallback = null, children }) {
   const { snapshot } = useCtx();
   if (snapshot.status !== "authenticated") return createElement(Fragment, null, fallback);
   const wantedRoles = asArray(role);
@@ -534,6 +562,9 @@ function Protect({ role, permission, condition, fallback = null, children }) {
     const have = new Set(claimPermissions(snapshot.claims));
     if (!wantedPerms.some((p) => have.has(p))) return createElement(Fragment, null, fallback);
   }
+  if (scope) {
+    if (!claimSatisfiesScope(snapshot.claims, scope)) return createElement(Fragment, null, fallback);
+  }
   if (condition && !condition(snapshot.claims)) return createElement(Fragment, null, fallback);
   return createElement(Fragment, null, children);
 }
@@ -1090,12 +1121,54 @@ function isSilentSsoEligible(ctx, effectivePrompt) {
   if (!ctx.returnAllowed) return false;
   return true;
 }
+function resolveAfterSignInDestination(args) {
+  let raw = args.prop ?? null;
+  if (!raw && typeof args.search === "string") {
+    try {
+      const params = new URLSearchParams(args.search);
+      raw = params.get("return_to") ?? params.get("next");
+    } catch {
+    }
+  }
+  return sanitizeReturnTo(raw, {
+    allowedOrigins: args.allowedOrigins,
+    currentOrigin: args.currentOrigin,
+    fallback: "/"
+  });
+}
 function SignIn(props) {
   const providerCtx = useContext(IQAuthContext);
   const iqAuthBaseUrl = props.iqAuthBaseUrl ?? providerCtx?.manager.hostedIssuerUrl ?? "";
   const appKey = props.appKey ?? providerCtx?.manager.appKey ?? "";
   const returnTo = props.returnTo ?? (typeof window !== "undefined" ? `${window.location.origin}/api/iqauth/callback` : "");
-  const { onRedirect, className, prompt, appearance: instanceAppearance, silentSso: instanceSilentSso } = props;
+  const afterSignInUrl = resolveAfterSignInDestination({
+    prop: props.afterSignInUrl,
+    search: typeof window !== "undefined" ? window.location.search : "",
+    allowedOrigins: providerCtx?.allowedReturnOrigins
+  });
+  const { onRedirect, className, prompt, appearance: instanceAppearance, silentSso: instanceSilentSso, scopeHint: scopeHintProp } = props;
+  const effectiveScopeHint = (() => {
+    const fromProp = scopeHintProp ?? null;
+    let raw = fromProp;
+    if (!raw && typeof window !== "undefined") {
+      try {
+        raw = new URLSearchParams(window.location.search).get("scope_hint");
+      } catch {
+      }
+    }
+    if (!raw) return null;
+    if (typeof raw === "object" && raw && raw.type && raw.id) {
+      const t3 = raw.type;
+      if (t3 === "vendor" || t3 === "source" || t3 === "client") return { type: t3, id: String(raw.id) };
+      return null;
+    }
+    if (typeof raw === "string" && raw.includes(":")) {
+      const [t3, id] = raw.split(":", 2);
+      if ((t3 === "vendor" || t3 === "source" || t3 === "client") && id) return { type: t3, id };
+    }
+    return null;
+  })();
+  const scopeHintBody = effectiveScopeHint ? { scopeHint: effectiveScopeHint } : {};
   const silentSsoEnabled = instanceSilentSso ?? providerCtx?.silentSso ?? false;
   const appearance = instanceAppearance && providerCtx?.appearance ? { elements: { ...providerCtx.appearance.elements, ...instanceAppearance.elements } } : instanceAppearance ?? providerCtx?.appearance ?? null;
   if (!iqAuthBaseUrl || !appKey) {
@@ -1116,6 +1189,11 @@ function SignIn(props) {
     appKey
   });
   if (guardError) throw guardError;
+  useEffect(() => {
+    if (typeof document === "undefined") return;
+    const attrs = "; path=/; SameSite=Lax" + (typeof window !== "undefined" && window.location.protocol === "https:" ? "; Secure" : "");
+    document.cookie = `iqauth_return_to=${encodeURIComponent(afterSignInUrl)}${attrs}`;
+  }, [afterSignInUrl]);
   const preflightLoggedRef = useRef(false);
   useEffect(() => {
     if (!ctx || preflightLoggedRef.current) return;
@@ -1131,6 +1209,7 @@ function SignIn(props) {
   const [formError, setFormError] = useState("");
   const [mfa, setMfa] = useState(null);
   const [tenantSel, setTenantSel] = useState(null);
+  const [scopeSel, setScopeSel] = useState(null);
   const [oauthExchanging, setOauthExchanging] = useState(false);
   const [silent, setSilent] = useState("idle");
   const [forcePrompt, setForcePrompt] = useState(false);
@@ -1161,6 +1240,12 @@ function SignIn(props) {
       setTenantSel({ token: payload.tenantSelectionToken, tenants: payload.tenants || [] });
       return true;
     }
+    if (payload.type === "scope_selection") {
+      setScopeSel({ token: payload.scopeSelectionToken, tenantId: payload.tenantId, scopes: payload.scopes || [] });
+      setTenantSel(null);
+      setMfa(null);
+      return true;
+    }
     if (payload.type === "mfa_required") {
       const methods = payload.availableMethods || ["totp"];
       setMfa({ token: payload.mfaChallengeToken, methods, selected: methods[0], code: "", backup: false });
@@ -1181,7 +1266,7 @@ function SignIn(props) {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         credentials: "include",
-        body: JSON.stringify({ email, password, ...oidcPayload() })
+        body: JSON.stringify({ email, password, ...oidcPayload(), ...scopeHintBody })
       });
       const payload = await r.json().catch(() => ({}));
       if (!handlePayload(payload)) setFormError(localizeError(localeBundle, { code: payload.error, message: payload.error_description }));
@@ -1204,7 +1289,8 @@ function SignIn(props) {
         code: mfa.code,
         method: mfa.selected,
         useBackup: mfa.backup,
-        ...oidcPayload()
+        ...oidcPayload(),
+        ...scopeHintBody
       })
     });
     const payload = await r.json().catch(() => ({}));
@@ -1219,7 +1305,21 @@ function SignIn(props) {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       credentials: "include",
-      body: JSON.stringify({ tenantSelectionToken: tenantSel.token, tenantId, ...oidcPayload() })
+      body: JSON.stringify({ tenantSelectionToken: tenantSel.token, tenantId, ...oidcPayload(), ...scopeHintBody })
+    });
+    const payload = await r.json().catch(() => ({}));
+    if (!handlePayload(payload)) setFormError(localizeError(localeBundle, { code: payload.error, message: payload.error_description }));
+    setSubmitting(false);
+  };
+  const submitScope = async (membershipId) => {
+    if (!scopeSel) return;
+    setSubmitting(true);
+    setFormError("");
+    const r = await fetch(`${iqAuthBaseUrl.replace(/\/$/, "")}/oidc/sso-scope-select`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      credentials: "include",
+      body: JSON.stringify({ scopeSelectionToken: scopeSel.token, membershipId, ...oidcPayload(), ...scopeHintBody })
     });
     const payload = await r.json().catch(() => ({}));
     if (!handlePayload(payload)) setFormError(localizeError(localeBundle, { code: payload.error, message: payload.error_description }));
@@ -1287,6 +1387,11 @@ function SignIn(props) {
           setSilent("failed");
           return;
         }
+        if (payload?.type === "scope_selection") {
+          setScopeSel({ token: payload.scopeSelectionToken, tenantId: payload.tenantId, scopes: payload.scopes || [] });
+          setSilent("failed");
+          return;
+        }
         setSilent("failed");
       } catch {
         setSilent("failed");
@@ -1298,6 +1403,7 @@ function SignIn(props) {
     setForcePrompt(true);
     setSilent("skipped");
     setTenantSel(null);
+    setScopeSel(null);
     if (typeof window !== "undefined") {
       try {
         const u = new URL(window.location.href);
@@ -1368,7 +1474,27 @@ function SignIn(props) {
         ]
       },
       tn.tenantId
-    )) }) : mfa ? /* @__PURE__ */ jsxs("form", { onSubmit: submitMfa, style: { display: "flex", flexDirection: "column", gap: 12 }, "aria-label": t2("mfa.title"), children: [
+    )) }) : scopeSel ? (
+      // Task #171 — scope picker (source/client memberships)
+      /* @__PURE__ */ jsx("div", { role: "radiogroup", "aria-label": t2("signIn.selectScope") || "Choose scope", "data-iqauth-scope-picker": "1", style: { display: "flex", flexDirection: "column", gap: 8 }, children: scopeSel.scopes.map((s) => /* @__PURE__ */ jsxs(
+        "button",
+        {
+          type: "button",
+          "data-iqauth-scope": s.membershipId,
+          onClick: () => submitScope(s.membershipId),
+          style: { textAlign: "left", padding: "10px 14px", border: "1px solid rgba(15,23,42,0.15)", borderRadius: 8, background: "transparent", color: "inherit", cursor: "pointer" },
+          children: [
+            /* @__PURE__ */ jsx("p", { style: { margin: 0, fontWeight: 500 }, children: s.scopeName }),
+            /* @__PURE__ */ jsxs("p", { style: { margin: 0, fontSize: 12, opacity: 0.6 }, children: [
+              s.scopeType,
+              " \xB7 ",
+              s.roleName
+            ] })
+          ]
+        },
+        s.membershipId
+      )) })
+    ) : mfa ? /* @__PURE__ */ jsxs("form", { onSubmit: submitMfa, style: { display: "flex", flexDirection: "column", gap: 12 }, "aria-label": t2("mfa.title"), children: [
       !mfa.backup && mfa.methods.length > 1 ? /* @__PURE__ */ jsx(Field, { label: t2("mfa.title"), children: /* @__PURE__ */ jsx("select", { style: inputStyle(), value: mfa.selected, onChange: (e) => setMfa({ ...mfa, selected: e.target.value }), children: mfa.methods.map((m) => /* @__PURE__ */ jsx("option", { value: m, children: m.toUpperCase() }, m)) }) }) : null,
       /* @__PURE__ */ jsx(Field, { label: mfa.backup ? t2("mfa.backupCodeLabel") : t2("mfa.totpLabel"), children: /* @__PURE__ */ jsx(
         "input",
@@ -1660,9 +1786,12 @@ function OrganizationSwitcher({ iqAuthBaseUrl, onSwitched, appearance: _appearan
   const t2 = useT();
   const branding = useResolvedSdkBranding(iqAuthBaseUrl);
   const accent = branding?.accentColor || "#6366f1";
+  const { manager } = useCtx();
   const [memberships, setMemberships] = useState([]);
   const [activeTenantId, setActiveTenantId] = useState(null);
   const [open, setOpen] = useState(false);
+  const [pendingStep, setPendingStep] = useState(null);
+  const [switchError, setSwitchError] = useState(null);
   useEffect(() => {
     fetch(`${iqAuthBaseUrl.replace(/\/$/, "")}/api/v1/auth/me`, { credentials: "include" }).then((r) => r.json()).then((p) => {
       if (p?.data?.tenantId) setActiveTenantId(p.data.tenantId);
@@ -1672,17 +1801,47 @@ function OrganizationSwitcher({ iqAuthBaseUrl, onSwitched, appearance: _appearan
     });
   }, [iqAuthBaseUrl]);
   const switchTo = async (tenantId) => {
+    setSwitchError(null);
+    setPendingStep(null);
     try {
-      await jsonFetch(`${iqAuthBaseUrl.replace(/\/$/, "")}/api/v1/auth/select-tenant`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ tenantId })
-      });
+      const result = await performTenantSwitch(manager, iqAuthBaseUrl, tenantId);
+      if (result.kind === "mfa_required") {
+        setPendingStep({
+          kind: "mfa_required",
+          tenantId: result.tenantId,
+          mfaChallengeToken: result.mfaChallengeToken,
+          availableMethods: result.availableMethods
+        });
+        return;
+      }
+      if (result.kind === "scope_selection_required") {
+        setPendingStep({
+          kind: "scope_selection_required",
+          tenantId: result.tenantId,
+          scopeSelectionToken: result.scopeSelectionToken
+        });
+        return;
+      }
       setActiveTenantId(tenantId);
       setOpen(false);
       onSwitched?.(tenantId);
-    } catch {
+    } catch (err) {
+      setSwitchError(err instanceof Error ? err.message : "Failed to switch organization");
+    }
+  };
+  const hostedSignInUrl = () => {
+    const baseHosted = `${iqAuthBaseUrl.replace(/\/$/, "")}/sign-in`;
+    if (!pendingStep) return baseHosted;
+    const params = new URLSearchParams();
+    if (pendingStep.kind === "mfa_required") {
+      params.set("mfaChallengeToken", pendingStep.mfaChallengeToken);
+      if (pendingStep.availableMethods.length) {
+        params.set("availableMethods", pendingStep.availableMethods.join(","));
+      }
+    } else {
+      params.set("prompt", "login");
     }
+    return `${baseHosted}?${params.toString()}`;
   };
   const active = memberships.find((m) => m.tenantId === activeTenantId);
   return /* @__PURE__ */ jsxs(
@@ -1704,44 +1863,274 @@ function OrganizationSwitcher({ iqAuthBaseUrl, onSwitched, appearance: _appearan
             children: active?.tenantName || active?.tenantSlug || t2("orgSwitcher.label")
           }
         ),
-        open ? /* @__PURE__ */ jsx("div", { role: "menu", style: {
+        open ? /* @__PURE__ */ jsxs("div", { role: "menu", style: {
           position: "absolute",
           left: 0,
           top: 36,
-          minWidth: 220,
+          minWidth: 260,
           background: "#fff",
           border: "1px solid rgba(15,23,42,0.12)",
           borderRadius: 8,
           boxShadow: "0 4px 12px rgba(0,0,0,0.08)",
           padding: 8,
           zIndex: 100
-        }, children: memberships.length === 0 ? /* @__PURE__ */ jsx("p", { style: { fontSize: 13, opacity: 0.6, padding: "4px 6px" }, children: t2("orgSwitcher.noOrgs") }) : memberships.map((m) => /* @__PURE__ */ jsxs(
+        }, children: [
+          memberships.length === 0 ? /* @__PURE__ */ jsx("p", { style: { fontSize: 13, opacity: 0.6, padding: "4px 6px" }, children: t2("orgSwitcher.noOrgs") }) : memberships.map((m) => /* @__PURE__ */ jsxs(
+            "button",
+            {
+              role: "menuitem",
+              type: "button",
+              onClick: () => switchTo(m.tenantId),
+              style: {
+                display: "block",
+                width: "100%",
+                textAlign: "left",
+                padding: "8px 10px",
+                background: m.tenantId === activeTenantId ? `${accent}14` : "transparent",
+                border: "none",
+                borderRadius: 4,
+                cursor: "pointer",
+                fontSize: 13,
+                color: "#0f172a"
+              },
+              children: [
+                /* @__PURE__ */ jsx("div", { style: { fontWeight: 500 }, children: m.tenantName || m.tenantSlug || m.tenantId }),
+                /* @__PURE__ */ jsx("div", { style: { fontSize: 11, opacity: 0.6 }, children: m.roles.join(", ") })
+              ]
+            },
+            m.tenantId
+          )),
+          pendingStep ? /* @__PURE__ */ jsxs(
+            "div",
+            {
+              "data-testid": pendingStep.kind === "mfa_required" ? "prompt-org-switch-mfa-required" : "prompt-org-switch-scope-required",
+              role: "alert",
+              style: {
+                marginTop: 8,
+                padding: "10px 12px",
+                background: `${accent}10`,
+                border: `1px solid ${accent}55`,
+                borderRadius: 6
+              },
+              children: [
+                /* @__PURE__ */ jsx("div", { style: { fontSize: 12, fontWeight: 600, color: "#0f172a", marginBottom: 4 }, children: pendingStep.kind === "mfa_required" ? t2("orgSwitcher.mfaRequiredTitle") : t2("orgSwitcher.scopeSelectionRequiredTitle") }),
+                /* @__PURE__ */ jsx("div", { style: { fontSize: 12, color: "#334155", marginBottom: 8 }, children: pendingStep.kind === "mfa_required" ? t2("orgSwitcher.mfaRequiredBody") : t2("orgSwitcher.scopeSelectionRequiredBody") }),
+                /* @__PURE__ */ jsx(
+                  "a",
+                  {
+                    href: hostedSignInUrl(),
+                    "data-testid": "link-org-switch-continue-hosted",
+                    style: {
+                      display: "inline-block",
+                      fontSize: 12,
+                      fontWeight: 600,
+                      color: branding?.accentColor || accent,
+                      textDecoration: "none"
+                    },
+                    children: t2("orgSwitcher.continueInHostedSignIn")
+                  }
+                )
+              ]
+            }
+          ) : null,
+          switchError ? /* @__PURE__ */ jsx("p", { "data-testid": "text-org-switch-error", style: { fontSize: 12, color: "#b91c1c", padding: "6px 8px 0" }, children: switchError }) : null
+        ] }) : null
+      ]
+    }
+  );
+}
+function useMemberships() {
+  const { manager, snapshot } = useCtx();
+  const [memberships, setMemberships] = useState([]);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState(null);
+  const base = manager.issuerUrl.replace(/\/$/, "");
+  const refresh = useCallback(async () => {
+    setIsLoading(true);
+    setError(null);
+    try {
+      const res = await manager.fetch(`${base}/api/v1/auth/available-scopes`);
+      const json = await res.json().catch(() => ({}));
+      if (!res.ok) throw new Error(json?.error?.message || `HTTP ${res.status}`);
+      const tree = json.data || {};
+      const flat = [];
+      for (const v of tree.vendors || []) {
+        flat.push({
+          membershipId: v.membershipId,
+          scopeType: "vendor",
+          scopeId: v.id,
+          scopeName: v.name,
+          role: v.role,
+          grantedVia: v.grantedVia || "direct"
+        });
+      }
+      for (const s of tree.sources || []) {
+        flat.push({
+          membershipId: s.membershipId,
+          scopeType: "source",
+          scopeId: s.id,
+          scopeName: s.name,
+          role: s.role,
+          grantedVia: s.grantedVia || "direct"
+        });
+      }
+      for (const c of tree.clients || []) {
+        flat.push({
+          membershipId: c.membershipId,
+          scopeType: "client",
+          scopeId: c.id,
+          scopeName: c.name,
+          role: c.role,
+          grantedVia: c.grantedVia || "direct"
+        });
+      }
+      setMemberships(flat);
+    } catch (err) {
+      setError(err.message);
+      setMemberships([]);
+    } finally {
+      setIsLoading(false);
+    }
+  }, [manager, base]);
+  useEffect(() => {
+    if (snapshot.status !== "authenticated") {
+      setMemberships([]);
+      setIsLoading(false);
+      return;
+    }
+    void refresh();
+  }, [snapshot.status, snapshot.tenantId, refresh]);
+  const switchScope = useCallback(
+    (target) => performScopeSwitch(manager, base, target),
+    [manager, base]
+  );
+  const active = useMemo(() => {
+    const ctx = snapshot.user?.scopeContext;
+    if (!ctx) return null;
+    return {
+      type: ctx.type,
+      id: ctx.id,
+      role: ctx.role,
+      membershipId: ctx.membershipId
+    };
+  }, [snapshot.user, snapshot.version]);
+  return { isLoading, error, memberships, active, refresh, switchScope };
+}
+function ScopeSwitcher({ onSwitched, include, className }) {
+  const { memberships, active, isLoading, error, switchScope } = useMemberships();
+  const [open, setOpen] = useState(false);
+  const [busy, setBusy] = useState(null);
+  const [switchError, setSwitchError] = useState(null);
+  const visible = useMemo(
+    () => include ? memberships.filter((m) => include.includes(m.scopeType)) : memberships,
+    [memberships, include]
+  );
+  if (isLoading) {
+    return createElement(
+      "div",
+      { className, "data-testid": "scope-switcher-loading", style: { fontSize: 13, opacity: 0.6 } },
+      "Loading scopes\u2026"
+    );
+  }
+  if (error) {
+    return createElement(
+      "div",
+      { className, "data-testid": "scope-switcher-error", style: { fontSize: 13, color: "#b91c1c" } },
+      error
+    );
+  }
+  if (!visible.length) return null;
+  const activeLabel = active ? visible.find((m) => m.scopeType === active.type && m.scopeId === active.id)?.scopeName || `${active.type}:${active.id}` : "Select a scope";
+  return createElement(
+    "div",
+    { className, "data-testid": "scope-switcher", style: { position: "relative", display: "inline-block" } },
+    createElement(
+      "button",
+      {
+        type: "button",
+        "data-testid": "scope-switcher-trigger",
+        onClick: () => setOpen((v) => !v),
+        style: {
+          padding: "6px 10px",
+          border: "1px solid #e5e7eb",
+          borderRadius: 6,
+          background: "#fff",
+          cursor: "pointer",
+          fontSize: 13
+        }
+      },
+      active ? `${active.type}: ${activeLabel}` : activeLabel
+    ),
+    switchError ? createElement(
+      "div",
+      {
+        "data-testid": "scope-switcher-switch-error",
+        style: { marginTop: 4, fontSize: 12, color: "#b91c1c" }
+      },
+      switchError
+    ) : null,
+    open ? createElement(
+      "div",
+      {
+        "data-testid": "scope-switcher-menu",
+        style: {
+          position: "absolute",
+          top: "100%",
+          left: 0,
+          marginTop: 4,
+          minWidth: 220,
+          background: "#fff",
+          border: "1px solid #e5e7eb",
+          borderRadius: 6,
+          boxShadow: "0 4px 12px rgba(0,0,0,0.08)",
+          padding: 4,
+          zIndex: 50
+        }
+      },
+      visible.map((m) => {
+        const isActive = active?.type === m.scopeType && active?.id === m.scopeId;
+        const key = `${m.scopeType}:${m.scopeId}`;
+        return createElement(
           "button",
           {
-            role: "menuitem",
+            key,
             type: "button",
-            onClick: () => switchTo(m.tenantId),
+            "data-testid": `scope-switcher-option-${m.scopeType}-${m.scopeId}`,
+            disabled: busy === key,
+            onClick: async () => {
+              setBusy(key);
+              setSwitchError(null);
+              try {
+                await switchScope({ type: m.scopeType, id: m.scopeId });
+                setOpen(false);
+                onSwitched?.({ type: m.scopeType, id: m.scopeId });
+              } catch (err) {
+                setSwitchError(err.message || "Scope switch failed");
+              } finally {
+                setBusy(null);
+              }
+            },
             style: {
               display: "block",
               width: "100%",
               textAlign: "left",
               padding: "8px 10px",
-              background: m.tenantId === activeTenantId ? `${accent}14` : "transparent",
               border: "none",
+              background: isActive ? "#f3f4f6" : "transparent",
+              cursor: busy ? "wait" : "pointer",
               borderRadius: 4,
-              cursor: "pointer",
-              fontSize: 13,
-              color: "#0f172a"
-            },
-            children: [
-              /* @__PURE__ */ jsx("div", { style: { fontWeight: 500 }, children: m.tenantName || m.tenantSlug || m.tenantId }),
-              /* @__PURE__ */ jsx("div", { style: { fontSize: 11, opacity: 0.6 }, children: m.roles.join(", ") })
-            ]
+              fontSize: 13
+            }
           },
-          m.tenantId
-        )) }) : null
-      ]
-    }
+          createElement("div", { style: { fontWeight: 500 } }, m.scopeName),
+          createElement(
+            "div",
+            { style: { fontSize: 11, opacity: 0.6 } },
+            `${m.scopeType} \xB7 ${m.role}${m.grantedVia && m.grantedVia !== "direct" ? ` \xB7 via ${m.grantedVia}` : ""}`
+          )
+        );
+      })
+    ) : null
   );
 }
 function useImpersonation() {
@@ -2354,10 +2743,13 @@ function OrganizationList({ iqAuthBaseUrl, onSelect, showCreate = true, createRe
   const branding = useResolvedSdkBranding(iqAuthBaseUrl);
   const baseUrl = iqAuthBaseUrl.replace(/\/$/, "");
   const accent = branding?.accentColor || "#6366f1";
+  const t2 = useT();
+  const { manager } = useCtx();
   const [memberships, setMemberships] = useState([]);
   const [activeTenantId, setActiveTenantId] = useState(null);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
+  const [pendingStep, setPendingStep] = useState(null);
   useEffect(() => {
     let cancelled = false;
     Promise.all([
@@ -2381,21 +2773,81 @@ function OrganizationList({ iqAuthBaseUrl, onSelect, showCreate = true, createRe
       onSelect?.(tenantId);
       return;
     }
+    setError(null);
+    setPendingStep(null);
     try {
-      await jsonFetch(`${baseUrl}/api/v1/auth/select-tenant`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        credentials: "include",
-        body: JSON.stringify({ tenantId })
-      });
+      const result = await performTenantSwitch(manager, iqAuthBaseUrl, tenantId);
+      if (result.kind === "mfa_required") {
+        setPendingStep({
+          kind: "mfa_required",
+          tenantId: result.tenantId,
+          mfaChallengeToken: result.mfaChallengeToken,
+          availableMethods: result.availableMethods
+        });
+        return;
+      }
+      if (result.kind === "scope_selection_required") {
+        setPendingStep({
+          kind: "scope_selection_required",
+          tenantId: result.tenantId,
+          scopeSelectionToken: result.scopeSelectionToken
+        });
+        return;
+      }
       setActiveTenantId(tenantId);
       onSelect?.(tenantId);
     } catch (err) {
       setError(err instanceof Error ? err.message : "Failed to switch organization");
     }
   };
+  const hostedSignInUrl = () => {
+    const baseHosted = `${baseUrl}/sign-in`;
+    if (!pendingStep) return baseHosted;
+    const params = new URLSearchParams();
+    if (pendingStep.kind === "mfa_required") {
+      params.set("mfaChallengeToken", pendingStep.mfaChallengeToken);
+      if (pendingStep.availableMethods.length) {
+        params.set("availableMethods", pendingStep.availableMethods.join(","));
+      }
+    } else {
+      params.set("prompt", "login");
+    }
+    return `${baseHosted}?${params.toString()}`;
+  };
   return /* @__PURE__ */ jsx(Shell, { appearance, branding, className, title: "Your organizations", subtitle: "Select an organization to make it active.", children: /* @__PURE__ */ jsxs("div", { "data-iqauth-sdk-org-list": "", style: { display: "flex", flexDirection: "column", gap: 8 }, children: [
     error ? /* @__PURE__ */ jsx(ErrorBanner, { message: error }) : null,
+    pendingStep ? /* @__PURE__ */ jsxs(
+      "div",
+      {
+        "data-testid": pendingStep.kind === "mfa_required" ? "prompt-org-list-mfa-required" : "prompt-org-list-scope-required",
+        role: "alert",
+        style: {
+          padding: "10px 12px",
+          background: `${accent}10`,
+          border: `1px solid ${accent}55`,
+          borderRadius: 6
+        },
+        children: [
+          /* @__PURE__ */ jsx("div", { style: { fontSize: 13, fontWeight: 600, color: "#0f172a", marginBottom: 4 }, children: pendingStep.kind === "mfa_required" ? t2("orgSwitcher.mfaRequiredTitle") : t2("orgSwitcher.scopeSelectionRequiredTitle") }),
+          /* @__PURE__ */ jsx("div", { style: { fontSize: 12, color: "#334155", marginBottom: 8 }, children: pendingStep.kind === "mfa_required" ? t2("orgSwitcher.mfaRequiredBody") : t2("orgSwitcher.scopeSelectionRequiredBody") }),
+          /* @__PURE__ */ jsx(
+            "a",
+            {
+              href: hostedSignInUrl(),
+              "data-testid": "link-org-list-continue-hosted",
+              style: {
+                display: "inline-block",
+                fontSize: 12,
+                fontWeight: 600,
+                color: branding?.accentColor || accent,
+                textDecoration: "none"
+              },
+              children: t2("orgSwitcher.continueInHostedSignIn")
+            }
+          )
+        ]
+      }
+    ) : null,
     loading ? /* @__PURE__ */ jsx("p", { style: { fontSize: 13 }, children: "Loading\u2026" }) : memberships.length === 0 ? /* @__PURE__ */ jsx("p", { style: { fontSize: 13, opacity: 0.6 }, children: "You don\u2019t belong to any organizations yet." }) : /* @__PURE__ */ jsx("ul", { style: { listStyle: "none", padding: 0, margin: 0, display: "flex", flexDirection: "column", gap: 6 }, children: memberships.map((m) => {
       const active = m.tenantId === activeTenantId;
       return /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsxs(
@@ -2433,8 +2885,8 @@ function OrganizationList({ iqAuthBaseUrl, onSelect, showCreate = true, createRe
           iqAuthBaseUrl,
           unstyled: true,
           appearance,
-          onCreated: (t2) => {
-            onSelect?.(t2.id);
+          onCreated: (t3) => {
+            onSelect?.(t3.id);
             reloadList();
           },
           redirectUrl: createRedirectUrl
@@ -2670,8 +3122,6 @@ function LinkedAccounts({ className, onChange, ...rest }) {
 var __version__ = "phase-bc-1.0.0";
 
 export {
-  sanitizeReturnTo,
-  isReturnToAllowed,
   IQAuthProvider,
   __useIQAuthInternal,
   useLocale,
@@ -2691,6 +3141,9 @@ export {
   IQAuthLoading,
   IQAuthLoaded,
   RedirectToSignIn,
+  performScopeSwitch,
+  performTenantSwitch,
+  claimSatisfiesScope,
   Protect,
   RedirectToSignedIn,
   useReturnTo,
@@ -2701,11 +3154,14 @@ export {
   sanitizeBrandCss,
   useResolvedSdkBranding,
   isSilentSsoEligible,
+  resolveAfterSignInDestination,
   SignIn,
   SignUp,
   UserButton,
   UserProfile,
   OrganizationSwitcher,
+  useMemberships,
+  ScopeSwitcher,
   useImpersonation,
   ImpersonationBanner,
   useReverification,