@joai/sites 0.1.5 → 0.2.0

package/dist/admin.d.mts

@@ -1,6 +1,7 @@
 'use client';
 import * as _$react from "react";
 import { AppEnv } from "@joai/core";
+
 //#region src/session.d.ts
 type SiteEditingSessionConfig = {
   env?: AppEnv;

package/dist/admin.mjs

@@ -1,49 +1,66 @@
 'use client';
-import { getAuthFragmentToken } from "@joai/sdk";
+import { beginBrowserAppAuth, completeBrowserAppAuth } from "@joai/sdk";
 import { useTranslations } from "next-intl";
 import { useEffect, useState } from "react";
-import { getLoginUrl } from "@joai/core";
 import { createSessionTokenStore } from "@joai/react";
 import { jsx } from "react/jsx-runtime";
 //#region src/session.ts
-function createSiteLoginUrl(config, redirect) {
-	const returnUrl = new URL(redirect);
-	returnUrl.searchParams.set("platform", "app");
-	return getLoginUrl(config.env ?? "mainnet", returnUrl.toString(), {
-		team: config.team,
-		brand: config.brand
-	});
-}
 function createSiteSessionStore(config) {
 	return createSessionTokenStore(config.sessionStorageKey);
 }
-async function exchangeSiteEditingSession(config, handoffToken) {
-	const { createClient } = await import("@joai/sdk");
-	const response = await createClient({
-		env: config.env ?? "mainnet",
-		team: config.team,
-		cache: { enabled: false }
-	}).auth.exchangeNativeSession(handoffToken);
-	if (!response.ok || !response.data?.token) throw new Error("session_exchange_failed");
-	if (!createSiteSessionStore(config).set(response.data.token)) throw new Error("session_store_failed");
-	return response.data.token;
-}
 //#endregion
 //#region src/admin-login.tsx
+const safeReturnPath = (value, fallback) => {
+	if (!value || value.includes("\\")) return fallback;
+	try {
+		const target = new URL(value, window.location.origin);
+		if (target.origin !== window.location.origin) return fallback;
+		return `${target.pathname}${target.search}${target.hash}`;
+	} catch {
+		return fallback;
+	}
+};
 function SiteAdminLoginClient({ config, redirectTo = "/", className }) {
 	const t = useTranslations("sites");
 	const [message, setMessage] = useState(t("loginRedirecting"));
 	useEffect(() => {
-		const loginUrl = () => createSiteLoginUrl(config, `${window.location.origin}${window.location.pathname}`);
-		const token = getAuthFragmentToken(window.location.href);
-		if (!token) {
-			window.location.replace(loginUrl());
-			return;
-		}
-		window.history.replaceState(null, "", `${window.location.pathname}${window.location.search}`);
-		exchangeSiteEditingSession(config, token).then(() => window.location.replace(redirectTo)).catch(() => {
+		const current = new URL(window.location.href);
+		const returnTo = safeReturnPath(current.searchParams.get("return"), redirectTo);
+		const storageKey = `${config.sessionStorageKey}:auth`;
+		const begin = async () => {
+			current.searchParams.set("return", returnTo);
+			const url = await beginBrowserAppAuth({
+				callbackUrl: current.toString(),
+				env: config.env,
+				team: config.team,
+				brand: config.brand,
+				storageKey
+			});
+			window.location.replace(url);
+		};
+		const complete = async () => {
+			const token = await completeBrowserAppAuth({
+				url: window.location.href,
+				env: config.env,
+				storageKey
+			});
+			if (!token) {
+				await begin();
+				return;
+			}
+			if (!createSiteSessionStore(config).set(token)) throw new Error("session_store_failed");
+			const clean = new URL(window.location.href);
+			clean.searchParams.delete("code");
+			clean.searchParams.delete("state");
+			clean.searchParams.set("return", returnTo);
+			window.history.replaceState(null, "", `${clean.pathname}${clean.search}${clean.hash}`);
+			window.location.replace(returnTo);
+		};
+		complete().catch(() => {
 			setMessage(t("loginFailed"));
-			window.setTimeout(() => window.location.replace(loginUrl()), 1200);
+			window.setTimeout(() => {
+				begin().catch(() => setMessage(t("loginFailed")));
+			}, 1200);
 		});
 	}, [
 		config,

package/dist/index.d.mts

@@ -1,6 +1,6 @@
+import * as _$_joai_react0 from "@joai/react";
 import * as _$_joai_core0 from "@joai/core";
 import { AppEnv, Content, ContentDefinition, ContentValue, Site } from "@joai/core";
-import * as _$_joai_react0 from "@joai/react";
 import { ComponentType, ReactNode } from "react";
 
 //#region src/types.d.ts
@@ -134,7 +134,6 @@ type SiteEditingSessionConfig = {
 };
 declare function createSiteLoginUrl(config: SiteEditingSessionConfig, redirect: string): string;
 declare function createSiteSessionStore(config: SiteEditingSessionConfig): _$_joai_react0.SessionTokenStore;
-declare function exchangeSiteEditingSession(config: SiteEditingSessionConfig, handoffToken: string): Promise<string>;
 declare function getSiteAdminLoginPath(config: SiteEditingSessionConfig): string;
 //#endregion
 //#region src/theme.d.ts
@@ -253,4 +252,4 @@ declare function buildLlmsTxt(input: {
   contact?: string;
 }): string;
 //#endregion
-export { BuildSiteMetadataInput, LlmsTxtPage, LocalBusinessJsonLdInput, ResolveSiteOptions, ResolvedSiteContext, RevalidateHandlerOptions, SiteEditingSessionConfig, SiteHostConfig, SiteMetadataResult, SiteRobotsResult, SiteSitemapEntry, SiteTheme, SiteThemeLayoutProps, SiteThemeLocalConfig, SiteThemeMetadata, SiteThemePage, SiteThemePageProps, SiteThemePath, buildLlmsTxt, buildLocalBusinessJsonLd, buildSiteMetadata, buildSiteRobots, buildSiteSitemap, createRevalidateHandler, createSiteLoginUrl, createSiteSessionStore, createThemeRegistry, defineSiteTheme, exchangeSiteEditingSession, getSiteAdminLoginPath, getSiteContentSlug, getSiteThemeKey, getThemePage, listThemeSitemapPaths, loadSiteContent, normalizeSiteHost, normalizeThemePath, resolveSiteByHost, resolveSiteContext, serializeJsonLd };
+export { BuildSiteMetadataInput, LlmsTxtPage, LocalBusinessJsonLdInput, ResolveSiteOptions, ResolvedSiteContext, RevalidateHandlerOptions, SiteEditingSessionConfig, SiteHostConfig, SiteMetadataResult, SiteRobotsResult, SiteSitemapEntry, SiteTheme, SiteThemeLayoutProps, SiteThemeLocalConfig, SiteThemeMetadata, SiteThemePage, SiteThemePageProps, SiteThemePath, buildLlmsTxt, buildLocalBusinessJsonLd, buildSiteMetadata, buildSiteRobots, buildSiteSitemap, createRevalidateHandler, createSiteLoginUrl, createSiteSessionStore, createThemeRegistry, defineSiteTheme, getSiteAdminLoginPath, getSiteContentSlug, getSiteThemeKey, getThemePage, listThemeSitemapPaths, loadSiteContent, normalizeSiteHost, normalizeThemePath, resolveSiteByHost, resolveSiteContext, serializeJsonLd };

package/dist/index.mjs

@@ -1,6 +1,5 @@
 import { createClient } from "@joai/sdk";
 import { revalidatePath, revalidateTag } from "next/cache";
-import { getLoginUrl } from "@joai/core";
 import { createSessionTokenStore } from "@joai/react";
 //#region src/settings.ts
 const asString = (value) => {
@@ -105,27 +104,13 @@ function createRevalidateHandler(options) {
 //#endregion
 //#region src/session.ts
 function createSiteLoginUrl(config, redirect) {
-	const returnUrl = new URL(redirect);
-	returnUrl.searchParams.set("platform", "app");
-	return getLoginUrl(config.env ?? "mainnet", returnUrl.toString(), {
-		team: config.team,
-		brand: config.brand
-	});
+	const url = new URL(getSiteAdminLoginPath(config), "https://site.invalid");
+	url.searchParams.set("return", redirect);
+	return `${url.pathname}${url.search}`;
 }
 function createSiteSessionStore(config) {
 	return createSessionTokenStore(config.sessionStorageKey);
 }
-async function exchangeSiteEditingSession(config, handoffToken) {
-	const { createClient } = await import("@joai/sdk");
-	const response = await createClient({
-		env: config.env ?? "mainnet",
-		team: config.team,
-		cache: { enabled: false }
-	}).auth.exchangeNativeSession(handoffToken);
-	if (!response.ok || !response.data?.token) throw new Error("session_exchange_failed");
-	if (!createSiteSessionStore(config).set(response.data.token)) throw new Error("session_store_failed");
-	return response.data.token;
-}
 function getSiteAdminLoginPath(config) {
 	return config.loginPath ?? "/admin-login";
 }
@@ -262,4 +247,4 @@ function buildLlmsTxt(input) {
 	return lines.join("\n");
 }
 //#endregion
-export { buildLlmsTxt, buildLocalBusinessJsonLd, buildSiteMetadata, buildSiteRobots, buildSiteSitemap, createRevalidateHandler, createSiteLoginUrl, createSiteSessionStore, createThemeRegistry, defineSiteTheme, exchangeSiteEditingSession, getSiteAdminLoginPath, getSiteContentSlug, getSiteThemeKey, getThemePage, listThemeSitemapPaths, loadSiteContent, normalizeSiteHost, normalizeThemePath, resolveSiteByHost, resolveSiteContext, serializeJsonLd };
+export { buildLlmsTxt, buildLocalBusinessJsonLd, buildSiteMetadata, buildSiteRobots, buildSiteSitemap, createRevalidateHandler, createSiteLoginUrl, createSiteSessionStore, createThemeRegistry, defineSiteTheme, getSiteAdminLoginPath, getSiteContentSlug, getSiteThemeKey, getThemePage, listThemeSitemapPaths, loadSiteContent, normalizeSiteHost, normalizeThemePath, resolveSiteByHost, resolveSiteContext, serializeJsonLd };

package/dist/session.d.mts

@@ -1,5 +1,5 @@
-import { AppEnv } from "@joai/core";
 import * as _$_joai_react0 from "@joai/react";
+import { AppEnv } from "@joai/core";
 
 //#region src/session.d.ts
 type SiteEditingSessionConfig = {
@@ -11,7 +11,6 @@ type SiteEditingSessionConfig = {
 };
 declare function createSiteLoginUrl(config: SiteEditingSessionConfig, redirect: string): string;
 declare function createSiteSessionStore(config: SiteEditingSessionConfig): _$_joai_react0.SessionTokenStore;
-declare function exchangeSiteEditingSession(config: SiteEditingSessionConfig, handoffToken: string): Promise<string>;
 declare function getSiteAdminLoginPath(config: SiteEditingSessionConfig): string;
 //#endregion
-export { SiteEditingSessionConfig, createSiteLoginUrl, createSiteSessionStore, exchangeSiteEditingSession, getSiteAdminLoginPath };
+export { SiteEditingSessionConfig, createSiteLoginUrl, createSiteSessionStore, getSiteAdminLoginPath };

package/dist/session.mjs

@@ -1,30 +1,15 @@
-import { getLoginUrl } from "@joai/core";
 import { createSessionTokenStore } from "@joai/react";
 //#region src/session.ts
 function createSiteLoginUrl(config, redirect) {
-	const returnUrl = new URL(redirect);
-	returnUrl.searchParams.set("platform", "app");
-	return getLoginUrl(config.env ?? "mainnet", returnUrl.toString(), {
-		team: config.team,
-		brand: config.brand
-	});
+	const url = new URL(getSiteAdminLoginPath(config), "https://site.invalid");
+	url.searchParams.set("return", redirect);
+	return `${url.pathname}${url.search}`;
 }
 function createSiteSessionStore(config) {
 	return createSessionTokenStore(config.sessionStorageKey);
 }
-async function exchangeSiteEditingSession(config, handoffToken) {
-	const { createClient } = await import("@joai/sdk");
-	const response = await createClient({
-		env: config.env ?? "mainnet",
-		team: config.team,
-		cache: { enabled: false }
-	}).auth.exchangeNativeSession(handoffToken);
-	if (!response.ok || !response.data?.token) throw new Error("session_exchange_failed");
-	if (!createSiteSessionStore(config).set(response.data.token)) throw new Error("session_store_failed");
-	return response.data.token;
-}
 function getSiteAdminLoginPath(config) {
 	return config.loginPath ?? "/admin-login";
 }
 //#endregion
-export { createSiteLoginUrl, createSiteSessionStore, exchangeSiteEditingSession, getSiteAdminLoginPath };
+export { createSiteLoginUrl, createSiteSessionStore, getSiteAdminLoginPath };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joai/sites",
-  "version": "0.1.5",
+  "version": "0.2.0",
   "description": "Shared helpers for JoAi-managed multi-tenant websites",
   "license": "MIT",
   "type": "module",
@@ -36,8 +36,8 @@
   },
   "dependencies": {
     "@joai/core": "^5.4.6",
-    "@joai/react": "^1.0.6",
-    "@joai/sdk": "^14.0.0"
+    "@joai/react": "^2.0.0",
+    "@joai/sdk": "^14.2.0"
   },
   "peerDependencies": {
     "next": ">=15.0.0",
@@ -49,7 +49,7 @@
     "@types/jest": "^30.0.0",
     "@types/react": "^19.2.14",
     "jest": "^30.3.0",
-    "next": "^16.2.0",
+    "next": "^16.4.5",
     "next-intl": "^4.8.3",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",