@adobe/helix-config 4.4.0 → 4.5.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [4.5.1](https://github.com/adobe/helix-config/compare/v4.5.0...v4.5.1) (2024-09-10)
+
+
+### Bug Fixes
+
+* also respect org-tokens (regression) ([#184](https://github.com/adobe/helix-config/issues/184)) ([2ae41fa](https://github.com/adobe/helix-config/commit/2ae41fa518a32a5fc674bbc85796e21843fb3c3c))
+
+# [4.5.0](https://github.com/adobe/helix-config/compare/v4.4.0...v4.5.0) (2024-09-05)
+
+
+### Features
+
+* include org apiKeyId to admin and raw scope ([#181](https://github.com/adobe/helix-config/issues/181)) ([223c5bf](https://github.com/adobe/helix-config/commit/223c5bf70b2c8c00c7171b009b294785be7a42c9))
+
 # [4.4.0](https://github.com/adobe/helix-config/compare/v4.3.3...v4.4.0) (2024-09-05)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "4.4.0",
+  "version": "4.5.1",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -35,7 +35,7 @@
     "reporter-options": "configFile=.mocha-multi.json"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "2.0.6",
+    "@adobe/eslint-config-helix": "2.0.7",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "12.0.1",
@@ -43,7 +43,7 @@
     "eslint": "8.57.0",
     "husky": "9.1.5",
     "junit-report-builder": "5.0.0",
-    "lint-staged": "15.2.9",
+    "lint-staged": "15.2.10",
     "mocha": "10.7.3",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.5.1",
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@adobe/fetch": "4.1.8",
-    "@adobe/helix-shared-config": "10.6.7",
+    "@adobe/helix-shared-config": "10.6.8",
     "@adobe/helix-shared-utils": "3.0.2"
   }
 }

package/src/config-view.js

@@ -109,8 +109,9 @@ async function getGlobalTokenHash(ctx, rso) {
 /**
  * Returns the normalized access configuration for the give partition.
  */
-export async function getAccessConfig(ctx, config, partition, rso) {
-  const { access, tokens = {} } = config;
+export async function getAccessConfig(ctx, config, orgConfig, partition, rso) {
+  const { access } = config;
+  const tokens = { ...orgConfig?.tokens || {}, ...config.tokens };
   const pAccess = access[partition] ?? {};
   const apiKeyId = toArray(pAccess.apiKeyId ?? access.site?.apiKeyId);
   const allow = toArray(pAccess.allow ?? access.site?.allow);
@@ -343,11 +344,14 @@ function resolveGroup(groups, name) {
 /**
  * Compute the access.admin.role arrays for the admin config. Resolves site and org groups.
  * @param admin
+ * @param orgConfig
  * @param configGroups
- * @param orgGroups
- * @param orgUsers
  */
-function computeSiteAdminRoles(admin, configGroups = {}, orgGroups = {}, orgUsers = []) {
+function computeSiteAdminRoles(admin, orgConfig, configGroups = {}) {
+  const {
+    users: orgUsers = [],
+    groups: orgGroups = {},
+  } = orgConfig ?? {};
   const roles = {};
   for (const [roleName, role] of Object.entries(admin.role ?? {})) {
     const users = new Set();
@@ -385,6 +389,11 @@ function computeSiteAdminRoles(admin, configGroups = {}, orgGroups = {}, orgUser
     ...admin,
     role: roles,
   };
+
+  const apiKeyId = new Set([...admin.apiKeyId ?? [], ...orgConfig?.access?.admin?.apiKeyId ?? []]);
+  if (apiKeyId.size) {
+    ret.apiKeyId = Array.from(apiKeyId);
+  }
   // if there are only roles from the org, ensure that they don't enforce auth
   if (hasOrgUsers && !hasRoles && (!admin.requireAuth || admin.requireAuth === 'auto')) {
     ret.requireAuth = false;
@@ -430,13 +439,13 @@ export async function getConfigResponse(ctx, opts) {
     // normalize access config
     const { admin = {} } = config.access;
     config.access = {
-      preview: await getAccessConfig(ctx, config, 'preview', rso),
-      live: await getAccessConfig(ctx, config, 'live', rso),
+      preview: await getAccessConfig(ctx, config, orgConfig, 'preview', rso),
+      live: await getAccessConfig(ctx, config, orgConfig, 'live', rso),
       // access.require.repository ?
     };
     if (opts.scope === SCOPE_ADMIN || opts.scope === SCOPE_RAW) {
       // eslint-disable-next-line max-len
-      config.access.admin = computeSiteAdminRoles(admin, config.groups, orgConfig?.groups, orgConfig?.users);
+      config.access.admin = computeSiteAdminRoles(admin, orgConfig, config.groups);
     } else {
       // for pipeline and delivery, also load the site tokens
       const tst = await loadTransientSiteToken(ctx, rso.org, rso.site);