@akinon/next 1.26.0-rc.4 → 1.26.0-rc.6

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @akinon/next
 
+## 1.26.0-rc.6
+
+### Minor Changes
+
+- 40ad73e: ZERO-2504: add cookie filter to api client request
+
+### Patch Changes
+
+- @akinon/eslint-plugin-projectzero@1.26.0-rc.6
+
+## 1.26.0-rc.5
+
+### Patch Changes
+
+- @akinon/eslint-plugin-projectzero@1.26.0-rc.5
+
 ## 1.26.0-rc.4
 
 ### Patch Changes

package/api/client.ts

@@ -2,6 +2,8 @@ import { ClientRequestOptions } from '../types';
 import { NextResponse } from 'next/server';
 import settings from 'settings';
 import logger from '../utils/log';
+import formatCookieString from '../utils/format-cookie-string';
+import cookieParser from 'set-cookie-parser';
 
 interface RouteParams {
   params: {
@@ -131,11 +133,21 @@ async function proxyRequest(...args) {
       );
     }
 
-    const setCookieHeader = request.headers.get('set-cookie');
+    const setCookieHeaders = req.headers.getSetCookie();
+    const exceptCookieKeys = ['pz-locale', 'pz-currency'];
+
+    const isExcludedCookie = (name: string) => exceptCookieKeys.includes(name);
+
+    const filteredCookies = cookieParser
+      .parse(setCookieHeaders)
+      .filter((cookie) => !isExcludedCookie(cookie.name));
+
     const responseHeaders: any = {};
 
-    if (setCookieHeader) {
-      responseHeaders['set-cookie'] = setCookieHeader;
+    if (filteredCookies.length > 0) {
+      responseHeaders['set-cookie'] = filteredCookies
+        .map(formatCookieString)
+        .join(', ');
     }
 
     const statusCode = new RegExp(/^20./).test(request.status.toString())

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.26.0-rc.4",
+  "version": "1.26.0-rc.6",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -25,14 +25,16 @@
     "react-redux": "8.1.3",
     "react-string-replace": "1.1.1",
     "redis": "4.5.1",
-    "semver": "7.5.4"
+    "semver": "7.5.4",
+    "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
+    "@akinon/eslint-plugin-projectzero": "1.24.0",
     "@types/react-redux": "7.1.30",
+    "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
-    "@akinon/eslint-plugin-projectzero": "1.24.0",
     "eslint-config-prettier": "8.5.0"
   },
   "peerDependencies": {

package/utils/format-cookie-string.ts

@@ -0,0 +1,27 @@
+export default function formatCookieString(cookieObj: Record<string, any>) {
+  const cookieParts = [`${cookieObj.name}=${cookieObj.value}`];
+
+  if (cookieObj.expires) {
+    cookieParts.push(`Expires=${cookieObj.expires.toUTCString()}`);
+  }
+  if (cookieObj.maxAge) {
+    cookieParts.push(`Max-Age=${cookieObj.maxAge}`);
+  }
+  if (cookieObj.path) {
+    cookieParts.push(`Path=${cookieObj.path}`);
+  }
+  if (cookieObj.domain) {
+    cookieParts.push(`Domain=${cookieObj.domain}`);
+  }
+  if (cookieObj.secure) {
+    cookieParts.push('Secure');
+  }
+  if (cookieObj.httpOnly) {
+    cookieParts.push('HttpOnly');
+  }
+  if (cookieObj.sameSite) {
+    cookieParts.push(`SameSite=${cookieObj.sameSite}`);
+  }
+
+  return cookieParts.join('; ');
+}