Improve auth redirects handling

lib/constants/cookies.ts

@@ -1,3 +1,5 @@
 export const envIdCookieName = "currentEnvId";
 
 export const previewApiKeyCookieName = "currentPreviewApiKey";
+
+export const ignoreMissingApiKeyCookieName = "ignoreMissingApiKey";

middleware.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from 'next/server'
 
-import { envIdCookieName, previewApiKeyCookieName } from './lib/constants/cookies';
+import { envIdCookieName, ignoreMissingApiKeyCookieName, previewApiKeyCookieName } from './lib/constants/cookies';
 import { createQueryString } from './lib/routing';
 import { defaultEnvId } from './lib/utils/env';
 
@@ -36,27 +36,34 @@ const handleExplicitProjectRoute = (currentEnvId: string) => (prevResponse: Next
     return prevResponse;
   }
 
+  if (request.nextUrl.pathname.includes("/api/exit-preview") && request.cookies.get(ignoreMissingApiKeyCookieName)) {
+    return prevResponse;
+  }
+
   if (routeEnvId === defaultEnvId) {
     const res = NextResponse.redirect(new URL(createUrlWithQueryString(remainingUrl, request.nextUrl.searchParams), request.nextUrl.origin));
-    res.cookies.set(envIdCookieName, routeEnvId, { path: '/', sameSite: 'none', secure: true });
-    res.cookies.set(previewApiKeyCookieName, '', { path: '/', sameSite: 'none', secure: true });
+    res.cookies.set(envIdCookieName, routeEnvId, cookieOptions);
+    res.cookies.set(previewApiKeyCookieName, '', cookieOptions);
 
     return res
   }
 
   if (routeEnvId !== currentEnvId || !request.cookies.get(previewApiKeyCookieName)) {
-    const res = NextResponse.redirect(new URL(`/getPreviewApiKey?path=${encodeURIComponent(createUrlWithQueryString(remainingUrl, request.nextUrl.searchParams.entries()))}`, request.url))
+    const originalPath = encodeURIComponent(createUrlWithQueryString(remainingUrl, request.nextUrl.searchParams.entries()));
+    const redirectPath = `/api/exit-preview?callback=${encodeURIComponent(`/getPreviewApiKey?path=${originalPath}`)}`;
+    const res = NextResponse.redirect(new URL(redirectPath, request.url));
 
-    res.cookies.set(envIdCookieName, routeEnvId, { path: '/', sameSite: 'none', secure: true });
-    res.cookies.set(previewApiKeyCookieName, '', { path: '/', sameSite: 'none', secure: true });
+    res.cookies.set(envIdCookieName, routeEnvId, cookieOptions);
+    res.cookies.set(previewApiKeyCookieName, '', cookieOptions);
+    res.cookies.set(ignoreMissingApiKeyCookieName, "true", cookieOptions);
 
     return res;
   }
 
   return NextResponse.redirect(new URL(`${remainingUrl ?? ''}?${createQueryString(Object.fromEntries(request.nextUrl.searchParams.entries()))}`, request.nextUrl.origin));
 }
 
-const handleArticlesRoute = (currentEnvId: string) => (prevResponse: NextResponse, request: NextRequest,) => request.nextUrl.pathname === '/articles'
+const handleArticlesRoute = (currentEnvId: string) => (prevResponse: NextResponse, request: NextRequest) => request.nextUrl.pathname === '/articles'
   ? NextResponse.rewrite(new URL(`/${currentEnvId}/articles/category/all/page/1`, request.url))
   : prevResponse;
 
@@ -72,11 +79,10 @@ const handleArticlesCategoryWithNoPaginationRoute = (currentEnvId: string) => (p
 
 const handleEmptyCookies = (prevResponse: NextResponse, request: NextRequest) => {
   if (!request.cookies.get(envIdCookieName)?.value) {
-    prevResponse.cookies.set(envIdCookieName, defaultEnvId, { path: '/', sameSite: 'none', secure: true })
+    prevResponse.cookies.set(envIdCookieName, defaultEnvId, cookieOptions)
   }
   if (!request.cookies.get(envIdCookieName)?.value || request.cookies.get(envIdCookieName)?.value === defaultEnvId) {
-
-    prevResponse.cookies.set(previewApiKeyCookieName, KONTENT_PREVIEW_API_KEY, { path: '/', sameSite: 'none', secure: true })
+    prevResponse.cookies.set(previewApiKeyCookieName, KONTENT_PREVIEW_API_KEY, cookieOptions)
   }
 
 
@@ -101,4 +107,6 @@ export const config = {
     '/((?!api|_next/static|_next/image|favicon.png|getPreviewApiKey|logo.png|callback).*)',
     '/'
   ],
-}
+};
+
+const cookieOptions = { path: '/', sameSite: 'none', secure: true } as const;

package.json

@@ -20,7 +20,7 @@
     "@vercel/analytics": "^1.0.0",
     "auth0-js": "^9.22.1",
     "cookies-next": "^4.0.0",
-    "next": "13.4.19",
+    "next": "^13.5.3",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "swiper": "^10.2.0"

pages/api/exit-preview.tsx

@@ -1,13 +1,16 @@
 import { NextApiHandler } from "next";
 
+import { ignoreMissingApiKeyCookieName } from "../../lib/constants/cookies";
+
 const handler: NextApiHandler = (req, res) => {
-    console.log("Exiting preview");
-    // Exit the current user from "Preview Mode". This function accepts no args.
-    res.clearPreviewData();
-
-    // Redirect the user back to the index page.
-    // Might be implemented return URL by the query string.
-    res.redirect("/");
-  }
-
-  export default handler;
+  // Exit the current user from "Preview Mode". This function accepts no args.
+  res.clearPreviewData();
+
+  res.setHeader("Set-Cookie", `${ignoreMissingApiKeyCookieName}=; Path=/; SameSite=None; Secure; Max-Age=-1`);
+
+  // Redirect the user back to the index page.
+  // Might be implemented return URL by the query string.
+  res.redirect(typeof req.query.callback === "string" ? req.query.callback : "/");
+}
+
+export default handler;

pages/api/preview.ts

@@ -1,4 +1,4 @@
-import { NextApiHandler } from "next";
+import { NextApiHandler, NextApiResponse } from "next";
 
 import { envIdCookieName, previewApiKeyCookieName } from "../../lib/constants/cookies";
 import { ResolutionContext, resolveUrlPath } from "../../lib/routing";
@@ -7,18 +7,23 @@ import { defaultEnvId } from "../../lib/utils/env";
 const handler: NextApiHandler = async (req, res) => {
   // TODO move secret to env variables
   if (req.query.secret !== 'mySuperSecret' || !req.query.slug || !req.query.type) {
-    return res.status(401).json({ message: 'Invalid preview token, or no slug and type provided.' })
+    res.status(401).json({ message: 'Invalid preview token, or no slug and type provided.' });
+    return;
   }
 
   const currentEnvId = req.cookies[envIdCookieName];
   const currentPreviewApiKey = req.cookies[previewApiKeyCookieName];
 
   if (!currentPreviewApiKey && currentEnvId !== defaultEnvId) {
-    return res.redirect(`/getPreviewApiKey?path=${encodeURIComponent(req.url ?? '')}`);
+    res.redirect(`/api/exit-preview?callback=${`/getPreviewApiKey?path=${encodeURIComponent(req.url ?? '')}`}`);
+    return;
   }
-
   // Enable Preview Mode by setting the cookies
   res.setPreviewData({ currentPreviewApiKey });
+  const newCookieHeader = makeCookiesCrossOrigin(res);
+  if (newCookieHeader) {
+    res.setHeader("Set-Cookie", newCookieHeader);
+  }
 
   const path = resolveUrlPath({
     type: req.query.type.toString(),
@@ -30,3 +35,24 @@ const handler: NextApiHandler = async (req, res) => {
 }
 
 export default handler;
+
+const makeCookieCrossOrigin = (header: string) => {
+  const cookie = header.split(";")[0];
+
+  return cookie
+    ? `${cookie}; Path=/; SameSite=None; Secure`
+    : "";
+};
+
+const makeCookiesCrossOrigin = (response: NextApiResponse) => {
+  const header = response.getHeader("Set-Cookie");
+
+  if (typeof header === "string") {
+    return makeCookieCrossOrigin(header);
+  }
+  if (Array.isArray(header)) {
+    return header.map(makeCookieCrossOrigin);
+  }
+
+  return header;
+}