@base44-preview/sdk 0.8.48-pr.282.520fd69 → 0.8.48-pr.282.5d5566b

package/dist/client.js

@@ -5,7 +5,7 @@ import { createAuthModule } from "./modules/auth.js";
 import { createSsoModule } from "./modules/sso.js";
 import { createConnectorsModule, createUserConnectorsModule, } from "./modules/connectors.js";
 import { getAccessToken } from "./utils/auth-utils.js";
-import { exchangeEmbedToken, isEmbeddedTab, isFramed, markEmbeddedTab, takeEmbedTokenFromUrl, } from "./utils/embed-session.js";
+import { exchangeEmbedToken, takeEmbedTokenFromUrl, } from "./utils/embed-session.js";
 import { createFetchWithAuth } from "./utils/fetch-with-auth.js";
 import { createFunctionsModule } from "./modules/functions.js";
 import { createAgentsModule } from "./modules/agents.js";
@@ -58,19 +58,34 @@ export function createClient(config) {
     const { serverUrl = "https://base44.app", appId, analytics, serviceToken, requiresAuth = false, appBaseUrl, options, functionsVersion, headers: optionalHeaders, } = config;
     // Normalize appBaseUrl to always be a string (empty if not provided or invalid)
     const normalizedAppBaseUrl = typeof appBaseUrl === "string" ? appBaseUrl : "";
-    // Always taken off the URL, even outside a frame: a one-time token must not
-    // be left in the address bar, in history, or in a shared link.
-    const urlOtt = takeEmbedTokenFromUrl();
-    // Only redeemed inside a frame. Opened as a normal tab, the same URL falls
-    // back to the app's own login, which works there and cannot work in a frame.
-    const embedOtt = isFramed() ? urlOtt : null;
-    if (embedOtt) {
-        markEmbeddedTab();
+    const embedOtt = takeEmbedTokenFromUrl();
+    // Asked again on every use, so a session that arrives later — from the
+    // exchange, or from a login — reaches the socket and every other module.
+    // A declaration, not a const, so this block can stay above the auth module.
+    function getToken() {
+        var _a;
+        return (_a = userAuthModule.getToken()) !== null && _a !== void 0 ? _a : (embedOtt ? null : getAccessToken());
     }
-    const embedded = Boolean(embedOtt) || isEmbeddedTab();
-    // The passed token is the OTT itself whenever one came in on the URL, and a
-    // stale stored one in a frame. Neither of those is this session.
-    const token = urlOtt !== null || embedded ? undefined : config.token;
+    const socketConfig = {
+        serverUrl,
+        mountPath: "/ws-user-apps/socket.io/",
+        transports: ["websocket"],
+        appId,
+        getToken,
+    };
+    let socket = null;
+    const getSocket = () => {
+        if (!socket) {
+            socket = RoomsSocket({
+                config: socketConfig,
+            });
+        }
+        return socket;
+    };
+    // Apps read getAccessToken() as they load and pass the result in as `token`,
+    // so on an embedded load this is the OTT: proof of an identity, not one to
+    // send as a bearer. The exchange below is what turns it into a session.
+    const token = embedOtt ? undefined : config.token;
     const headers = {
         ...optionalHeaders,
         "X-App-Id": String(appId),
@@ -123,48 +138,36 @@ export function createClient(config) {
         appBaseUrl: normalizedAppBaseUrl,
         serverUrl,
         token,
-        embedded,
+        embedded: Boolean(embedOtt),
+        // The socket carries its token on the handshake, so an identity change
+        // only reaches it by opening a new connection — or, on logout, by
+        // dropping the one still running as the user who just left.
+        onSessionChange: (hasSession) => hasSession ? socket === null || socket === void 0 ? void 0 : socket.reconnect() : socket === null || socket === void 0 ? void 0 : socket.disconnect(),
     });
     // Apply the access token before any module that may issue authenticated
     // requests during construction (notably analytics, which fires an init
     // event whose flush calls auth.me()). Without this, the first User/me
     // request is built before setToken runs and goes out unauthenticated.
-    // Skipped in a frame: the session comes from the exchange below.
-    if (typeof window !== "undefined" && !embedded) {
+    // Not in a frame: a stored token there belongs to an earlier visitor, not to
+    // this session, which only the exchange below can produce.
+    if (typeof window !== "undefined" && !embedOtt) {
         const accessToken = token || getAccessToken();
         if (accessToken) {
             userAuthModule.setToken(accessToken);
         }
     }
-    // Live token for every module; outside a frame it still falls back to storage.
-    const getToken = () => { var _a; return (_a = userAuthModule.getToken()) !== null && _a !== void 0 ? _a : (embedded ? null : getAccessToken()); };
-    const socketConfig = {
-        serverUrl,
-        mountPath: "/ws-user-apps/socket.io/",
-        transports: ["websocket"],
-        appId,
-        getToken,
-    };
-    let socket = null;
-    const getSocket = () => {
-        if (!socket) {
-            socket = RoomsSocket({ config: socketConfig });
-        }
-        return socket;
-    };
-    const applyToken = (newToken, saveToStorage) => {
-        userAuthModule.setToken(newToken, saveToStorage);
-        socket === null || socket === void 0 ? void 0 : socket.reconnect();
-    };
+    const session = embedOtt
+        ? exchangeEmbedToken({ serverUrl, appId, ott: embedOtt })
+        : null;
     // Settles once the exchanged session is applied (memory only); at once
     // otherwise. Never rejects: every request waits on it, so a failure here
     // must not turn into a rejection on each of them.
-    const authReady = embedOtt
-        ? exchangeEmbedToken({ serverUrl, appId, ott: embedOtt })
+    const authReady = session
+        ? session
             .then((sessionToken) => {
             var _a;
             if (sessionToken) {
-                applyToken(sessionToken, false);
+                userAuthModule.setToken(sessionToken, false);
                 return;
             }
             // The app is about to run anonymous. Say why, once, instead of
@@ -177,7 +180,7 @@ export function createClient(config) {
             console.error("Base44: applying the embedded session failed:", e);
         })
         : Promise.resolve();
-    if (embedOtt) {
+    if (session) {
         // Requests issued during the exchange wait for it. Registered after createAxiosClient's
         // interceptors so it runs first and the anonymous-visitor header sees the Authorization.
         for (const client of [axiosClient, functionsAxiosClient]) {
@@ -197,7 +200,10 @@ export function createClient(config) {
         // URL needs an absolute host, so fall back to the page origin.
         host: resolveActorsHost(serverUrl, typeof window !== "undefined" ? (_a = window.location) === null || _a === void 0 ? void 0 : _a.origin : undefined),
         functionsVersion,
-        getAuthToken: getToken,
+        getAuthToken: async () => {
+            await authReady;
+            return getToken();
+        },
         mintConnectionToken: async (actorName, room, connectionId) => {
             await authReady;
             const authToken = getToken();
@@ -225,6 +231,7 @@ export function createClient(config) {
         connectors: createUserConnectorsModule(axiosClient, appId),
         auth: userAuthModule,
         functions: createFunctionsModule(functionsAxiosClient, appId, {
+            waitForAuth: () => authReady,
             getAuthHeaders: () => {
                 const headers = {};
                 const sessionToken = getToken();
@@ -240,6 +247,8 @@ export function createClient(config) {
             getSocket,
             appId,
             serverUrl,
+            // Read synchronously, unlike everything else: these build a URL rather
+            // than issue a request, so during the exchange they see no token.
             getToken,
         }),
         aiGateway: createAiGatewayModule({ serverUrl, getToken, appId }),
@@ -287,7 +296,10 @@ export function createClient(config) {
             getSocket,
             appId,
             serverUrl,
-            getToken: () => token,
+            // The user's token, as on the user-scoped module: the only thing this is
+            // read for is the `?token=` on a channel URL handed to that user, which
+            // the app's service credential must never end up in.
+            getToken,
         }),
         aiGateway: createAiGatewayModule({
             serverUrl,
@@ -328,12 +340,12 @@ export function createClient(config) {
             serverUrl,
             functionsVersion,
             platformHeaders: optionalHeaders,
+            waitForAuth: () => authReady,
         }),
         /**
          * Sets a new authentication token for all subsequent requests.
          *
          * @param newToken - The new authentication token
-         * @param saveToStorage - Whether to also keep the token in local storage. Defaults to `true`.
          *
          * @example
          * ```typescript
@@ -345,8 +357,8 @@ export function createClient(config) {
          * base44.setToken(access_token);
          * ```
          */
-        setToken(newToken, saveToStorage = true) {
-            applyToken(newToken, saveToStorage);
+        setToken(newToken) {
+            userAuthModule.setToken(newToken, true);
         },
         /**
          * Gets the current client configuration.

package/dist/client.types.d.ts

@@ -200,9 +200,8 @@ export interface Base44Client {
      * Updates the token for both HTTP requests and WebSocket connections.
      *
      * @param newToken - The new authentication token.
-     * @param saveToStorage - Whether to also keep the token in local storage so it survives a page load. Defaults to `true`.
      */
-    setToken(newToken: string, saveToStorage?: boolean): void;
+    setToken(newToken: string): void;
     /**
      * Gets the current client configuration.
      * @internal

package/dist/modules/actors.d.ts

@@ -11,8 +11,9 @@ interface ActorsConfig {
     appId: string;
     /** Current user access token, if authenticated. Rides the WS query on the
      * proxy-fallback path so the platform proxy can authenticate the connection;
-     * anonymous connects omit it. */
-    getAuthToken(): string | null | undefined;
+     * anonymous connects omit it. Awaited per dial, so a session still being
+     * exchanged is in hand before the URL is built. */
+    getAuthToken(): Promise<string | null | undefined>;
     /** Same semantics as function calls: editors with a non-prod version get the
      * draft actor script; everyone else gets the published one. */
     functionsVersion?: string;

package/dist/modules/actors.js

@@ -83,7 +83,7 @@ class Connection {
                 }
             }
             // Rebuilt per attempt so a login/logout is picked up on reconnect.
-            return buildProxyActorUrl(config.host, actorName, instanceId, this.id, config.appId, config.getAuthToken(), config.functionsVersion);
+            return buildProxyActorUrl(config.host, actorName, instanceId, this.id, config.appId, await config.getAuthToken(), config.functionsVersion);
         };
         const ws = new ReconnectingWebSocket(urlProvider);
         this.ws = ws;

package/dist/modules/agents.types.d.ts

@@ -161,7 +161,7 @@ export interface AgentsModuleConfig {
     /** Server URL */
     serverUrl?: string;
     /** Returns the current authentication token, if any */
-    getToken: () => string | null | undefined;
+    getToken: () => string | null;
 }
 /**
  * Agents module for managing AI agent conversations.
@@ -360,7 +360,9 @@ export interface AgentsModule {
      * Gets WhatsApp connection URL for an agent.
      *
      * Generates a URL that users can use to connect with the agent through WhatsApp.
-     * The URL includes authentication if a token is available.
+     * The URL includes authentication if a token is available. In an app a
+     * platform has embedded, that is only once the session has been exchanged —
+     * await a call such as `base44.auth.me()` before building the URL.
      *
      * @param agentName - The name of the agent.
      * @returns WhatsApp connection URL.
@@ -378,7 +380,9 @@ export interface AgentsModule {
      * Gets Telegram connection URL for an agent.
      *
      * Generates a URL that users can use to connect with the agent through Telegram.
-     * The URL includes authentication if a token is available. When the user opens
+     * The URL includes authentication if a token is available. In an app a
+     * platform has embedded, that is only once the session has been exchanged —
+     * await a call such as `base44.auth.me()` before building the URL. When the user opens
      * this URL, they are redirected to the agent's Telegram bot with an activation
      * code that securely links their account.
      *

package/dist/modules/auth.js

@@ -116,8 +116,11 @@ export function createAuthModule(axios, functionsAxiosClient, appId, options) {
             if (typeof window === "undefined") {
                 throw new Error("Login method can only be used in a browser environment");
             }
-            // An embedded session can only be renewed by the host platform; the
-            // login round trip cannot complete inside its frame.
+            // Only the host platform can sign a platform user in, so there is no
+            // login page to send them to. (The app's own login would work in the
+            // frame — `loginWithProvider` opens a popup — but it would mint a
+            // different, app-level identity.) An app that wants its own notice
+            // checks `isEmbedded()` rather than asking for a login it cannot get.
             if (options.embedded) {
                 showEmbedSessionEnded();
                 return;
@@ -158,13 +161,18 @@ export function createAuthModule(axios, functionsAxiosClient, appId, options) {
         },
         // Logout the current user
         logout(redirectUrl) {
-            // Remove token from axios headers (always do this)
+            var _a;
+            // Remove the token from both axios instances (always do this). Missing
+            // the functions one used to be hidden by the redirect below tearing the
+            // page down; an embedded logout returns instead, so the page lives on.
             delete axios.defaults.headers.common["Authorization"];
+            delete functionsAxiosClient.defaults.headers.common["Authorization"];
             // Drop identity resolved under the previous session: a `me()` already in
             // flight would otherwise resolve into callers that run after the logout.
             clearPendingMe();
             resetAnalyticsSessionContext();
             accessToken = null;
+            (_a = options.onSessionChange) === null || _a === void 0 ? void 0 : _a.call(options, false);
             // Only do the rest if in a browser environment
             if (typeof window !== "undefined") {
                 // Remove token from localStorage
@@ -178,6 +186,13 @@ export function createAuthModule(axios, functionsAxiosClient, appId, options) {
                         console.error("Failed to remove token from localStorage:", e);
                     }
                 }
+                // An embedded session holds no app cookie to clear — it lived in
+                // memory — and navigating a third-party frame to the logout endpoint
+                // would only break the frame. The state above is already cleared.
+                if (options.embedded) {
+                    showEmbedSessionEnded();
+                    return;
+                }
                 // Determine the from_url parameter
                 const fromUrl = redirectUrl || window.location.href;
                 // Redirect to server-side logout endpoint to clear HTTP-only cookies
@@ -187,6 +202,7 @@ export function createAuthModule(axios, functionsAxiosClient, appId, options) {
         },
         // Set authentication token
         setToken(token, saveToStorage = true) {
+            var _a;
             if (!token)
                 return;
             // An embedded session belongs to the frame the platform minted it for.
@@ -201,6 +217,7 @@ export function createAuthModule(axios, functionsAxiosClient, appId, options) {
             // handle token change for axios clients
             axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
             functionsAxiosClient.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+            (_a = options.onSessionChange) === null || _a === void 0 ? void 0 : _a.call(options, true);
             // Save token to localStorage if requested
             if (persist && typeof window !== "undefined" && window.localStorage) {
                 try {

package/dist/modules/auth.types.d.ts

@@ -98,11 +98,13 @@ export interface AuthModuleOptions {
      * which is how the server-side SDK reports a token it never sets explicitly.
      */
     token?: string;
+    /** Whether a host platform embedded this client in a frame. */
+    embedded?: boolean;
     /**
-     * Whether this client runs embedded in a host platform's frame, where a
-     * session is minted by the platform and cannot be renewed by a login redirect.
+     * Called when the identity changes: `true` on `setToken`, `false` on
+     * `logout`. Lets the client redial the socket, which holds its own copy.
      */
-    embedded?: boolean;
+    onSessionChange?: (hasSession: boolean) => void;
 }
 /**
  * Authentication module for managing user authentication and authorization. The module automatically stores tokens in local storage when available and manages authorization headers for API requests.
@@ -185,11 +187,13 @@ export interface AuthModule {
      */
     redirectToLogin(nextUrl: string): void;
     /**
-     * Whether the app is running embedded in a host platform.
+     * Whether a host platform embedded this app and signed its user in.
+     *
+     * Only the platform can renew that session, so {@linkcode AuthModule.redirectToLogin | redirectToLogin()} and {@linkcode AuthModule.logout | logout()} show a "session ended" notice rather than a login page. Use this to render your own notice, or to hide sign-in controls that cannot work in the frame.
      *
-     * A platform embeds an app in an iframe and signs its user in by minting a one-time token onto the frame's URL; the SDK trades it for a session as the client is created. That session is held in memory only and can be renewed only by the platform, so when it ends there is no login page to send the user to — {@linkcode AuthModule.redirectToLogin | redirectToLogin()} shows a "session ended" notice instead. Use this to render your own notice or to hide sign-in and sign-out controls that cannot work inside the frame.
+     * The session lives in memory, so a reload inside the frame ends it and returns `false` here. Prefer client-side navigation.
      *
-     * @returns `true` when the app was embedded by a host platform, `false` otherwise.
+     * @returns `true` when a host platform embedded this app.
      *
      * @example
      * ```typescript
@@ -560,9 +564,6 @@ export interface InternalAuthModule extends AuthModule {
      * could not succeed without a session, not to decide that one is valid.
      */
     hasToken(): boolean;
-    /**
-     * The access token currently set on the client, or `null` when there is none.
-     * Follows {@linkcode AuthModule.setToken | setToken} and {@linkcode AuthModule.logout | logout}.
-     */
+    /** The token currently set on the client, or `null`. */
     getToken(): string | null;
 }

package/dist/modules/functions.js

@@ -65,8 +65,12 @@ export function createFunctionsModule(axios, appId, config) {
         },
         // Fetch a backend function endpoint directly.
         async fetch(path, init = {}) {
+            var _a;
             const normalizedPath = path.startsWith("/") ? path : `/${path}`;
             const primaryPath = `/functions${normalizedPath}`;
+            // Headers are read after this: a session still being negotiated must be
+            // in hand before the Authorization is built, not after.
+            await ((_a = config === null || config === void 0 ? void 0 : config.waitForAuth) === null || _a === void 0 ? void 0 : _a.call(config));
             const headers = toHeaders(init.headers);
             const requestInit = {
                 ...init,

package/dist/modules/functions.types.d.ts

@@ -29,6 +29,12 @@ export type FunctionsFetchInit = RequestInit;
 export interface FunctionsModuleConfig {
     getAuthHeaders?: () => Record<string, string>;
     baseURL?: string;
+    /**
+     * Resolves once the client's session is settled. `fetch` builds its headers
+     * by hand rather than through axios, so without this it would miss the gate
+     * every other request goes through.
+     */
+    waitForAuth?: () => Promise<void>;
 }
 /**
  * Functions module for invoking custom backend functions.

package/dist/utils/auth-utils.d.ts

@@ -5,7 +5,7 @@ import { GetAccessTokenOptions, SaveAccessTokenOptions, RemoveAccessTokenOptions
  * Low-level utility for manually retrieving tokens. In most cases, the Base44 client handles
  * token management automatically. This function is useful for custom authentication flows or when you need direct access to stored tokens. Requires a browser environment and can't be used in the backend.
  *
- * When a host platform has embedded the app with a one-time token (`?ott=`), that token is returned as it stands: it is what {@linkcode createClient} trades for the session, so a page that gates on "is there a token?" as it loads sees one. It is neither stored nor removed from the URL here.
+ * When a host platform has embedded the app with a one-time token (`?ott=`), that token is returned as it stands: it is what {@linkcode createClient} trades for the session, so a page that gates on "is there a token?" as it loads sees one. It is neither stored nor removed from the URL here, and it is reported only inside a frame, where such a token is redeemed.
  *
  * @internal
  *

package/dist/utils/auth-utils.js

@@ -1,11 +1,13 @@
-import { EMBED_TOKEN_PARAM } from "./embed-session.js";
+import { EMBED_TOKEN_PARAM, isFramed } from "./embed-session.js";
+/** The URL parameter a Base44 session token arrives on. */
+const DEFAULT_TOKEN_PARAM = "access_token";
 /**
  * Retrieves an access token from URL parameters or local storage.
  *
  * Low-level utility for manually retrieving tokens. In most cases, the Base44 client handles
  * token management automatically. This function is useful for custom authentication flows or when you need direct access to stored tokens. Requires a browser environment and can't be used in the backend.
  *
- * When a host platform has embedded the app with a one-time token (`?ott=`), that token is returned as it stands: it is what {@linkcode createClient} trades for the session, so a page that gates on "is there a token?" as it loads sees one. It is neither stored nor removed from the URL here.
+ * When a host platform has embedded the app with a one-time token (`?ott=`), that token is returned as it stands: it is what {@linkcode createClient} trades for the session, so a page that gates on "is there a token?" as it loads sees one. It is neither stored nor removed from the URL here, and it is reported only inside a frame, where such a token is redeemed.
  *
  * @internal
  *
@@ -38,7 +40,7 @@ import { EMBED_TOKEN_PARAM } from "./embed-session.js";
  * ```
  */
 export function getAccessToken(options = {}) {
-    const { storageKey = "base44_access_token", paramName = "access_token", saveToStorage = true, removeFromUrl = true, } = options;
+    const { storageKey = "base44_access_token", paramName = DEFAULT_TOKEN_PARAM, saveToStorage = true, removeFromUrl = true, } = options;
     let token = null;
     // Try to get token from URL parameters
     if (typeof window !== "undefined" && window.location) {
@@ -63,9 +65,16 @@ export function getAccessToken(options = {}) {
             // session yet — createClient takes it off the URL and exchanges it — but
             // it is the identity this load arrives with, and callers that read this
             // once as the page loads must not conclude there is none.
-            const embedToken = urlParams.get(EMBED_TOKEN_PARAM);
-            if (embedToken) {
-                return embedToken;
+            //
+            // Only in a frame, and only for the parameter a session arrives on: a
+            // one-time token is redeemed nowhere else, so a top-level load still
+            // carrying one (a URL rewrite the browser refused) must not have it
+            // applied as a session — and never saved as one.
+            if (paramName === DEFAULT_TOKEN_PARAM && isFramed()) {
+                const embedToken = urlParams.get(EMBED_TOKEN_PARAM);
+                if (embedToken) {
+                    return embedToken;
+                }
             }
         }
         catch (e) {

package/dist/utils/embed-session.d.ts

@@ -7,53 +7,29 @@
  * grant (RFC 8693), and keeps the result in memory only — never in storage — so
  * the session lives and dies with the frame.
  *
- * @internal
- */
-/** The query parameter a host platform puts the one-time token on. @internal */
-export declare const EMBED_TOKEN_PARAM = "ott";
-/**
- * Reads the one-time token off the current URL and strips it, so it is never
- * left in the address bar, in history, or in a shared link.
+ * Taking the token off the URL is unconditional — a one-time token must not be
+ * left in the address bar, in history, or in a shared link — but it is only
+ * reported back inside a frame, the only place one is redeemed. It is gone once
+ * the first client has taken it, so the session belongs to that client — an app
+ * creates one.
  *
- * @internal
- */
-export declare function takeEmbedTokenFromUrl(): string | null;
-/**
- * Whether this document is rendered inside a frame. Read at call time, not at
- * import: a module-level answer would be fixed before a host (or a test) has
- * set the window up.
+ * The exchange endpoint is rate limited per app, and its limiter refuses before
+ * the one-time token is redeemed — so a 429 leaves the token still valid and is
+ * worth retrying once.
  *
  * @internal
  */
+export declare const EMBED_TOKEN_PARAM = "ott";
+/** @internal */
+export declare function takeEmbedTokenFromUrl(): string | null;
+/** @internal */
 export declare function isFramed(): boolean;
-/**
- * Whether this tab previously redeemed an embed token. Counts only inside a
- * frame: a top-level tab that once carried a token must fall back to the
- * regular login, or it could never sign in again.
- *
- * @internal
- */
-export declare function isEmbeddedTab(): boolean;
 /** @internal */
-export declare function markEmbeddedTab(): void;
-/**
- * Trades a one-time embed token for an app-user session token. Resolves to
- * `null` when the platform refuses the token; never throws.
- *
- * @internal
- */
 export declare function exchangeEmbedToken({ serverUrl, appId, ott, fetchImpl, }: {
     serverUrl: string;
     appId: string;
     ott: string;
     fetchImpl?: typeof fetch;
 }): Promise<string | null>;
-/**
- * Covers the page with a plain "session ended" notice. An embedded session can
- * only be renewed by the host platform, so this stands in for the login
- * redirect, which cannot complete inside a frame. The copy points at the host
- * page: reloading the frame itself carries no token and lands here again.
- *
- * @internal
- */
+/** @internal */
 export declare function showEmbedSessionEnded(): void;

package/dist/utils/embed-session.js

@@ -7,22 +7,26 @@
  * grant (RFC 8693), and keeps the result in memory only — never in storage — so
  * the session lives and dies with the frame.
  *
+ * Taking the token off the URL is unconditional — a one-time token must not be
+ * left in the address bar, in history, or in a shared link — but it is only
+ * reported back inside a frame, the only place one is redeemed. It is gone once
+ * the first client has taken it, so the session belongs to that client — an app
+ * creates one.
+ *
+ * The exchange endpoint is rate limited per app, and its limiter refuses before
+ * the one-time token is redeemed — so a 429 leaves the token still valid and is
+ * worth retrying once.
+ *
  * @internal
  */
-/** The query parameter a host platform puts the one-time token on. @internal */
 export const EMBED_TOKEN_PARAM = "ott";
-const EMBED_TAB_KEY = "base44_embed_session";
 const GRANT_TYPE = "urn:ietf:params:oauth:grant-type:token-exchange";
 const SUBJECT_TOKEN_TYPE = "urn:base44:params:oauth:token-type:embed-ott";
 const RATE_LIMITED = 429;
 const RATE_LIMIT_RETRY_MS = 1000;
+const EXCHANGE_TIMEOUT_MS = 15000;
 const SESSION_ENDED_ELEMENT_ID = "base44-embed-session-ended";
-/**
- * Reads the one-time token off the current URL and strips it, so it is never
- * left in the address bar, in history, or in a shared link.
- *
- * @internal
- */
+/** @internal */
 export function takeEmbedTokenFromUrl() {
     if (typeof window === "undefined" || !window.location) {
         return null;
@@ -38,73 +42,20 @@ export function takeEmbedTokenFromUrl() {
         window.history.replaceState(window.history.state, "", url.toString());
     }
     catch (e) {
-        // The token was read but the URL could not be rewritten (history blocked,
-        // a sandboxed frame, replaceState rate-limited). Return it anyway: it is
-        // this load's identity, and dropping it here would leave `?ott=` on the
-        // URL for getAccessToken to hand back as if it were a session token.
         console.error("Error retrieving embed token from URL:", e);
     }
-    return ott;
+    return isFramed() ? ott : null;
 }
-/**
- * Whether this document is rendered inside a frame. Read at call time, not at
- * import: a module-level answer would be fixed before a host (or a test) has
- * set the window up.
- *
- * @internal
- */
+/** @internal */
 export function isFramed() {
-    if (typeof window === "undefined") {
-        return false;
-    }
-    try {
-        return window.self !== window.top;
-    }
-    catch (_a) {
-        // Reaching the top window can be refused outright; if we cannot see it,
-        // we are certainly not it.
-        return true;
-    }
-}
-/**
- * Whether this tab previously redeemed an embed token. Counts only inside a
- * frame: a top-level tab that once carried a token must fall back to the
- * regular login, or it could never sign in again.
- *
- * @internal
- */
-export function isEmbeddedTab() {
-    if (typeof window === "undefined") {
-        return false;
-    }
-    // A cross-site frame is third-party storage, which some browsers block
-    // outright — every access can throw, and the marker is then unavailable.
-    try {
-        return isFramed() && window.sessionStorage.getItem(EMBED_TAB_KEY) === "1";
-    }
-    catch (_a) {
-        return false;
-    }
+    return typeof window !== "undefined" && window.self !== window.top;
 }
 /** @internal */
-export function markEmbeddedTab() {
-    try {
-        window.sessionStorage.setItem(EMBED_TAB_KEY, "1");
-    }
-    catch (_a) {
-        /* storage blocked */
-    }
-}
-/**
- * Trades a one-time embed token for an app-user session token. Resolves to
- * `null` when the platform refuses the token; never throws.
- *
- * @internal
- */
 export async function exchangeEmbedToken({ serverUrl, appId, ott, fetchImpl = fetch, }) {
     const post = () => fetchImpl(`${serverUrl}/api/apps/${appId}/auth/embed/token`, {
         method: "POST",
         headers: { "X-App-Id": String(appId) },
+        signal: AbortSignal.timeout(EXCHANGE_TIMEOUT_MS),
         body: new URLSearchParams({
             grant_type: GRANT_TYPE,
             subject_token: ott,
@@ -113,7 +64,6 @@ export async function exchangeEmbedToken({ serverUrl, appId, ott, fetchImpl = fe
     });
     try {
         let response = await post();
-        // The limiter refuses before the token is redeemed, so it is still valid.
         if (response.status === RATE_LIMITED) {
             await new Promise((resolve) => setTimeout(resolve, RATE_LIMIT_RETRY_MS));
             response = await post();
@@ -129,14 +79,7 @@ export async function exchangeEmbedToken({ serverUrl, appId, ott, fetchImpl = fe
         return null;
     }
 }
-/**
- * Covers the page with a plain "session ended" notice. An embedded session can
- * only be renewed by the host platform, so this stands in for the login
- * redirect, which cannot complete inside a frame. The copy points at the host
- * page: reloading the frame itself carries no token and lands here again.
- *
- * @internal
- */
+/** @internal */
 export function showEmbedSessionEnded() {
     if (typeof document === "undefined" || !document.body) {
         return;
@@ -144,21 +87,26 @@ export function showEmbedSessionEnded() {
     if (document.getElementById(SESSION_ENDED_ELEMENT_ID)) {
         return;
     }
+    const style = document.createElement("style");
+    style.textContent =
+        `#${SESSION_ENDED_ELEMENT_ID}{--b44-bg:#fff;--b44-fg:#0f172a;--b44-muted:#475569;}` +
+            `@media (prefers-color-scheme:dark){#${SESSION_ENDED_ELEMENT_ID}` +
+            `{--b44-bg:#0f172a;--b44-fg:#f8fafc;--b44-muted:#94a3b8;}}`;
     const overlay = document.createElement("div");
     overlay.id = SESSION_ENDED_ELEMENT_ID;
     overlay.setAttribute("role", "alert");
     overlay.style.cssText =
         "position:fixed;inset:0;z-index:2147483647;display:flex;align-items:center;" +
-            "justify-content:center;background:#fff;color:#0f172a;" +
+            "justify-content:center;background:var(--b44-bg);color:var(--b44-fg);" +
             "font-family:ui-sans-serif,system-ui,sans-serif;text-align:center;padding:2rem;";
     const title = document.createElement("h1");
     title.textContent = "Session ended";
     title.style.cssText = "font-size:1.5rem;font-weight:700;margin:0 0 .75rem;";
     const body = document.createElement("p");
     body.textContent = "Reload this page in your browser to start a new session.";
-    body.style.cssText = "margin:0;color:#475569;";
+    body.style.cssText = "margin:0;color:var(--b44-muted);";
     const card = document.createElement("div");
     card.append(title, body);
-    overlay.append(card);
+    overlay.append(style, card);
     document.body.append(overlay);
 }

package/dist/utils/fetch-with-auth.d.ts

@@ -33,11 +33,13 @@ export interface FetchWithAuthInit extends RequestInit {
  * has none, so nothing is sent.
  * @internal
  */
-export declare function createFetchWithAuth({ axios, serviceRoleAxios, appId, serverUrl, functionsVersion, platformHeaders, }: {
+export declare function createFetchWithAuth({ axios, serviceRoleAxios, appId, serverUrl, functionsVersion, platformHeaders, waitForAuth, }: {
     axios: AxiosInstance;
     serviceRoleAxios: AxiosInstance;
     appId: string;
     serverUrl: string;
     functionsVersion?: string;
     platformHeaders?: Record<string, string>;
+    /** Resolves once the client's session is settled. */
+    waitForAuth?: () => Promise<void>;
 }): (path: string, init?: FetchWithAuthInit) => Promise<Response>;

package/dist/utils/fetch-with-auth.js

@@ -21,7 +21,7 @@
  * has none, so nothing is sent.
  * @internal
  */
-export function createFetchWithAuth({ axios, serviceRoleAxios, appId, serverUrl, functionsVersion, platformHeaders, }) {
+export function createFetchWithAuth({ axios, serviceRoleAxios, appId, serverUrl, functionsVersion, platformHeaders, waitForAuth, }) {
     const inherited = new Headers(platformHeaders);
     const bearer = (client) => {
         const header = client.defaults.headers.common["Authorization"];
@@ -31,6 +31,9 @@ export function createFetchWithAuth({ axios, serviceRoleAxios, appId, serverUrl,
     };
     return async function fetchWithAuth(path, init = {}) {
         assertOwnOriginPath(path);
+        // The Authorization below is read off the axios defaults, which a session
+        // still being negotiated has not written yet.
+        await (waitForAuth === null || waitForAuth === void 0 ? void 0 : waitForAuth());
         const { fetch: transport = fetch, ...requestInit } = init;
         const headers = new Headers(init.headers);
         // A caller-supplied value always wins, so a route can hand the callee a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@base44-preview/sdk",
-  "version": "0.8.48-pr.282.520fd69",
+  "version": "0.8.48-pr.282.5d5566b",
   "description": "JavaScript SDK for Base44 API",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",