@adobe/helix-html-pipeline 6.0.0 → 6.0.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [6.0.1](https://github.com/adobe/helix-html-pipeline/compare/v6.0.0...v6.0.1) (2024-01-11)
+
+
+### Bug Fixes
+
+* enforce rso ([#488](https://github.com/adobe/helix-html-pipeline/issues/488)) ([4b38e25](https://github.com/adobe/helix-html-pipeline/commit/4b38e2524514a3d64a041d456bf14fe8b2e416cb))
+
 # [6.0.0](https://github.com/adobe/helix-html-pipeline/compare/v5.4.4...v6.0.0) (2024-01-10)
 
 

package/package.json

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

package/src/PipelineState.d.ts

@@ -43,6 +43,8 @@ declare interface PipelineOptions {
   path: string;
   timer: PipelineTimer;
   env: object;
+  site: string;
+  org: string;
 }
 
 declare class PipelineState {
@@ -70,6 +72,16 @@ declare class PipelineState {
    */
   partition: string;
 
+  /**
+   * project site
+   */
+  site: string;
+
+  /**
+   * project org
+   */
+  org: string;
+
   /**
    * Repository owner
    */

package/src/PipelineState.js

@@ -31,6 +31,8 @@ export class PipelineState {
       config: opts.config,
       content: new PipelineContent(),
       contentBusId: opts.config.contentBusId,
+      site: opts.site,
+      org: opts.org,
       owner: opts.config.owner,
       repo: opts.config.repo,
       ref: opts.ref,
@@ -44,6 +46,11 @@ export class PipelineState {
       timer: opts.timer,
       type: 'html',
     });
+    for (const prop of ['org', 'site', 'contentBusId', 'repo', 'owner', 'ref', 'partition']) {
+      if (!this[prop]) {
+        throw new Error(`${prop} required`);
+      }
+    }
   }
 
   // eslint-disable-next-line class-methods-use-this

package/src/utils/auth.js

@@ -239,8 +239,8 @@ export class AuthInfo {
     const url = new URL(idp.discovery.authorization_endpoint);
 
     const tokenState = await signJWT(state, new SignJWT({
-      owner: state.owner,
-      repo: state.repo,
+      org: state.org,
+      site: state.site,
       // this is our own login redirect, i.e. the current document
       requestPath: state.info.path,
       requestHost: host,
@@ -400,8 +400,8 @@ export async function initAuthRoute(state, req, res) {
   }
 
   // fixup pipeline state
-  state.owner = req.params.state.owner;
-  state.repo = req.params.state.repo;
+  state.org = req.params.state.org;
+  state.site = req.params.state.site;
   state.ref = 'main';
   state.partition = 'preview';
   state.info.path = '/.auth';