@gradial/aci 0.1.13 → 0.1.14

package/dist/next/middleware.d.ts

@@ -1,8 +1,7 @@
-import { type NextRequest } from 'next/server.js';
+import { NextResponse, type NextRequest } from 'next/server.js';
 export interface GradialMiddlewareConfig {
     siteId: string;
     edgeConfig?: string;
-    previewSignKey?: string;
     deploymentId?: string;
 }
-export declare function createGradialMiddleware(config: GradialMiddlewareConfig): (request: NextRequest) => Promise<Response>;
+export declare function createGradialMiddleware(config: GradialMiddlewareConfig): (request: NextRequest) => Promise<NextResponse<unknown>>;

package/dist/next/middleware.js

@@ -7,6 +7,7 @@ const DISPATCH_HEADER = 'x-gradial-dispatch';
 export function createGradialMiddleware(config) {
     return async function gradialMiddleware(request) {
         const url = request.nextUrl;
+        // ?leave_preview=1 → clear cookies, redirect to clean URL
         if (url.searchParams.get('leave_preview') === '1') {
             const cleanUrl = new URL(url.pathname, url.origin);
             const response = NextResponse.redirect(cleanUrl);
@@ -15,30 +16,30 @@ export function createGradialMiddleware(config) {
             return response;
         }
         const requestHeaders = gradialHeaders(request.headers);
-        const preview = await releaseFromPreviewToken(request, config);
-        if (preview.invalid) {
-            return new Response('invalid preview token', { status: 403 });
-        }
-        const releaseId = preview.releaseId || await activeReleaseFromEdgeConfig(config);
+        // Try preview token first; if valid, use that release.
+        // If no token or invalid, fall through to active release from edge config.
+        const previewReleaseId = await releaseIdFromPreviewToken(request, config);
+        const releaseId = previewReleaseId || await activeReleaseFromEdgeConfig(config);
         if (!releaseId) {
             return NextResponse.next({ request: { headers: requestHeaders } });
         }
         requestHeaders.set(RELEASE_HEADER, releaseId);
         requestHeaders.set(ROUTE_HEADER, url.pathname);
         requestHeaders.set(DISPATCH_HEADER, 'ssr-page');
-        if (preview.releaseId) {
+        if (previewReleaseId) {
             requestHeaders.set('x-gradial-preview', '1');
         }
         const response = NextResponse.next({ request: { headers: requestHeaders } });
+        // Persist preview token as cookie so navigation stays in preview
         const queryToken = url.searchParams.get('preview_token');
-        if (queryToken && preview.releaseId) {
+        if (queryToken && previewReleaseId) {
             response.cookies.set('aci_preview', queryToken, {
                 httpOnly: true,
                 sameSite: 'lax',
                 maxAge: 60 * 60,
                 path: '/',
             });
-            response.cookies.set('aci_preview_release', preview.releaseId, {
+            response.cookies.set('aci_preview_release', previewReleaseId, {
                 httpOnly: false,
                 sameSite: 'lax',
                 maxAge: 60 * 60,
@@ -125,23 +126,23 @@ function clampRelease(activeReleaseId, activeSequence, compatibility) {
 function edgeKeySegment(value) {
     return value.replace(/[^A-Za-z0-9_-]/g, '_');
 }
-async function releaseFromPreviewToken(request, config) {
+async function releaseIdFromPreviewToken(request, config) {
     const token = previewTokenFromRequest(request);
     if (!token)
-        return { releaseId: '', invalid: false };
-    const signKey = config.previewSignKey || process.env.ACI_PREVIEW_SIGN_KEY || process.env.GRADIAL_PREVIEW_SIGN_KEY || '';
+        return '';
+    const signKey = process.env.GRADIAL_PREVIEW_SIGN_KEY || '';
     if (!signKey) {
-        console.warn('[gradial] preview sign key not set (ACI_PREVIEW_SIGN_KEY or GRADIAL_PREVIEW_SIGN_KEY) — preview token ignored');
-        return { releaseId: '', invalid: false };
+        console.warn('[gradial] GRADIAL_PREVIEW_SIGN_KEY not set — preview tokens will be ignored');
+        return '';
     }
     const claims = await validatePreviewToken(token, signKey);
     if (!claims || claims.scope !== 'preview' || !claims.releaseId)
-        return { releaseId: '', invalid: true };
+        return '';
     if (claims.siteId && config.siteId && claims.siteId !== config.siteId)
-        return { releaseId: '', invalid: true };
+        return '';
     if (!claims.expiresAt || Date.parse(claims.expiresAt) <= Date.now())
-        return { releaseId: '', invalid: true };
-    return { releaseId: claims.releaseId, invalid: false };
+        return '';
+    return claims.releaseId;
 }
 function previewTokenFromRequest(request) {
     const queryToken = request.nextUrl.searchParams.get('preview_token');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradial/aci",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",