@adobe/helix-config 4.4.0 → 4.5.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [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.0",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/config-view.js

@@ -343,11 +343,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 +388,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;
@@ -436,7 +444,7 @@ export async function getConfigResponse(ctx, opts) {
     };
     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);