@adobe/helix-html-pipeline 3.11.2 → 3.11.4

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.11.4](https://github.com/adobe/helix-html-pipeline/compare/v3.11.3...v3.11.4) (2023-05-04)
+
+
+### Bug Fixes
+
+* use SameSite=None for auth cookie ([#305](https://github.com/adobe/helix-html-pipeline/issues/305)) ([5303c17](https://github.com/adobe/helix-html-pipeline/commit/5303c174830755f07019179cf9b53c198f3cf3e1)), closes [#304](https://github.com/adobe/helix-html-pipeline/issues/304)
+
+## [3.11.3](https://github.com/adobe/helix-html-pipeline/compare/v3.11.2...v3.11.3) (2023-05-02)
+
+
+### Bug Fixes
+
+* compute surrogate keys for unfound json ([#303](https://github.com/adobe/helix-html-pipeline/issues/303)) ([f86afde](https://github.com/adobe/helix-html-pipeline/commit/f86afde9f1bdb98ef98cdaac56e3fa297bb59a55))
+
 ## [3.11.2](https://github.com/adobe/helix-html-pipeline/compare/v3.11.1...v3.11.2) (2023-04-29)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "3.11.2",
+  "version": "3.11.4",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/json-pipe.js

@@ -67,6 +67,13 @@ async function fetchJsonContent(state, req, res) {
   }
 }
 
+async function computeSurrogateKeys(path, contentBusId) {
+  const keys = [];
+  keys.push(`${contentBusId}${path}`.replace(/\//g, '_')); // TODO: remove
+  keys.push(await computeSurrogateKey(`${contentBusId}${path}`));
+  return keys;
+}
+
 /**
  * Runs the default pipeline and returns the response.
  * @param {PipelineState} state
@@ -140,10 +147,7 @@ export async function jsonPipe(state, req) {
     });
 
     // set surrogate keys
-    const keys = [];
-    const { path } = state.info;
-    keys.push(`${contentBusId}${path}`.replace(/\//g, '_')); // TODO: remove
-    keys.push(await computeSurrogateKey(`${contentBusId}${path}`));
+    const keys = await computeSurrogateKeys(state.info.path, contentBusId);
     res.headers.set('x-surrogate-key', keys.join(' '));
 
     await setCustomResponseHeaders(state, req, res);
@@ -159,7 +163,10 @@ export async function jsonPipe(state, req) {
     if (res.status < 500) {
       await setCustomResponseHeaders(state, req, res);
     }
-
+    if (res.status === 404) {
+      const keys = await computeSurrogateKeys(state.info.path, contentBusId);
+      res.headers.set('x-surrogate-key', keys.join(' '));
+    }
     return res;
   }
 }

package/src/utils/auth-cookie.js

@@ -17,7 +17,7 @@ export function clearAuthCookie(secure) {
     httpOnly: true,
     secure,
     expires: new Date(0),
-    sameSite: 'lax',
+    sameSite: 'none',
   });
 }
 
@@ -26,7 +26,7 @@ export function setAuthCookie(idToken, secure) {
     path: '/',
     httpOnly: true,
     secure,
-    sameSite: 'lax',
+    sameSite: 'none',
   });
 }