@matterfact/embed 0.4.0 → 0.6.0

package/dist/react.cjs

@@ -499,10 +499,11 @@ var init_snapshot = __esm({
 var context_exports = {};
 __export(context_exports, {
   artifactIdFromPath: () => artifactIdFromPath,
-  beginAuth: () => beginAuth,
+  buildPageContext: () => buildPageContext,
   callTool: () => callTool,
   grantsFromIframeSrcs: () => grantsFromIframeSrcs,
   isPrivate: () => isPrivate,
+  provideContext: () => provideContext,
   readPageContext: () => readPageContext,
   redact: () => redact,
   sendRegion: () => sendRegion,
@@ -560,8 +561,7 @@ function opaqueFrameCount() {
     }
   }).length;
 }
-function readPageContext() {
-  const declared = window.matterfact?.context ?? {};
+function buildPageContext(declared) {
   const found = embeddedMatterfactEntities();
   const opaque = opaqueFrameCount();
   return {
@@ -582,8 +582,30 @@ function readPageContext() {
     }
   };
 }
-function publishContext() {
-  send?.({ type: "host.context", context: readPageContext() });
+function readPageContext() {
+  return buildPageContext(
+    window.matterfact?.context ?? {}
+  );
+}
+async function resolveDeclaredContext() {
+  const mf = window.matterfact;
+  if (contextProvider) {
+    const c = await contextProvider();
+    if (c) return c;
+  }
+  if (mf?.getPageContext) {
+    const c = await mf.getPageContext();
+    if (c) return c;
+  }
+  return mf?.context ?? {};
+}
+async function publishContext() {
+  if (!pageContextOn) return;
+  const declared = await resolveDeclaredContext();
+  send?.({ type: "host.context", context: buildPageContext(declared) });
+}
+function provideContext() {
+  void publishContext();
 }
 function grantsFromIframeSrcs(srcs, origin) {
   const out = [];
@@ -675,7 +697,7 @@ function watchNavigation() {
     if (url === lastUrl) return;
     lastUrl = url;
     pushActivity({ type: "nav", summary: `navigated to ${url}` });
-    publishContext();
+    void publishContext();
     publishArtifactGrants();
   };
   navFire = fire;
@@ -765,27 +787,6 @@ async function callTool(call, emit) {
     error: "Host tools are read-only in this version; no action was taken."
   });
 }
-function beginAuth(config, emit) {
-  const w = window.open(
-    `${config.origin}/embed/authorize?k=${encodeURIComponent(
-      config.publishableKey
-    )}&o=${encodeURIComponent(location.origin)}`,
-    "mf_auth",
-    "width=460,height=640"
-  );
-  if (!w) return;
-  if (pendingAuthListener) window.removeEventListener("message", pendingAuthListener);
-  const onMsg = (event) => {
-    if (event.origin !== config.origin) return;
-    const d = event.data;
-    if (d?.type !== "mf:embed:auth") return;
-    window.removeEventListener("message", onMsg);
-    pendingAuthListener = null;
-    emit({ type: "host.auth", token: d.token, expiresAt: d.expiresAt });
-  };
-  pendingAuthListener = onMsg;
-  window.addEventListener("message", onMsg);
-}
 function stop() {
   document.removeEventListener("click", onClick, { capture: true });
   document.removeEventListener("submit", onSubmit, { capture: true });
@@ -805,31 +806,32 @@ function stop() {
     history.replaceState = origReplaceState;
     origReplaceState = null;
   }
-  if (pendingAuthListener) {
-    window.removeEventListener("message", pendingAuthListener);
-    pendingAuthListener = null;
-  }
   if (focusTimer) {
     clearTimeout(focusTimer);
     focusTimer = null;
   }
   send = null;
+  contextProvider = void 0;
   activity.length = 0;
   lastFocus = {};
   widgetOrigin = "";
   snapshotModule?.clearRefs();
 }
-function start(emit, origin, pageContext = true) {
+function start(emit, origin, pageContext = true, provider) {
   stop();
   send = emit;
   widgetOrigin = origin || "";
   lastUrl = location.pathname;
   pageContextOn = pageContext;
+  contextProvider = provider;
   if (pageContextOn) {
-    publishContext();
+    void publishContext();
     publishArtifactGrants();
     watchNavigation();
-    document.addEventListener("click", onClick, { capture: true, passive: true });
+    document.addEventListener("click", onClick, {
+      capture: true,
+      passive: true
+    });
     document.addEventListener("submit", onSubmit, {
       capture: true,
       passive: true
@@ -853,7 +855,7 @@ function start(emit, origin, pageContext = true) {
   const theme = matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
   emit({ type: "host.theme", mode: theme });
 }
-var widgetOrigin, MAX_ACTIVITY, send, activitySeq, activity, lastUrl, pageContextOn, navFire, origPushState, origReplaceState, pendingAuthListener, snapshotModule, PII, FORM_CONTROLS, ACTIONABLE, lastFocus, focusTimer, snapshotSeq;
+var widgetOrigin, MAX_ACTIVITY, send, activitySeq, activity, lastUrl, pageContextOn, contextProvider, navFire, origPushState, origReplaceState, snapshotModule, PII, FORM_CONTROLS, ACTIONABLE, lastFocus, focusTimer, snapshotSeq;
 var init_context = __esm({
   "src/context.ts"() {
     "use strict";
@@ -867,7 +869,6 @@ var init_context = __esm({
     navFire = null;
     origPushState = null;
     origReplaceState = null;
-    pendingAuthListener = null;
     snapshotModule = null;
     PII = [
       /\b[\w.+-]+@[\w-]+\.[\w.]{2,}\b/g,
@@ -989,6 +990,9 @@ var EmbedHost = class {
             this.iframe.style.height = `${Math.min(msg.height, window.innerHeight - 40)}px`;
           }
           break;
+        case "widget.requestContext":
+          void this.loadContext().then((m) => m.provideContext());
+          break;
         case "widget.requestSnapshot":
           void this.loadContext().then((m) => m.sendSnapshot(this.send));
           break;
@@ -1160,27 +1164,31 @@ var EmbedHost = class {
    *   window.matterfact = { getEmbedAuthToken: () => getIdToken(user) };
    *
    * Read fresh at call time (not at readConfig), so a global set after the loader booted
-   * — e.g. once the host's auth is ready — is still picked up. Otherwise fall back to the
-   * hosted-login popup. `expiresAt: 0`: the widget doesn't cache it, it exchanges the
-   * token for a rotating embed session anyway.
+   * — e.g. once the host's auth is ready — is still picked up. `expiresAt: 0`: the widget
+   * doesn't cache it, it exchanges the token for a rotating embed session anyway.
+   *
+   * No provider ⇒ this does nothing. The loader never opens a sign-in popup — the widget
+   * owns interactive sign-in (inline Firebase/email, and Microsoft's own MSAL login popup
+   * for Entra, then the PKCE token exchange), so the loader must not also fire its stale
+   * `/embed/authorize?k=&o=` popup, which the deployed authorize page no longer accepts.
    */
   async provideAuth() {
     const provider = this.config.authTokenProvider ?? globalThis.matterfact?.getEmbedAuthToken;
-    if (provider) {
-      try {
-        const token = await provider();
-        if (token) {
-          this.send({ type: "host.auth", token, expiresAt: 0 });
-          return;
-        }
-      } catch {
-      }
+    if (!provider) return;
+    try {
+      const token = await provider();
+      if (token) this.send({ type: "host.auth", token, expiresAt: 0 });
+    } catch {
     }
-    void this.loadContext().then((m) => m.beginAuth(this.config, this.send));
   }
   loadContext() {
     this.context ?? (this.context = Promise.resolve().then(() => (init_context(), context_exports)).then((m) => {
-      m.start(this.send, this.config.origin, this.config.pageContext);
+      m.start(
+        this.send,
+        this.config.origin,
+        this.config.pageContext,
+        this.config.pageContextProvider
+      );
       if (this.config.theme !== "auto") {
         this.send({ type: "host.theme", mode: this.config.theme });
       }
@@ -1221,6 +1229,7 @@ function MatterfactAgent({
   surface = "",
   theme = "auto",
   getAuthToken,
+  getPageContext,
   inline = false,
   className,
   style,
@@ -1229,6 +1238,8 @@ function MatterfactAgent({
 }) {
   const authRef = (0, import_react.useRef)(getAuthToken);
   authRef.current = getAuthToken;
+  const pageContextRef = (0, import_react.useRef)(getPageContext);
+  pageContextRef.current = getPageContext;
   const slot = (0, import_react.useRef)(null);
   (0, import_react.useEffect)(() => {
     if (typeof window === "undefined") return;
@@ -1241,6 +1252,9 @@ function MatterfactAgent({
       // Always present; a null return (no getAuthToken supplied) makes the core fall
       // back to the popup/inline sign-in, so this is safe either way.
       authTokenProvider: async () => await authRef.current?.() ?? null,
+      // Always present; a null return (no getPageContext supplied) makes the core fall
+      // back to window.matterfact.getPageContext / window.matterfact.context.
+      pageContextProvider: async () => await pageContextRef.current?.() ?? null,
       container: inline ? slot.current : null,
       pageContext,
       dev