@pantheon-systems/p1-next-sdk 0.19.0 → 0.20.1

package/dist/css-query-fetchers.js

@@ -1,4 +1,6 @@
 import { getSharedP1Client, getSharedSiteId, getSharedBranchId, CSS_QUERY_ID_PREFIX, } from "@pantheon-systems/puck-css/server";
+const FOLLOW_UP_PAGE_SIZE = 100;
+const MAX_FOLLOW_UP_PAGES = 50;
 const inflightQueries = new Map();
 function listQueriesDeduped(endpoint, siteId, branchId) {
     const key = `${siteId}:${branchId}`;
@@ -11,6 +13,55 @@ function listQueriesDeduped(endpoint, siteId, branchId) {
     inflightQueries.set(key, promise);
     return promise;
 }
+function documentIdOf(item) {
+    const id = item?.documentId;
+    return typeof id === "string" ? id : undefined;
+}
+async function getAllResults(queries, siteId, branchId, queryName, throwOnError) {
+    const firstPage = await queries.getResults(siteId, branchId, queryName, {
+        includeMetadata: true,
+    });
+    const totalCount = firstPage.totalCount;
+    if (typeof totalCount !== "number" || firstPage.items.length >= totalCount) {
+        return firstPage;
+    }
+    const items = [...firstPage.items];
+    const seen = new Set();
+    for (const item of items) {
+        const id = documentIdOf(item);
+        if (id !== undefined)
+            seen.add(id);
+    }
+    let received = firstPage.items.length;
+    for (let page = 0; page < MAX_FOLLOW_UP_PAGES && received < totalCount; page++) {
+        let next;
+        try {
+            next = await queries.getResults(siteId, branchId, queryName, {
+                includeMetadata: true,
+                limit: FOLLOW_UP_PAGE_SIZE,
+                offset: received,
+            });
+        }
+        catch (err) {
+            if (throwOnError)
+                throw err;
+            break;
+        }
+        if (next.items.length === 0)
+            break;
+        received += next.items.length;
+        for (const item of next.items) {
+            const id = documentIdOf(item);
+            if (id !== undefined) {
+                if (seen.has(id))
+                    continue;
+                seen.add(id);
+            }
+            items.push(item);
+        }
+    }
+    return { ...firstPage, items, returnedCount: items.length };
+}
 export async function createCssQueryFetchers(opts) {
     const client = opts?.client ?? getSharedP1Client();
     const siteId = getSharedSiteId();
@@ -35,9 +86,7 @@ export async function createCssQueryFetchers(opts) {
         id: `${CSS_QUERY_ID_PREFIX}${query.name}`,
         fetch: async () => {
             try {
-                const results = await queries.getResults(siteId, branchId, query.name, {
-                    includeMetadata: true,
-                });
+                const results = await getAllResults(queries, siteId, branchId, query.name, throwOnError);
                 return results;
             }
             catch (err) {

package/dist/handler.js

@@ -2,6 +2,7 @@ import { NextResponse } from "next/server";
 import { ensureInitialized } from "@pantheon-systems/puck-css/server";
 import { runWithAuthToken } from "@pantheon-systems/puck-css/server";
 import { extractBearerToken } from "./auth-utils";
+import { verifyEditorAccess } from "./verify-editor-access";
 import { getPageData, getRemoteDatasources, getEditorContext, getDatasourceContext, getRoutes, postPublish, postRevalidate, postResolvePreview, postPreviewMeta, postRemoteDatasources, deleteRemoteDatasources, } from "./handler-actions";
 function parseP1Segments(p1) {
     if (p1.length === 0)
@@ -15,6 +16,24 @@ function withAuth(request, fn) {
         return runWithAuthToken(token, fn);
     return NextResponse.json({ error: "unauthorized" }, { status: 401 });
 }
+async function withEditorAccess(request, opts, fn) {
+    const token = extractBearerToken(request);
+    if (!token)
+        return NextResponse.json({ error: "unauthorized" }, { status: 401 });
+    const access = await verifyEditorAccess({
+        token,
+        p1BaseUrl: opts.p1BaseUrl,
+        siteId: opts.p1SiteId,
+        branchId: opts.p1BranchId,
+    });
+    if (access.status === "unauthenticated") {
+        return NextResponse.json({ error: "unauthorized" }, { status: 401 });
+    }
+    if (access.status === "forbidden") {
+        return NextResponse.json({ error: "forbidden" }, { status: 403 });
+    }
+    return runWithAuthToken(token, fn);
+}
 export function createP1Handler(opts) {
     const init = () => ensureInitialized(opts);
     async function GET(request, { params }) {
@@ -51,7 +70,7 @@ export function createP1Handler(opts) {
         if (action === "preview-meta")
             return postPreviewMeta(request);
         if (action === "datasources")
-            return withAuth(request, () => postRemoteDatasources(request));
+            return withEditorAccess(request, opts, () => postRemoteDatasources(request));
         return NextResponse.json({ error: "not_found" }, { status: 404 });
     }
     async function DELETE(request, { params }) {
@@ -59,7 +78,7 @@ export function createP1Handler(opts) {
         const { p1 = [] } = await params;
         const { action } = parseP1Segments(p1);
         if (action === "datasources")
-            return withAuth(request, () => deleteRemoteDatasources(request));
+            return withEditorAccess(request, opts, () => deleteRemoteDatasources(request));
         return NextResponse.json({ error: "not_found" }, { status: 404 });
     }
     return { GET, POST, DELETE };

package/dist/routes/datasource-context.js

@@ -2,7 +2,8 @@ import { NextResponse } from "next/server";
 import { normalizePath, ensureLeadingSlash, listRouteTemplateKeysFromDatabase, getPageEditorPreviewParams, loadRemoteDatasourceContext, createAuthenticatedClient, runWithAuthToken, } from "@pantheon-systems/puck-css/server";
 import { extractBearerToken } from "../auth-utils";
 import { createCssQueryFetchers } from "../css-query-fetchers";
-const DATASOURCE_FETCH_TIMEOUT_MS = 8000;
+const DATASOURCE_FETCH_TIMEOUT_MS = 15_000;
+const NO_STORE = { "Cache-Control": "no-store" };
 const inflightPreviewParams = new Map();
 function getPreviewParamsDeduped(token, path) {
     const key = `${token ?? ""}:${path}`;
@@ -21,7 +22,7 @@ export async function getDatasourceContext(request, options) {
     const id = url.searchParams.get("id");
     const path = rawPath === "/" ? "/" : normalizePath(ensureLeadingSlash(rawPath));
     if (path === null) {
-        return NextResponse.json({ error: "invalid_path" }, { status: 400 });
+        return NextResponse.json({ error: "invalid_path" }, { status: 400, headers: NO_STORE });
     }
     const token = extractBearerToken(request);
     const [routeTemplateKeys, savedPreviewParams] = await Promise.all([
@@ -58,8 +59,8 @@ export async function getDatasourceContext(request, options) {
     if (id) {
         const data = context[id] ?? {};
         const failure = failures.find((f) => f.id === id);
-        return NextResponse.json(failure ? { id, data, error: { reason: failure.reason } } : { id, data });
+        return NextResponse.json(failure ? { id, data, error: { reason: failure.reason } } : { id, data }, { headers: NO_STORE });
     }
     const { urlParams: _urlParams, ...contexts } = context;
-    return NextResponse.json({ contexts, errors: failures });
+    return NextResponse.json({ contexts, errors: failures }, { headers: NO_STORE });
 }

package/dist/routes/remote-datasources-api.d.ts

@@ -1,4 +1,5 @@
 import { NextResponse } from "next/server";
+export declare const REDACTED_HEADER_VALUE = "[redacted]";
 export { getRemoteDatasources as GET, postRemoteDatasources as POST, deleteRemoteDatasources as DELETE };
 export declare function getRemoteDatasources(request: Request): Promise<NextResponse<{
     ok: boolean;

package/dist/routes/remote-datasources-api.js

@@ -2,6 +2,45 @@ import { revalidatePath } from "next/cache";
 import { NextResponse } from "next/server";
 import { deleteGlobalRemoteDatasource, deletePageRemoteDatasource, idConflictsForRemoteDatasourceScope, listRemoteDatasourcesForPage, normalizeRemoteDatasourceDefinition, upsertGlobalRemoteDatasource, upsertPageRemoteDatasource, } from "@pantheon-systems/puck-css/server";
 import { normalizePath } from "@pantheon-systems/puck-css/server";
+export const REDACTED_HEADER_VALUE = "[redacted]";
+function redactHeaders(def) {
+    if (!def.headers)
+        return def;
+    const headers = {};
+    for (const key of Object.keys(def.headers)) {
+        headers[key] = REDACTED_HEADER_VALUE;
+    }
+    return { ...def, headers };
+}
+function originOf(urlTemplate) {
+    try {
+        const { origin } = new URL(urlTemplate);
+        return origin === "null" ? null : origin;
+    }
+    catch {
+        return null;
+    }
+}
+function sameOrigin(a, b) {
+    const origin = originOf(a.urlTemplate);
+    return origin !== null && origin === originOf(b.urlTemplate);
+}
+function restoreRedactedHeaders(definition, stored) {
+    if (!definition.headers)
+        return definition;
+    const restorable = stored !== undefined && sameOrigin(definition, stored);
+    const headers = {};
+    for (const [key, value] of Object.entries(definition.headers)) {
+        if (value !== REDACTED_HEADER_VALUE) {
+            headers[key] = value;
+        }
+        else if (restorable && stored.headers?.[key]) {
+            headers[key] = stored.headers[key];
+        }
+    }
+    const { headers: _omit, ...rest } = definition;
+    return Object.keys(headers).length > 0 ? { ...rest, headers } : rest;
+}
 export { getRemoteDatasources as GET, postRemoteDatasources as POST, deleteRemoteDatasources as DELETE };
 export async function getRemoteDatasources(request) {
     const url = new URL(request.url);
@@ -13,8 +52,8 @@ export async function getRemoteDatasources(request) {
     return NextResponse.json({
         ok: true,
         path,
-        global: data.global,
-        page: data.page,
+        global: data.global.map(redactHeaders),
+        page: data.page.map(redactHeaders),
     });
 }
 export async function postRemoteDatasources(request) {
@@ -33,13 +72,16 @@ export async function postRemoteDatasources(request) {
     if (!path) {
         return NextResponse.json({ ok: false, error: "invalid_path" }, { status: 400 });
     }
-    const definition = normalizeRemoteDatasourceDefinition(body.definition);
-    if (!definition) {
+    const incoming = normalizeRemoteDatasourceDefinition(body.definition);
+    if (!incoming) {
         return NextResponse.json({ ok: false, error: "invalid_definition" }, { status: 400 });
     }
-    else if (idConflictsForRemoteDatasourceScope(scope, definition.id, path)) {
+    else if (idConflictsForRemoteDatasourceScope(scope, incoming.id, path)) {
         return NextResponse.json({ ok: false, error: "id_conflict" }, { status: 409 });
     }
+    const existing = listRemoteDatasourcesForPage(path);
+    const stored = (scope === "global" ? existing.global : existing.page).find((d) => d.id === incoming.id);
+    const definition = restoreRedactedHeaders(incoming, stored);
     if (scope === "global") {
         upsertGlobalRemoteDatasource(definition);
     }

package/dist/verify-editor-access.d.ts

@@ -0,0 +1,24 @@
+export type EditorAccessResult = {
+    status: "allowed";
+} | {
+    status: "unauthenticated";
+} | {
+    status: "forbidden";
+};
+export interface VerifyEditorAccessOptions {
+    /** Bearer token presented by the caller, without the `Bearer ` prefix. */
+    token: string;
+    /** Base URL of the API. Defaults to the production API. */
+    p1BaseUrl?: string;
+    /** Site the caller is trying to modify. */
+    siteId?: string;
+    /** Branch to check the caller's role on. Defaults to the site's main branch. */
+    branchId?: string;
+}
+/**
+ * Checks that the bearer token belongs to a caller who may edit documents on the
+ * site. A caller the API refuses, a caller without edit permission, or a site
+ * with no main branch to check against is `forbidden`; a missing token or site,
+ * or any other failure to verify, is reported as `unauthenticated`.
+ */
+export declare function verifyEditorAccess(opts: VerifyEditorAccessOptions): Promise<EditorAccessResult>;

package/dist/verify-editor-access.js

@@ -0,0 +1,40 @@
+import { getSharedBranchId } from "@pantheon-systems/puck-css/server";
+function configuredBranchId(branchId) {
+    const trimmed = branchId?.trim();
+    if (!trimmed || trimmed === "main")
+        return undefined;
+    return trimmed;
+}
+export async function verifyEditorAccess(opts) {
+    try {
+        const { token, siteId } = opts;
+        if (!token || !siteId)
+            return { status: "unauthenticated" };
+        const mod = await import("@pantheon-systems/css-client");
+        const client = new mod.P1Client({
+            baseUrl: opts.p1BaseUrl ?? mod.PRODUCTION_BASE_URL,
+            authProvider: async () => `Bearer ${token}`,
+        });
+        let branchId = configuredBranchId(opts.branchId) ??
+            configuredBranchId(getSharedBranchId() ?? undefined);
+        if (!branchId) {
+            const branches = await client.branches.list(siteId);
+            branchId = branches.find((b) => b.isMain)?.id;
+        }
+        if (!branchId)
+            return { status: "forbidden" };
+        const role = await client.auth.getRole(siteId, branchId);
+        return role.permissions.canEditDocuments === true
+            ? { status: "allowed" }
+            : { status: "forbidden" };
+    }
+    catch (err) {
+        if (await isForbidden(err))
+            return { status: "forbidden" };
+        return { status: "unauthenticated" };
+    }
+}
+async function isForbidden(err) {
+    const mod = await import("@pantheon-systems/css-client");
+    return err instanceof mod.P1ApiError && err.status === 403;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pantheon-systems/p1-next-sdk",
-  "version": "0.19.0",
+  "version": "0.20.1",
   "license": "UNLICENSED",
   "description": "Next.js SDK for P1 editor integration",
   "publishConfig": {
@@ -42,11 +42,11 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
+    "@pantheon-systems/css-client": "0.20.1",
+    "@pantheon-systems/p1-ai-chat": "0.10.0",
+    "@pantheon-systems/puck-css": "0.20.1",
     "launchdarkly-js-client-sdk": "^3.9.3",
-    "server-only": "^0.0.1",
-    "@pantheon-systems/css-client": "0.19.0",
-    "@pantheon-systems/p1-ai-chat": "0.9.2",
-    "@pantheon-systems/puck-css": "0.19.0"
+    "server-only": "^0.0.1"
   },
   "peerDependencies": {
     "@pantheon-systems/pds-toolkit-react": ">=2.0.0-alpha.92",
@@ -56,6 +56,7 @@
     "react-dom": ">=18.0.0"
   },
   "devDependencies": {
+    "@pantheon-systems/eslint-config": "0.1.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/node": "^20.19.30",
@@ -63,8 +64,7 @@
     "eslint": "^9.27.0",
     "jsdom": "^24.1.3",
     "typescript": "^5.9.3",
-    "vitest": "^4.1.5",
-    "@pantheon-systems/eslint-config": "0.1.0"
+    "vitest": "^4.1.5"
   },
   "homepage": "https://github.com/pantheon-systems/p1-platform/tree/main/packages/p1-next-sdk",
   "scripts": {