@nitrogenbuilder/connector-payload 0.1.52 → 1.0.0

package/dist/components/NitrogenEditButtonRuntime.js

@@ -77,15 +77,15 @@ function buildRelativePath(slug, routePattern, templateSlug) {
 export const NitrogenEditButtonRuntime = ({ collection, routePattern }) => {
     const [id, setId] = useState(undefined);
     const [token, setToken] = useState(undefined);
+    const [connectorToken, setConnectorToken] = useState(undefined);
     const [slug, setSlug] = useState(undefined);
     const [documentRelativePath, setDocumentRelativePath] = useState(undefined);
     const [persistedStatus, setPersistedStatus] = useState(undefined);
     const [frontendUrl, setFrontendUrl] = useState(undefined);
     const [instanceUrl, setInstanceUrl] = useState(undefined);
-    const [authorId, setAuthorId] = useState(undefined);
     const [templateSlug, setTemplateSlug] = useState(undefined);
     const formStatus = useFormFields(([fields]) => fields?._status?.value);
-    const { isPreviewEnabled, previewURL } = useLivePreviewContext();
+    const { previewURL } = useLivePreviewContext();
     useEffect(() => {
         const segments = window.location.pathname.split('/').filter(Boolean);
         const docId = segments.length >= 4 ? segments[3] : undefined;
@@ -128,21 +128,16 @@ export const NitrogenEditButtonRuntime = ({ collection, routePattern }) => {
                 setTemplateSlug(null);
             });
         }
-        fetch('/api/users/me')
-            .then((res) => res.json())
-            .then((data) => {
-            if (data.user?.id) {
-                setAuthorId(String(data.user.id));
-            }
-        })
-            .catch((err) => {
-            console.error('Failed to fetch current user:', err);
-        });
         fetch('/api/globals/nitrogen-settings')
             .then((res) => res.json())
             .then((data) => {
+            // `token` authenticates the editor itself (license key); `connectorToken`
+            // is forwarded to the preview iframe to unlock draft content.
+            if (data.licenseKey) {
+                setToken(data.licenseKey);
+            }
             if (data.connectorToken) {
-                setToken(data.connectorToken);
+                setConnectorToken(data.connectorToken);
             }
             const editorUrl = getPreferredEditorUrl(data);
             if (editorUrl) {
@@ -157,13 +152,14 @@ export const NitrogenEditButtonRuntime = ({ collection, routePattern }) => {
             console.error('Failed to fetch nitrogen settings:', err);
         });
     }, [collection, routePattern]);
-    if (!id || !token || !authorId)
+    if (!id || !token)
         return null;
     const editorBase = instanceUrl ?? '';
     const isDevelopmentMode = isLocalAdminHost();
-    const encodedAuthorId = encodeURIComponent(authorId);
     const developmentFlags = isDevelopmentMode ? '&development=true' : '';
-    const editHref = `${editorBase}/nitrogen-editor?token=${encodeURIComponent(token)}&collection=${encodeURIComponent(collection)}&pageId=${id}&authorId=${encodedAuthorId}&author=${encodedAuthorId}${developmentFlags}`;
+    // No authorId here on purpose — the editor page injects identity as
+    // window.nitrogenUser, so a copied edit URL won't carry it.
+    const editHref = `${editorBase}/nitrogen-editor?token=${encodeURIComponent(token)}&connectorToken=${encodeURIComponent(connectorToken ?? '')}&collection=${encodeURIComponent(collection)}&pageId=${id}${developmentFlags}`;
     const viewRelativePath = collection === 'nitrogen-templates'
         ? `/nitrogen-templates/${trimSlashes(slug || '')}`
         : documentRelativePath ||
@@ -178,7 +174,6 @@ export const NitrogenEditButtonRuntime = ({ collection, routePattern }) => {
         : undefined;
     const viewAction = resolveNitrogenViewAction({
         documentStatus: formStatus ?? persistedStatus,
-        isPreviewEnabled,
         previewURL,
         publicHref,
     });

package/dist/components/resolveNitrogenViewAction.d.ts

@@ -2,9 +2,8 @@ export type NitrogenViewAction = {
     href: string;
     label: 'Preview Draft' | 'View Page';
 };
-export declare function resolveNitrogenViewAction({ documentStatus, isPreviewEnabled, previewURL, publicHref, }: {
+export declare function resolveNitrogenViewAction({ documentStatus, previewURL, publicHref, }: {
     documentStatus?: unknown;
-    isPreviewEnabled: boolean;
     previewURL?: string;
     publicHref?: string;
 }): NitrogenViewAction | null;

package/dist/components/resolveNitrogenViewAction.js

@@ -1,6 +1,6 @@
-export function resolveNitrogenViewAction({ documentStatus, isPreviewEnabled, previewURL, publicHref, }) {
+export function resolveNitrogenViewAction({ documentStatus, previewURL, publicHref, }) {
     if (documentStatus === 'draft') {
-        const href = isPreviewEnabled ? previewURL?.trim() : '';
+        const href = previewURL?.trim();
         return href ? { href, label: 'Preview Draft' } : null;
     }
     const href = publicHref?.trim();

package/dist/constants.d.ts

@@ -1,2 +1,2 @@
-export declare const DEFAULT_EDITOR_CDN_VERSION = "0.5.30";
+export declare const DEFAULT_EDITOR_CDN_VERSION = "1.3";
 export declare const NITROGEN_PACKAGE_NAMES: readonly ["@nitrogenbuilder/client", "@nitrogenbuilder/client-core", "@nitrogenbuilder/client-preact", "@nitrogenbuilder/client-react", "@nitrogenbuilder/connector-payload", "@nitrogenbuilder/editor", "@nitrogenbuilder/types"];

package/dist/constants.js

@@ -1,4 +1,4 @@
-export const DEFAULT_EDITOR_CDN_VERSION = '0.5.30';
+export const DEFAULT_EDITOR_CDN_VERSION = '1.3';
 export const NITROGEN_PACKAGE_NAMES = [
     '@nitrogenbuilder/client',
     '@nitrogenbuilder/client-core',

package/dist/editor/NitrogenEditorPage.js

@@ -68,6 +68,9 @@ export function createNitrogenEditorPage(config) {
                 type: "payload",
                 apiUrl: getNitrogenApiUrl(isPreviewDevelopment),
                 collection: params.collection,
+                // Shown as a "Sign in" button in the editor when the CMS session has
+                // expired (e.g. a save fails with 401/403).
+                loginUrl: "/admin/login",
             },
             siteUrl: siteUrl || "",
             urlMaps: nitrogenConfig.urlMaps || [],
@@ -87,10 +90,8 @@ export function createNitrogenEditorPage(config) {
                             `window.nitrogenEditId = "${editId}";`,
                             // Identity injected as a global (not via URL) so a copied edit URL
                             // doesn't carry the original author's id/email. The editor reads
-                            // window.nitrogenUser, falling back to the authorId/author params below.
+                            // window.nitrogenUser, falling back to the authorId/authorEmail params.
                             `window.nitrogenUser = ${JSON.stringify({ id: String(user.id), email: user.email })};`,
-                            // Keep both legacy and current author params present for editor builds.
-                            `(function(){var u=new URL(window.location.href),a=${JSON.stringify(String(user.id))},changed=false;if(!u.searchParams.has("authorId")){u.searchParams.set("authorId",a);changed=true}if(!u.searchParams.has("author")){u.searchParams.set("author",a);changed=true}if(changed){window.history.replaceState(null,"",u.toString())}})();`,
                         ].join(""),
                     } }), _jsxs("div", { id: "root", children: [_jsx("div", { style: {
                                 position: "fixed",

package/dist/endpoints/component-inventory.js

@@ -203,7 +203,7 @@ export function createComponentInventoryEndpoints(args) {
                 const authError = requireAuth(req);
                 if (authError)
                     return authError;
-                const result = await reindexAllComponentInventory(req.payload, args.collections, args.componentManifest);
+                const result = await reindexAllComponentInventory(req.payload, args.collections, args.componentManifest, req);
                 return Response.json({
                     success: true,
                     ...result,

package/dist/index.js

@@ -57,7 +57,8 @@ export const nitrogenConnectorPlugin = (options = {}) => (incomingConfig) => {
     const createAfterChangeHook = (collectionSlug) => {
         return async ({ doc, req }) => {
             if (doc) {
-                await reindexDocumentUsage(req.payload, collectionSlug, doc, collectionSlug === 'nitrogen-templates' ? 'template' : 'document');
+                // Pass `req` so inventory writes join the caller's transaction.
+                await reindexDocumentUsage(req.payload, collectionSlug, doc, collectionSlug === 'nitrogen-templates' ? 'template' : 'document', req);
             }
             return doc;
         };
@@ -66,7 +67,7 @@ export const nitrogenConnectorPlugin = (options = {}) => (incomingConfig) => {
         return async ({ doc, id, req, }) => {
             const sourceId = doc?.id ?? id;
             if (sourceId !== undefined) {
-                await deleteDocumentUsage(req.payload, collectionSlug, sourceId);
+                await deleteDocumentUsage(req.payload, collectionSlug, sourceId, req);
             }
             return doc;
         };

package/dist/inventory/indexing.d.ts

@@ -1,5 +1,5 @@
 import type { ComponentManifestEntry } from '@nitrogenbuilder/types';
-import type { Payload, Where } from 'payload';
+import type { Payload, PayloadRequest, Where } from 'payload';
 import type { NitrogenInventorySourceDoc } from '../types.js';
 import { type NitrogenComponentManifestInput } from './manifest.js';
 export declare const NITROGEN_COMPONENT_CATALOG_COLLECTION = "nitrogen-component-catalog";
@@ -23,9 +23,9 @@ export declare function findAllDocs<T extends object>(payload: Payload, collecti
     limit?: number;
     select?: Record<string, true>;
     where?: Where;
-}): Promise<T[]>;
-export declare function syncComponentCatalog(payload: Payload, manifestInput?: NitrogenComponentManifestInput): Promise<ComponentManifestEntry[]>;
-export declare function reindexDocumentUsage(payload: Payload, sourceCollection: string, doc: NitrogenInventorySourceDoc, sourceType?: 'document' | 'template'): Promise<number>;
-export declare function deleteDocumentUsage(payload: Payload, sourceCollection: string, sourceDocumentId: string | number): Promise<void>;
-export declare function reindexAllComponentInventory(payload: Payload, collections: string[], manifestInput?: NitrogenComponentManifestInput): Promise<ReindexResult>;
+}, req?: PayloadRequest): Promise<T[]>;
+export declare function syncComponentCatalog(payload: Payload, manifestInput?: NitrogenComponentManifestInput, req?: PayloadRequest): Promise<ComponentManifestEntry[]>;
+export declare function reindexDocumentUsage(payload: Payload, sourceCollection: string, doc: NitrogenInventorySourceDoc, sourceType?: 'document' | 'template', req?: PayloadRequest): Promise<number>;
+export declare function deleteDocumentUsage(payload: Payload, sourceCollection: string, sourceDocumentId: string | number, req?: PayloadRequest): Promise<void>;
+export declare function reindexAllComponentInventory(payload: Payload, collections: string[], manifestInput?: NitrogenComponentManifestInput, req?: PayloadRequest): Promise<ReindexResult>;
 export {};

package/dist/inventory/indexing.js

@@ -62,7 +62,7 @@ export function extractComponentUsageRecords(modules) {
     collectUsageFromTree(modules, 'modules', results);
     return results;
 }
-export async function findAllDocs(payload, collection, options) {
+export async function findAllDocs(payload, collection, options, req) {
     const docs = [];
     let page = 1;
     let hasNextPage = true;
@@ -74,6 +74,7 @@ export async function findAllDocs(payload, collection, options) {
             page,
             overrideAccess: true,
             pagination: true,
+            req,
             select: options?.select,
             where: options?.where,
         });
@@ -83,16 +84,17 @@ export async function findAllDocs(payload, collection, options) {
     }
     return docs;
 }
-async function deleteUsageDocs(payload, docs) {
+async function deleteUsageDocs(payload, docs, req) {
     for (const doc of docs) {
         await payload.delete({
             collection: NITROGEN_COMPONENT_USAGE_COLLECTION,
             id: doc.id,
             overrideAccess: true,
+            req,
         });
     }
 }
-async function findUsageDocsForSource(payload, sourceCollection, sourceDocumentId) {
+async function findUsageDocsForSource(payload, sourceCollection, sourceDocumentId, req) {
     return findAllDocs(payload, NITROGEN_COMPONENT_USAGE_COLLECTION, {
         limit: 100,
         select: {
@@ -112,15 +114,16 @@ async function findUsageDocsForSource(payload, sourceCollection, sourceDocumentI
                 },
             ],
         },
-    });
+    }, req);
 }
-async function createUsageDocs(payload, sourceCollection, sourceType, doc) {
+async function createUsageDocs(payload, sourceCollection, sourceType, doc, req) {
     const sourceDocumentId = String(doc.id);
     const usageRecords = extractComponentUsageRecords(doc.nitrogenData);
     for (const record of usageRecords) {
         await payload.create({
             collection: NITROGEN_COMPONENT_USAGE_COLLECTION,
             overrideAccess: true,
+            req,
             data: {
                 usageKey: `${sourceCollection}:${sourceDocumentId}:${record.moduleId}:${record.modulePath}:${record.componentName}`,
                 componentName: record.componentName,
@@ -141,10 +144,10 @@ async function createUsageDocs(payload, sourceCollection, sourceType, doc) {
     }
     return usageRecords.length;
 }
-export async function syncComponentCatalog(payload, manifestInput) {
+export async function syncComponentCatalog(payload, manifestInput, req) {
     const manifest = await resolveComponentManifest(manifestInput);
     const entries = manifest.components || [];
-    const existingDocs = await findAllDocs(payload, NITROGEN_COMPONENT_CATALOG_COLLECTION);
+    const existingDocs = await findAllDocs(payload, NITROGEN_COMPONENT_CATALOG_COLLECTION, undefined, req);
     const existingByName = new Map(existingDocs.map((doc) => [doc.componentName, doc]));
     const nextNames = new Set(entries.map((entry) => entry.name));
     for (const entry of entries) {
@@ -163,6 +166,7 @@ export async function syncComponentCatalog(payload, manifestInput) {
                 id: existing.id,
                 data,
                 overrideAccess: true,
+                req,
             });
         }
         else {
@@ -170,6 +174,7 @@ export async function syncComponentCatalog(payload, manifestInput) {
                 collection: NITROGEN_COMPONENT_CATALOG_COLLECTION,
                 data,
                 overrideAccess: true,
+                req,
             });
         }
     }
@@ -179,30 +184,31 @@ export async function syncComponentCatalog(payload, manifestInput) {
                 collection: NITROGEN_COMPONENT_CATALOG_COLLECTION,
                 id: existing.id,
                 overrideAccess: true,
+                req,
             });
         }
     }
     return entries;
 }
-export async function reindexDocumentUsage(payload, sourceCollection, doc, sourceType = 'document') {
+export async function reindexDocumentUsage(payload, sourceCollection, doc, sourceType = 'document', req) {
     const sourceDocumentId = String(doc.id);
-    const docsForSource = await findUsageDocsForSource(payload, sourceCollection, sourceDocumentId);
-    await deleteUsageDocs(payload, docsForSource);
-    return createUsageDocs(payload, sourceCollection, sourceType, doc);
+    const docsForSource = await findUsageDocsForSource(payload, sourceCollection, sourceDocumentId, req);
+    await deleteUsageDocs(payload, docsForSource, req);
+    return createUsageDocs(payload, sourceCollection, sourceType, doc, req);
 }
-export async function deleteDocumentUsage(payload, sourceCollection, sourceDocumentId) {
-    const docsForSource = await findUsageDocsForSource(payload, sourceCollection, String(sourceDocumentId));
-    await deleteUsageDocs(payload, docsForSource);
+export async function deleteDocumentUsage(payload, sourceCollection, sourceDocumentId, req) {
+    const docsForSource = await findUsageDocsForSource(payload, sourceCollection, String(sourceDocumentId), req);
+    await deleteUsageDocs(payload, docsForSource, req);
 }
-export async function reindexAllComponentInventory(payload, collections, manifestInput) {
-    const entries = await syncComponentCatalog(payload, manifestInput);
+export async function reindexAllComponentInventory(payload, collections, manifestInput, req) {
+    const entries = await syncComponentCatalog(payload, manifestInput, req);
     const usageDocs = await findAllDocs(payload, NITROGEN_COMPONENT_USAGE_COLLECTION, {
         limit: 200,
         select: {
             id: true,
         },
-    });
-    await deleteUsageDocs(payload, usageDocs);
+    }, req);
+    await deleteUsageDocs(payload, usageDocs, req);
     let documentCount = 0;
     let usageCount = 0;
     for (const collection of collections) {
@@ -216,10 +222,10 @@ export async function reindexAllComponentInventory(payload, collections, manifes
                 _status: true,
                 nitrogenData: true,
             },
-        });
+        }, req);
         for (const doc of docs) {
             documentCount += 1;
-            usageCount += await createUsageDocs(payload, collection, collection === 'nitrogen-templates' ? 'template' : 'document', doc);
+            usageCount += await createUsageDocs(payload, collection, collection === 'nitrogen-templates' ? 'template' : 'document', doc, req);
         }
     }
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitrogenbuilder/connector-payload",
-  "version": "0.1.52",
+  "version": "1.0.0",
   "description": "Nitrogen page builder connector plugin for Payload CMS 3.x",
   "author": "Leonardo Dentzien <leo@torchmedia.ca>",
   "type": "module",