@softr/sdk 0.0.87 → 0.0.88

package/dist/auth/isomorphic.d.ts

@@ -14,14 +14,15 @@ import * as _tanstack_react_start0 from "@tanstack/react-start";
  * to read.
  *
  * Register it once, as a global request middleware in the app's `src/start.ts`.
- * It writes nothing but the session cookie.
+ * It writes the session cookie, and in production a header that stops other
+ * sites from embedding the app.
  *
  * @example
  * export const startInstance = createStart(() => ({
  *   requestMiddleware: [softrAuthMiddleware()],
  * }))
  */
-declare function softrAuthMiddleware(): _tanstack_react_start0.RequestMiddlewareAfterServer<{}, readonly [_tanstack_react_start0.RequestMiddlewareAfterServer<{}, undefined, undefined>, _tanstack_react_start0.RequestMiddlewareAfterServer<{}, undefined, undefined>, _tanstack_react_start0.RequestMiddlewareAfterServer<{}, undefined, undefined>], {
+declare function softrAuthMiddleware(): _tanstack_react_start0.RequestMiddlewareAfterServer<{}, readonly [_tanstack_react_start0.RequestMiddlewareAfterServer<{}, undefined, undefined>, _tanstack_react_start0.RequestMiddlewareAfterServer<{}, undefined, undefined>, _tanstack_react_start0.RequestMiddlewareAfterServer<{}, undefined, undefined>, _tanstack_react_start0.RequestMiddlewareAfterServer<{}, undefined, undefined>], {
   user: User | null;
   permissions: Permissions;
   formatting: Formatting;

package/dist/auth/isomorphic.js

@@ -9,6 +9,7 @@ import { settings } from "./methods/settings.js";
 import { bootErrorMiddleware } from "../boot-error.js";
 import { pwaMiddleware } from "../pwa.js";
 import { faviconMiddleware } from "../favicon.js";
+import { embeddingMiddleware } from "../embedding.js";
 import { createContext, useContext } from "react";
 import { createMiddleware, createServerFn, getGlobalStartContext } from "@tanstack/react-start";
 import { getRequestHeader } from "@tanstack/react-start/server";
@@ -22,7 +23,8 @@ import { jsx } from "react/jsx-runtime";
 * to read.
 *
 * Register it once, as a global request middleware in the app's `src/start.ts`.
-* It writes nothing but the session cookie.
+* It writes the session cookie, and in production a header that stops other
+* sites from embedding the app.
 *
 * @example
 * export const startInstance = createStart(() => ({
@@ -31,6 +33,7 @@ import { jsx } from "react/jsx-runtime";
 */
 function softrAuthMiddleware() {
 	return createMiddleware({ type: "request" }).middleware([
+		embeddingMiddleware(),
 		bootErrorMiddleware(),
 		pwaMiddleware(),
 		faviconMiddleware()

package/dist/auth/methods/authenticator.js

@@ -46,7 +46,7 @@ async function confirmAuthenticatorSetup(details) {
 		throw new Error(`${result.message}. Check SOFTR_APPLICATION_ID and that the app allows an authenticator app.`);
 	}
 	const { session, backupCodes } = result.data;
-	writeCookies([makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
+	writeCookies([...makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
 		user: session.user,
 		permissions: session.permissions
 	}, session.jwt)]);
@@ -75,7 +75,7 @@ async function skipAuthenticatorSetup() {
 	}
 	const { session } = result.data;
 	assert(session, "Expected a session from skipping setup, but got none");
-	writeCookies([makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
+	writeCookies([...makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
 		user: session.user,
 		permissions: session.permissions
 	}, session.jwt)]);
@@ -101,7 +101,7 @@ async function verifyAuthenticator(credentials) {
 	}
 	const { session } = result.data;
 	assert(session, "Expected a session from verification, but got none");
-	writeCookies([makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
+	writeCookies([...makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
 		user: session.user,
 		permissions: session.permissions
 	}, session.jwt)]);

package/dist/auth/methods/code.js

@@ -56,7 +56,7 @@ async function signInWithCode(credentials) {
 	}
 	const { session } = result.data;
 	assert(session, "Expected a session from sign-in, but got none");
-	writeCookies([makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
+	writeCookies([...makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
 		user: session.user,
 		permissions: session.permissions
 	}, session.jwt)]);

package/dist/auth/methods/magicLink.js

@@ -36,7 +36,7 @@ async function signInWithMagicLink(credentials) {
 	}
 	const { session } = result.data;
 	assert(session, "Expected a session from magic-link sign-in, but got none");
-	writeCookies([makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
+	writeCookies([...makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
 		user: session.user,
 		permissions: session.permissions
 	}, session.jwt)]);

package/dist/auth/methods/password.js

@@ -35,7 +35,7 @@ async function signIn(credentials) {
 	}
 	const { session } = result.data;
 	assert(session, "Expected a session from sign-in, but got none");
-	writeCookies([makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
+	writeCookies([...makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
 		user: session.user,
 		permissions: session.permissions
 	}, session.jwt)]);

package/dist/auth/methods/passwordLink.js

@@ -68,7 +68,7 @@ async function setPasswordWithLink(details) {
 	}
 	const { session } = result.data;
 	assert(session, "Expected a session from setting a password, but got none");
-	writeCookies([makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
+	writeCookies([...makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
 		user: session.user,
 		permissions: session.permissions
 	}, session.jwt)]);

package/dist/auth/methods/signup.js

@@ -66,7 +66,7 @@ async function confirmSignUp(details) {
 	}
 	const { session } = result.data;
 	assert(session, "Expected a session from sign-up, but got none");
-	writeCookies([makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
+	writeCookies([...makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
 		user: session.user,
 		permissions: session.permissions
 	}, session.jwt)]);

package/dist/auth/methods/social.js

@@ -41,7 +41,7 @@ async function signInWithGoogle(credentials) {
 	}
 	const { session } = result.data;
 	assert(session, "Expected a session from Google sign-in, but got none");
-	writeCookies([makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
+	writeCookies([...makeSessionTokenCookie(session.jwt), makeSessionDataCookie({
 		user: session.user,
 		permissions: session.permissions
 	}, session.jwt)]);

package/dist/auth/platform.js

@@ -1,8 +1,8 @@
 import { assert, panic } from "../assertions.js";
 import { fetch } from "../fetch.js";
+import { softrConfig } from "../softr-config.js";
 import { permissionsSchema } from "./permissions.js";
 import { softrApiUrl } from "../softr-api.js";
-import { softrConfig } from "../softr-config.js";
 import { z } from "zod";
 
 //#region src/auth/platform.ts

package/dist/auth/session.js

@@ -1,4 +1,4 @@
-import { readRequestCookies, serializeCookie, writeCookies } from "../cookies.js";
+import { expireCookie, expireOtherCopy, readRequestCookies, serializeCookie, writeCookies } from "../cookies.js";
 import { permissionsSchema } from "./permissions.js";
 import { sessionConfig } from "./config.js";
 import { userSchema } from "./user.js";
@@ -65,12 +65,16 @@ function readSessionData(sessionToken) {
 		permissions: payload.permissions
 	};
 }
+/**
+* The token cookie, after a deletion of any copy from before `allowEmbedding`
+* changed. Both would be sent, and the old one could be read instead.
+*/
 function makeSessionTokenCookie(token) {
 	const { name, secure } = sessionCookie(SESSION_TOKEN);
-	return serializeCookie(name, sealEnvelope(token, SESSION_TOKEN), {
+	return [...expireOtherCopy(name, secure), serializeCookie(name, sealEnvelope(token, SESSION_TOKEN), {
 		maxAge: sessionConfig().sessionMaxAge,
 		secure
-	});
+	})];
 }
 function makeSessionDataCookie(session, sessionToken) {
 	const { name, secure } = sessionCookie(SESSION_DATA);
@@ -141,10 +145,7 @@ const sessionDataSchema = z.object({
 */
 function clearCookies(bases) {
 	const secure = requestIsSecure();
-	writeCookies(bases.flatMap((base) => secure ? [sessionCookieName(base, secure), base] : [base]).map((name) => serializeCookie(name, "", {
-		maxAge: 0,
-		secure
-	})));
+	writeCookies(bases.flatMap((base) => secure ? [sessionCookieName(base, secure), base] : [base]).flatMap((name) => expireCookie(name, secure)));
 }
 /**
 * Over the plaintext token, never the cookie value: that is resealed with a

package/dist/cookies.js

@@ -1,4 +1,5 @@
 import { softAssert } from "./assertions.js";
+import { softrConfig } from "./softr-config.js";
 import { getRequestHeader, getResponseHeaders, setResponseHeader } from "@tanstack/react-start/server";
 
 //#region src/cookies.ts
@@ -36,8 +37,33 @@ function serializeCookie(name, value, { maxAge, secure }) {
 	return parts.join("; ");
 }
 function sameSiteAttributes(secure) {
-	if (secure && process.env.NODE_ENV !== "production") return ["SameSite=None", "Partitioned"];
-	return ["SameSite=Lax"];
+	return partitions(secure) ? ["SameSite=None", "Partitioned"] : ["SameSite=Lax"];
+}
+function partitions(secure) {
+	return secure && (process.env.NODE_ENV !== "production" || (softrConfig().allowEmbedding ?? []).length > 0);
+}
+function expired(name, partitioned) {
+	return partitioned ? `${name}=; Path=/; HttpOnly; Secure; SameSite=None; Partitioned; Max-Age=0` : `${name}=; Path=/; HttpOnly; Secure; SameSite=Lax; Max-Age=0`;
+}
+/**
+* The deletions for one cookie. A browser keeps a partitioned and a plain
+* cookie of one name apart, and sends both. Which one the app wrote can change
+* between sign-in and sign-out, when `allowEmbedding` changes. So over https,
+* delete both. The one left behind would keep the visitor signed in.
+*/
+function expireCookie(name, secure) {
+	if (!secure) return [serializeCookie(name, "", {
+		maxAge: 0,
+		secure
+	})];
+	return [expired(name, false), expired(name, true)];
+}
+/**
+* The deletion of the copy the other mode would write. Sent with a new cookie,
+* so a copy from before `allowEmbedding` changed can't be read in its place.
+*/
+function expireOtherCopy(name, secure) {
+	return secure ? [expired(name, !partitions(secure))] : [];
 }
 const USER_TIMEZONE_COOKIE = "user-timezone";
 function readUserTimezone() {
@@ -56,4 +82,4 @@ function writeCookies(cookies) {
 }
 
 //#endregion
-export { readRequestCookies, readUserTimezone, serializeCookie, writeCookies };
+export { expireCookie, expireOtherCopy, readRequestCookies, readUserTimezone, serializeCookie, writeCookies };

package/dist/embedding.js

@@ -0,0 +1,33 @@
+import { softrConfig } from "./softr-config.js";
+import { createMiddleware } from "@tanstack/react-start";
+
+//#region src/embedding.ts
+/**
+* Stops other sites from showing the published app in an iframe. The origins
+* softr.json lists in `allowEmbedding` still can.
+*
+* Production only. The dev server runs in the preview pod, and Studio shows
+* that preview in an iframe on another site.
+*/
+function embeddingMiddleware() {
+	return createMiddleware({ type: "request" }).server(async ({ next }) => {
+		const result = await next();
+		if (process.env.NODE_ENV !== "production") return result;
+		const policy = [
+			"frame-ancestors",
+			"'self'",
+			...softrConfig().allowEmbedding ?? []
+		].join(" ");
+		try {
+			result.response.headers.append("content-security-policy", policy);
+			return result;
+		} catch {
+			const response = new Response(result.response.body, result.response);
+			response.headers.append("content-security-policy", policy);
+			return response;
+		}
+	});
+}
+
+//#endregion
+export { embeddingMiddleware };

package/dist/mcp.d.ts

@@ -1,5 +1,5 @@
 import { DatasourceAction } from "./action.js";
-import * as _tanstack_react_start5 from "@tanstack/react-start";
+import * as _tanstack_react_start6 from "@tanstack/react-start";
 
 //#region src/mcp.d.ts
 
@@ -31,6 +31,6 @@ type SoftrMcpOptions = {
  *   ],
  * }))
  */
-declare function softrMcpMiddleware(options?: SoftrMcpOptions): _tanstack_react_start5.RequestMiddlewareAfterServer<{}, undefined, undefined>;
+declare function softrMcpMiddleware(options?: SoftrMcpOptions): _tanstack_react_start6.RequestMiddlewareAfterServer<{}, undefined, undefined>;
 //#endregion
 export { softrMcpMiddleware };

package/dist/mcp.js

@@ -1,10 +1,10 @@
 import { assert } from "./assertions.js";
 import { fetch } from "./fetch.js";
+import { softrConfig } from "./softr-config.js";
 import { sessionConfig } from "./auth/config.js";
 import { readSessionToken, withSessionToken } from "./auth/session.js";
 import { softrApiUrl } from "./softr-api.js";
 import { isDatasourceAction } from "./action.js";
-import { softrConfig } from "./softr-config.js";
 import { makePlatform } from "./auth/platform.js";
 import { ds } from "./datasource/datasource.js";
 import { z } from "zod";

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.0.87";
+var version = "0.0.88";
 
 //#endregion
 export { version };

package/dist/route/route.js

@@ -1,6 +1,6 @@
 import { panic } from "../assertions.js";
-import { ACCESS_REASONS, checkRule } from "./visibility.js";
 import { softrConfig } from "../softr-config.js";
+import { ACCESS_REASONS, checkRule } from "./visibility.js";
 import { redirect } from "@tanstack/react-router";
 
 //#region src/route/route.ts

package/dist/softr-config.schema.js

@@ -21,6 +21,7 @@ const AccessBehaviour = z.union([
 	z.object({ strategy: z.literal("throw") })
 ], { error: "must be a path like \"/login\", { \"strategy\": \"redirect\", \"to\": \"/login\" } or { \"strategy\": \"throw\" }" });
 const AppPath = z.string().refine((path$1) => path$1.startsWith("/") && !path$1.includes("?") && !path$1.includes("#") && new URL(path$1, "https://app.invalid").origin === "https://app.invalid", { error: "must be a path on this app like \"/login\", with no \"?\" or \"#\"" });
+const Origin = z.union([z.literal("*"), z.string().regex(/^https:\/\/[^/\\?#@\s;,]+$/).refine(URL.canParse).transform((origin) => new URL(origin).origin)], { error: "must be an https origin like \"https://partner.com\", with no path or trailing \"/\", or \"*\" for any site" });
 const SoftrConfigSchema = z.object({
 	auth: z.strictObject({
 		routes: z.strictObject({
@@ -47,7 +48,8 @@ const SoftrConfigSchema = z.object({
 			alreadyAuthenticated: AccessBehaviour
 		})
 	}),
-	user: z.strictObject({ properties: z.record(z.string(), z.string()) }).optional()
+	user: z.strictObject({ properties: z.record(z.string(), z.string()) }).optional(),
+	allowEmbedding: z.array(Origin).optional()
 });
 function loadSoftrConfig(root) {
 	const file = path.join(root, SOFTR_CONFIG_FILE);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softr/sdk",
-  "version": "0.0.87",
+  "version": "0.0.88",
   "type": "module",
   "exports": {
     ".": { "types": "./dist/index.d.ts", "import": "./dist/index.js" },

package/schema/softr.schema.json

@@ -67,6 +67,11 @@
       },
       "required": ["properties"],
       "additionalProperties": false
+    },
+    "allowEmbedding": {
+      "type": "array",
+      "description": "Sites that may show the published app in an iframe, signed-in pages included, as https origins like \"https://partner.com\", or \"*\" for any site. Any other site is still blocked. With at least one, session cookies use SameSite=None, which drops the browser's CSRF protection. Empty by default.",
+      "items": { "type": "string", "pattern": "^(\\*|https://[^/\\\\?#@\\s;,]+)$" }
     }
   },
   "required": ["auth"],

package/skills/softr-sdk/SKILL.md

@@ -3,12 +3,13 @@ name: softr-sdk
 description: >-
   Entry point for @softr/sdk: its four entrypoints (@softr/sdk, /server,
   /client, /vite) and their client-server boundary, softrAuthMiddleware and the
-  Softr context, and which sub-skill covers each task. Load it when unsure which
-  sub-skill applies, or when touching the wiring.
+  Softr context, embedding the app in another site's iframe, and which sub-skill
+  covers each task. Load it when unsure which sub-skill applies, when touching
+  the wiring, or when the user wants the app embedded elsewhere.
 metadata:
   type: core
   library: softr-sdk
-  library_version: 0.0.87
+  library_version: 0.0.88
 ---
 
 # Softr SDK core
@@ -148,3 +149,7 @@ type User = {
   userGroupIds: Array<SoftrUserGroupId>   // the app's own group ids
 }
 ```
+
+## Embedding the app in another site
+
+The published app refuses to load inside another site's iframe. The Studio preview is not affected. When the user asks to embed the app on their site, list that site's origin in `softr.json`: `"allowEmbedding": ["https://partner.com"]`. Ask for the exact origin if you don't have it. Only listed sites can embed the app. Use `["*"]` only when the user wants any site to embed it. Remove the list to block embedding again. Sign-in then works inside the embed. Session cookies switch from SameSite=Lax to None, so the app loses the browser's CSRF protection. Only set it when the user asks. There are two more limits to tell the user: Safari may not keep the visitor signed in, and links from emails (magic link, password reset) open the app in a new tab, not in the embed.

package/skills/softr-sdk/auth/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.87
+  library_version: 0.0.88
 ---
 
 **Boundary.** `auth` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler — importing it into a component fails the build.

package/skills/softr-sdk/charts-and-metrics/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.87
+  library_version: 0.0.88
 ---
 
 **Boundary.** `ds` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler or a server-side route hook — importing it into a component fails the build. `defineQuery` and every type come from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/current-user/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.87
+  library_version: 0.0.88
 ---
 
 # The current user

package/skills/softr-sdk/file-uploads/SKILL.md

@@ -7,7 +7,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.87
+  library_version: 0.0.88
 ---
 
 **Boundary.** `upload` lives on `@softr/sdk/server` and runs inside server functions. `useFileUpload` and `FileItem` live on `@softr/sdk` and run in components. `FileAttachment` comes from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/formatting/SKILL.md

@@ -8,7 +8,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.87
+  library_version: 0.0.88
 ---
 
 # Dates, times and numbers

package/skills/softr-sdk/integrations/SKILL.md

@@ -7,7 +7,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.87
+  library_version: 0.0.88
 ---
 
 **Boundary.** `integration` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler — importing it into a component fails the build. `defineIntegration` and every type come from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/mcp/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.87
+  library_version: 0.0.88
 ---
 
 **Boundary.** `softrMcpMiddleware` lives on `@softr/sdk` and is registered once, in `src/start.ts`. The actions you hand it are the same `defineQuery` / `defineMutation` values the app's own pages use — declared wherever they already live, not duplicated for MCP.

package/skills/softr-sdk/pwa/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.87
+  library_version: 0.0.88
 ---
 
 # Installing the app

package/skills/softr-sdk/record-mutations/SKILL.md

@@ -8,7 +8,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.87
+  library_version: 0.0.88
 ---
 
 **Boundary.** `ds` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler — importing it into a component fails the build. `defineMutation` and every type come from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/record-queries/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.87
+  library_version: 0.0.88
 ---
 
 **Boundary.** `ds` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler or a server-side route hook — importing it into a component fails the build. The same holds for any helper that calls `ds`: declare it inside the handler. A function at module level that calls `ds` keeps the server-only import in the browser bundle, and every page stops loading until it moves. `defineQuery` and every type come from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/region-visibility/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.87
+  library_version: 0.0.88
 ---
 
 **Boundary.** `Audience` and `defineVisibility` come from `@softr/sdk` and work anywhere.

package/skills/softr-sdk/routes-and-visibility/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.87
+  library_version: 0.0.88
 ---
 
 **Boundary.** `definePage`, `pageHead`, the access functions and the error predicates come from `@softr/sdk` and work anywhere.

package/skills/softr-sdk/workflows/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.87
+  library_version: 0.0.88
 ---
 
 **Boundary.** `workflow` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler — importing it into a component fails the build. `defineWorkflow` and every type come from `@softr/sdk` and can be imported anywhere.