@base44-preview/sdk 0.8.48-pr.282.8affbe6 → 0.8.48-pr.282.c69fdcd

package/dist/client.js

@@ -55,23 +55,18 @@ import { createActorsModule, resolveActorsHost, } from "./modules/actors.js";
  */
 export function createClient(config) {
     var _a, _b, _c, _d;
-    const { serverUrl = "https://base44.app", appId, analytics, token, serviceToken, requiresAuth = false, appBaseUrl, options, functionsVersion, headers: optionalHeaders, } = 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 : "";
-    const inBrowser = typeof window !== "undefined";
-    // A host platform embeds the app with a one-time token on the iframe URL.
-    // It comes off the URL here, before any other code can read it; the
-    // exchange that turns it into a session runs once the modules exist.
-    const embedOtt = inBrowser ? takeEmbedTokenFromUrl() : null;
-    const embedded = embedOtt !== null || (inBrowser && isEmbeddedTab());
+    const embedOtt = takeEmbedTokenFromUrl();
     if (embedOtt) {
         markEmbeddedTab();
     }
+    const embedded = Boolean(embedOtt) || isEmbeddedTab();
     // What an app passes as `token` is whatever getAccessToken() returned as the
     // page loaded. In an embedded frame that is the one-time token itself, or a
     // token an earlier visitor left in storage; neither is this session.
-    const configToken = embedded ? undefined : token;
-    let currentToken = configToken !== null && configToken !== void 0 ? configToken : null;
+    const token = embedded ? undefined : config.token;
     const socketConfig = {
         serverUrl,
         mountPath: "/ws-user-apps/socket.io/",
@@ -79,7 +74,7 @@ export function createClient(config) {
         appId,
         // null (not undefined): an embedded frame's only identity is the one the
         // platform minted, so the socket must not fall back to a stored token.
-        token: embedded ? null : configToken,
+        token: embedded ? null : token,
     };
     let socket = null;
     const getSocket = () => {
@@ -103,19 +98,19 @@ export function createClient(config) {
     const axiosClient = createAxiosClient({
         baseURL: `${serverUrl}/api`,
         headers,
-        token: configToken,
+        token,
         onError: options === null || options === void 0 ? void 0 : options.onError,
     });
     const functionsAxiosClient = createAxiosClient({
         baseURL: `${serverUrl}/api`,
         headers: functionHeaders,
-        token: configToken,
+        token,
         interceptResponses: false,
         onError: options === null || options === void 0 ? void 0 : options.onError,
     });
     const serviceRoleHeaders = {
         ...headers,
-        ...(configToken ? { "on-behalf-of": `Bearer ${configToken}` } : {}),
+        ...(token ? { "on-behalf-of": `Bearer ${token}` } : {}),
     };
     const serviceRoleAxiosClient = createAxiosClient({
         baseURL: `${serverUrl}/api`,
@@ -141,7 +136,7 @@ export function createClient(config) {
     const userAuthModule = createAuthModule(axiosClient, functionsAxiosClient, appId, {
         appBaseUrl: normalizedAppBaseUrl,
         serverUrl,
-        token: configToken,
+        token,
         embedded,
     });
     // Apply the access token before any module that may issue authenticated
@@ -150,25 +145,18 @@ export function createClient(config) {
     // request is built before setToken runs and goes out unauthenticated.
     // An embedded load skips this: its session comes from the exchange below,
     // and a token an earlier visitor left in storage must not become it.
-    if (inBrowser && !embedded) {
-        const accessToken = configToken || getAccessToken();
+    if (typeof window !== "undefined" && !embedded) {
+        const accessToken = token || getAccessToken();
         if (accessToken) {
-            currentToken = accessToken;
             userAuthModule.setToken(accessToken);
         }
     }
     // The one answer every module reads. Follows setToken and logout; outside an
     // embedded frame it still falls back to storage, so a login in another tab is
     // picked up on the next connection, as before.
-    const getToken = () => {
-        if (userAuthModule.hasToken()) {
-            return currentToken;
-        }
-        return embedded || !inBrowser ? null : getAccessToken();
-    };
+    const getToken = () => { var _a; return (_a = userAuthModule.getToken()) !== null && _a !== void 0 ? _a : (embedded ? null : getAccessToken()); };
     const applyToken = (newToken, saveToStorage) => {
         userAuthModule.setToken(newToken, saveToStorage);
-        currentToken = newToken;
         socketConfig.token = newToken;
         if (socket) {
             socket.updateConfig({ token: newToken });

package/dist/modules/auth.js

@@ -82,10 +82,13 @@ export function createAuthModule(axios, functionsAxiosClient, appId, options) {
     // Tracked here rather than read off `axios.defaults` so the answer stays tied
     // to the identity transitions below (`setToken`, `logout`) instead of to the
     // header a caller may have set on the instance directly.
-    let hasAccessToken = Boolean(options.token);
+    let accessToken = options.token || null;
     return {
         hasToken() {
-            return hasAccessToken;
+            return accessToken !== null;
+        },
+        getToken() {
+            return accessToken;
         },
         isEmbedded() {
             return Boolean(options.embedded);
@@ -161,7 +164,7 @@ export function createAuthModule(axios, functionsAxiosClient, appId, options) {
             // flight would otherwise resolve into callers that run after the logout.
             clearPendingMe();
             resetAnalyticsSessionContext();
-            hasAccessToken = false;
+            accessToken = null;
             // Only do the rest if in a browser environment
             if (typeof window !== "undefined") {
                 // Remove token from localStorage
@@ -190,7 +193,7 @@ export function createAuthModule(axios, functionsAxiosClient, appId, options) {
             // resolved for the previous one must not be handed to later callers.
             clearPendingMe();
             resetAnalyticsSessionContext();
-            hasAccessToken = true;
+            accessToken = token;
             // handle token change for axios clients
             axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
             functionsAxiosClient.defaults.headers.common["Authorization"] = `Bearer ${token}`;

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

@@ -560,4 +560,9 @@ 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}.
+     */
+    getToken(): string | null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@base44-preview/sdk",
-  "version": "0.8.48-pr.282.8affbe6",
+  "version": "0.8.48-pr.282.c69fdcd",
   "description": "JavaScript SDK for Base44 API",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",