@anthusai/papyrus 1.0.0-next.7 → 1.0.0-next.8

package/amplify/functions/content-actions/handler.py

@@ -130,7 +130,7 @@ def request_staging_build_action() -> dict:
 
 
 def handler(event, context):
-    field = event["info"]["fieldName"]
+    field = event["fieldName"]
     arguments = parse_input(event["arguments"]["input"])
     actor = actor_from_event(event)
     try:

package/lib/content-source-context.ts

@@ -3,12 +3,22 @@ import { getContentSource, type ContentSource } from "./site-env";
 
 export type ContentSourceContext = {
   source: ContentSource;
+  /** Request-scoped data client (drafts mode: carries the visitor's session cookies). */
+  client?: unknown;
 };
 
 const contentSourceStorage = new AsyncLocalStorage<ContentSourceContext>();
 
-export function runWithContentSource<T>(source: ContentSource, operation: () => Promise<T>): Promise<T> {
-  return contentSourceStorage.run({ source }, operation);
+export function runWithContentSource<T>(
+  source: ContentSource,
+  operation: () => Promise<T>,
+  client?: unknown,
+): Promise<T> {
+  return contentSourceStorage.run({ source, client }, operation);
+}
+
+export function currentRequestClient<T>(): T | undefined {
+  return contentSourceStorage.getStore()?.client as T | undefined;
 }
 
 export function currentContentSource(): ContentSource {

package/lib/graphql-content-repository.ts

@@ -1,3 +1,4 @@
+import { generateServerClientUsingCookies } from "@aws-amplify/adapter-nextjs/api";
 import { generateClient } from "aws-amplify/data";
 import type { Schema } from "../amplify/data/resource";
 import type { Article, ArticleImage, ArticleImageAsset, ArticleImageLayout, ArticleImageThemeVariants, ArticleVideoAsset, ArticleVideoThemeVariants } from "./articles";
@@ -17,7 +18,7 @@ import {
 } from "./publication-items";
 import { BodyIrError, matchBodyImages, projectBodyIr, type BodyProjection, type BodyProjectionImage } from "./markus-body";
 import { SITE_BRAND } from "./site-brand";
-import { currentContentSource, runWithContentSource } from "./content-source-context";
+import { currentContentSource, currentRequestClient, runWithContentSource } from "./content-source-context";
 import { getContentSource } from "./site-env";
 
 const DEFAULT_EDITION_SLUG = "current";
@@ -143,12 +144,18 @@ function isVisibleItemStatus(status: string): boolean {
 }
 
 async function withReaderGraphQLContext<T>(operation: () => Promise<T>): Promise<T> {
-  const { runWithAmplifyServerContext } = getAmplifyServerRuntime();
+  const { runWithAmplifyServerContext, config } = getAmplifyServerRuntime();
   const source = getContentSource();
-  const nextServerContext = source === "drafts" ? { cookies: (await import("next/headers")).cookies } : null;
+  if (source === "drafts") {
+    // Drafts are read as the signed-in visitor: the client reads the session from the request cookies, and it is
+    // kept in the request's async context (never a module global) so one visitor's session cannot serve another.
+    const { cookies } = await import("next/headers");
+    const client = generateServerClientUsingCookies<Schema>({ config, cookies, authMode: "userPool" });
+    return runWithContentSource(source, operation, client);
+  }
   return runWithContentSource(source, () =>
     runWithAmplifyServerContext({
-      nextServerContext,
+      nextServerContext: null,
       operation: async () => {
         readerContextClient = generateClient<Schema>({ authMode: authMode() });
         try {
@@ -241,6 +248,8 @@ export const graphqlContentRepository: ContentRepository = {
 };
 
 function getClient(): DataClient {
+  const requestClient = currentRequestClient<DataClient>();
+  if (requestClient) return requestClient;
   if (readerContextClient) return readerContextClient;
 
   if (!buildTimeClient) {

package/package.json

@@ -276,7 +276,7 @@
       "optional": true
     }
   },
-  "version": "1.0.0-next.7",
+  "version": "1.0.0-next.8",
   "dependencies": {
     "@aws-amplify/adapter-nextjs": "^1.7.3",
     "@aws-sdk/client-cognito-identity-provider": "3.1045.0",

package/routes.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-next.7",
+  "version": "1.0.0-next.8",
   "routes": [
     {
       "file": "app/%5F_preview/[[...path]]/route.ts",