zitejs 0.9.104 → 0.9.105

package/dist/cjs/auth/index.js

@@ -7,6 +7,7 @@ exports.logout = logout;
 exports.updateProfile = updateProfile;
 const react_1 = require("better-auth/react");
 const plugins_1 = require("better-auth/client/plugins");
+const constants_js_1 = require("./constants.js");
 const authClient = (0, react_1.createAuthClient)({
     baseURL: '',
     plugins: [
@@ -57,10 +58,21 @@ function loginWithRedirect(opts) {
     // the address bar of every logged-out visitor to the front page, which is the
     // common case. Only pass a destination when it IS one.
     const isRoot = target.pathname === '/' && target.search === '' && target.hash === '';
-    window.location.href = isRoot
-        ? '/auth/login'
-        : '/auth/login?' +
-            new URLSearchParams({ redirectUrl: target.toString() }).toString();
+    const params = new URLSearchParams();
+    if (!isRoot)
+        params.set('redirectUrl', target.toString());
+    // The editor preview rides its usageToken on the app URL; the sign-in page
+    // only shows its editor surface ("Preview as" picker) when that token reaches
+    // it. Capturing the current URL carries it implicitly — but an explicit
+    // `redirectUrl` names a bare path, and would silently drop it. Forward it
+    // top-level either way, so how the app phrases its redirect can't decide
+    // whether the editor gets a preview. Published visitors never have one.
+    const usageToken = new URL(window.location.href).searchParams.get(constants_js_1.USAGE_TOKEN_QUERY_PARAM) ??
+        window._ziteUsageToken;
+    if (usageToken)
+        params.set(constants_js_1.USAGE_TOKEN_QUERY_PARAM, usageToken);
+    const query = params.toString();
+    window.location.href = query ? `/auth/login?${query}` : '/auth/login';
 }
 function logout(opts) {
     (0, exports.signOut)().then(() => {

package/dist/cjs/auth/index.test.js

@@ -147,4 +147,43 @@ function redirectParamOf(href) {
         (0, vitest_1.expect)(params.get('view')).toBeNull();
         (0, vitest_1.expect)(params.get('redirectUrl')).toBe('https://app.zite.so/pricing');
     });
+    (0, vitest_1.it)('forwards the editor usageToken past an explicit redirectUrl', () => {
+        // The editor preview rides its token on the app URL. An explicit
+        // redirectUrl names a bare path, which used to silently drop it — and with
+        // it the sign-in page's whole editor surface ("Preview as" picker).
+        const location = stubLocation('https://app.zite.so/?usageToken=tok-123');
+        authExports.loginWithRedirect({ redirectUrl: '/dashboard' });
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        (0, vitest_1.expect)(params.get('usageToken')).toBe('tok-123');
+        (0, vitest_1.expect)(params.get('redirectUrl')).toBe('https://app.zite.so/dashboard');
+    });
+    (0, vitest_1.it)('forwards the usageToken top-level on a bare call too', () => {
+        const location = stubLocation('https://app.zite.so/orders/123?usageToken=tok-123');
+        authExports.loginWithRedirect();
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        (0, vitest_1.expect)(params.get('usageToken')).toBe('tok-123');
+    });
+    (0, vitest_1.it)('carries a token to a root destination that would otherwise say nothing', () => {
+        const location = stubLocation('https://app.zite.so/?usageToken=tok-123');
+        // The token is the whole search string here only if nothing else rides
+        // along — an explicit root override drops the query, exercising the
+        // token-only branch.
+        authExports.loginWithRedirect({ redirectUrl: '/' });
+        (0, vitest_1.expect)(location.href).toBe('/auth/login?usageToken=tok-123');
+    });
+    (0, vitest_1.it)('falls back to window._ziteUsageToken when the URL was scrubbed', () => {
+        // app-runner's injected boot script moves the token off the address bar
+        // into this global before the bundle runs.
+        const location = stubLocation('https://app.zite.so/pricing');
+        window._ziteUsageToken = 'tok-456';
+        authExports.loginWithRedirect({ redirectUrl: '/dashboard' });
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        (0, vitest_1.expect)(params.get('usageToken')).toBe('tok-456');
+    });
+    (0, vitest_1.it)('adds no token param for ordinary visitors', () => {
+        const location = stubLocation('https://app.zite.so/pricing');
+        authExports.loginWithRedirect();
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        (0, vitest_1.expect)(params.get('usageToken')).toBeNull();
+    });
 });

package/dist/esm/auth/index.js

@@ -1,5 +1,6 @@
 import { createAuthClient } from 'better-auth/react';
 import { magicLinkClient, inferAdditionalFields, } from 'better-auth/client/plugins';
+import { USAGE_TOKEN_QUERY_PARAM } from './constants.js';
 const authClient = createAuthClient({
     baseURL: '',
     plugins: [
@@ -50,10 +51,21 @@ export function loginWithRedirect(opts) {
     // the address bar of every logged-out visitor to the front page, which is the
     // common case. Only pass a destination when it IS one.
     const isRoot = target.pathname === '/' && target.search === '' && target.hash === '';
-    window.location.href = isRoot
-        ? '/auth/login'
-        : '/auth/login?' +
-            new URLSearchParams({ redirectUrl: target.toString() }).toString();
+    const params = new URLSearchParams();
+    if (!isRoot)
+        params.set('redirectUrl', target.toString());
+    // The editor preview rides its usageToken on the app URL; the sign-in page
+    // only shows its editor surface ("Preview as" picker) when that token reaches
+    // it. Capturing the current URL carries it implicitly — but an explicit
+    // `redirectUrl` names a bare path, and would silently drop it. Forward it
+    // top-level either way, so how the app phrases its redirect can't decide
+    // whether the editor gets a preview. Published visitors never have one.
+    const usageToken = new URL(window.location.href).searchParams.get(USAGE_TOKEN_QUERY_PARAM) ??
+        window._ziteUsageToken;
+    if (usageToken)
+        params.set(USAGE_TOKEN_QUERY_PARAM, usageToken);
+    const query = params.toString();
+    window.location.href = query ? `/auth/login?${query}` : '/auth/login';
 }
 export function logout(opts) {
     signOut().then(() => {

package/dist/esm/auth/index.test.js

@@ -112,4 +112,43 @@ describe('loginWithRedirect', () => {
         expect(params.get('view')).toBeNull();
         expect(params.get('redirectUrl')).toBe('https://app.zite.so/pricing');
     });
+    it('forwards the editor usageToken past an explicit redirectUrl', () => {
+        // The editor preview rides its token on the app URL. An explicit
+        // redirectUrl names a bare path, which used to silently drop it — and with
+        // it the sign-in page's whole editor surface ("Preview as" picker).
+        const location = stubLocation('https://app.zite.so/?usageToken=tok-123');
+        authExports.loginWithRedirect({ redirectUrl: '/dashboard' });
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        expect(params.get('usageToken')).toBe('tok-123');
+        expect(params.get('redirectUrl')).toBe('https://app.zite.so/dashboard');
+    });
+    it('forwards the usageToken top-level on a bare call too', () => {
+        const location = stubLocation('https://app.zite.so/orders/123?usageToken=tok-123');
+        authExports.loginWithRedirect();
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        expect(params.get('usageToken')).toBe('tok-123');
+    });
+    it('carries a token to a root destination that would otherwise say nothing', () => {
+        const location = stubLocation('https://app.zite.so/?usageToken=tok-123');
+        // The token is the whole search string here only if nothing else rides
+        // along — an explicit root override drops the query, exercising the
+        // token-only branch.
+        authExports.loginWithRedirect({ redirectUrl: '/' });
+        expect(location.href).toBe('/auth/login?usageToken=tok-123');
+    });
+    it('falls back to window._ziteUsageToken when the URL was scrubbed', () => {
+        // app-runner's injected boot script moves the token off the address bar
+        // into this global before the bundle runs.
+        const location = stubLocation('https://app.zite.so/pricing');
+        window._ziteUsageToken = 'tok-456';
+        authExports.loginWithRedirect({ redirectUrl: '/dashboard' });
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        expect(params.get('usageToken')).toBe('tok-456');
+    });
+    it('adds no token param for ordinary visitors', () => {
+        const location = stubLocation('https://app.zite.so/pricing');
+        authExports.loginWithRedirect();
+        const params = new URLSearchParams(location.href.split('?')[1] ?? '');
+        expect(params.get('usageToken')).toBeNull();
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zitejs",
-  "version": "0.9.104",
+  "version": "0.9.105",
   "description": "The Zite framework — build apps on Zite Database",
   "type": "module",
   "main": "./dist/cjs/index.js",

package/dist/cjs/api/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCaller = void 0;
-var index_js_1 = require("../caller/index.js");
-Object.defineProperty(exports, "createCaller", { enumerable: true, get: function () { return index_js_1.createCaller; } });

package/dist/cjs/db/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTableClient = void 0;
-var index_js_1 = require("../runtime/index.js");
-Object.defineProperty(exports, "createTableClient", { enumerable: true, get: function () { return index_js_1.createTableClient; } });

package/dist/esm/api/index.d.ts

@@ -1,2 +0,0 @@
-export { createCaller } from '../caller/index.js';
-export type { EndpointConfig } from '../caller/index.js';

package/dist/esm/api/index.js

@@ -1 +0,0 @@
-export { createCaller } from '../caller/index.js';

package/dist/esm/db/index.d.ts

@@ -1,2 +0,0 @@
-export { createTableClient } from '../runtime/index.js';
-export type { TableClient } from '../runtime/index.js';

package/dist/esm/db/index.js

@@ -1 +0,0 @@
-export { createTableClient } from '../runtime/index.js';