@adobe/helix-config 5.6.11 → 5.8.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [5.8.0](https://github.com/adobe/helix-config/compare/v5.7.0...v5.8.0) (2025-12-17)
+
+
+### Features
+
+* include code bus sidekick in admin config ([#345](https://github.com/adobe/helix-config/issues/345)) ([6837ece](https://github.com/adobe/helix-config/commit/6837ece3169bc0d4863dd796e49b493fa1933859))
+
+# [5.7.0](https://github.com/adobe/helix-config/compare/v5.6.11...v5.7.0) (2025-11-11)
+
+
+### Features
+
+* include org and site apiKeys into admin scope ([#337](https://github.com/adobe/helix-config/issues/337)) ([ceed54e](https://github.com/adobe/helix-config/commit/ceed54ed5533da5cf9cd4702946af2165290722e))
+
 ## [5.6.11](https://github.com/adobe/helix-config/compare/v5.6.10...v5.6.11) (2025-11-05)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "5.6.11",
+  "version": "5.8.0",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -35,20 +35,20 @@
     "reporter-options": "configFile=.mocha-multi.json"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "3.0.13",
-    "@eslint/config-helpers": "0.4.1",
+    "@adobe/eslint-config-helix": "3.0.15",
+    "@eslint/config-helpers": "0.5.0",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "@semantic-release/npm": "13.1.1",
+    "@semantic-release/npm": "13.1.2",
     "c8": "10.1.3",
     "eslint": "9.4.0",
     "husky": "9.1.7",
     "junit-report-builder": "5.1.1",
-    "lint-staged": "16.2.5",
-    "mocha": "11.7.4",
+    "lint-staged": "16.2.7",
+    "mocha": "11.7.5",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.6.0",
-    "semantic-release": "25.0.1"
+    "semantic-release": "25.0.2"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/config-view.js

@@ -243,6 +243,20 @@ async function loadHeadHtml(ctx, config, ref) {
   return {};
 }
 
+async function loadSidekickConfig(ctx, config) {
+  const key = `${config.code.owner}/${config.code.repo}/main/tools/sidekick/config.json`;
+  const res = await ctx.loader.getObject(HELIX_CODE_BUS, key);
+  if (res.body) {
+    const sidekick = new ConfigObject();
+    sidekick.data = JSON.parse(res.body);
+    sidekick.updateLastModified(res.headers);
+    // remove deprecated properties
+    delete sidekick.data.extends;
+    return sidekick;
+  }
+  return {};
+}
+
 function retainProperty(obj, prop) {
   if (!obj || Array.isArray(obj)) {
     return;
@@ -338,10 +352,15 @@ async function resolveConfig(ctx, rso, scope) {
     }
   }
   if (scope === SCOPE_PIPELINE || scope === SCOPE_RAW || scope === SCOPE_DELIVERY) {
-    // although not used in delivery, load in order to set correct last-modified
+    // although not used in raw, or delivery, load in order to set correct last-modified
     ctx.timer?.update('head.html');
     config.head = await loadHeadHtml(ctx, config, rso.ref);
   }
+  if (scope === SCOPE_ADMIN || scope === SCOPE_RAW) {
+    // although not used in raw, in order to set correct last-modified
+    ctx.timer?.update('sidekick.json');
+    site.sidekick = await loadSidekickConfig(ctx, config);
+  }
 
   return site;
 }
@@ -392,6 +411,25 @@ function computeOrgAdminRoles(adminConfig, orgConfig) {
   }
 }
 
+/**
+ * Apply org config apiKeys.
+ * @param adminConfig
+ * @param orgConfig
+ */
+function applyOrgAPIKeys(adminConfig, orgConfig) {
+  const orgKeys = Object.keys(orgConfig.apiKeys ?? {});
+  if (orgKeys.length) {
+    const admin = deepGetOrCreate(adminConfig, ['access', 'admin'], true);
+    const apiKeyId = new Set([
+      ...admin.apiKeyId ?? [],
+      ...orgKeys,
+    ]);
+    if (apiKeyId.size) {
+      admin.apiKeyId = Array.from(apiKeyId).sort();
+    }
+  }
+}
+
 /**
  * Extract the email addresses of the users for the given group.
  * @param groups
@@ -500,9 +538,14 @@ async function computeSiteAdminRoles(ctx, siteConfig, admin, orgConfig, configGr
     role: roles,
   };
 
-  const apiKeyId = new Set([...admin.apiKeyId ?? [], ...orgConfig?.access?.admin?.apiKeyId ?? []]);
+  const apiKeyId = new Set([
+    ...admin.apiKeyId ?? [],
+    ...orgConfig?.access?.admin?.apiKeyId ?? [],
+    ...Object.keys(orgConfig?.apiKeys || {}),
+    ...Object.keys(siteConfig?.apiKeys || {}),
+  ]);
   if (apiKeyId.size) {
-    ret.apiKeyId = Array.from(apiKeyId);
+    ret.apiKeyId = Array.from(apiKeyId).sort();
   }
   // if there are only roles from the org, ensure that they don't enforce auth
   if (hasOrgUsers && !hasRoles && (!admin.requireAuth || admin.requireAuth === 'auto')) {
@@ -585,6 +628,7 @@ export async function getConfigResponse(ctx, opts) {
 
   // todo: improve
   siteConfig.updateLastModified(config.head);
+  siteConfig.updateLastModified(siteConfig.sidekick);
   siteConfig.updateLastModified(config.robots);
   siteConfig.updateLastModified(config.metadata?.preview);
   siteConfig.updateLastModified(config.metadata?.live);
@@ -626,6 +670,7 @@ export async function getConfigResponse(ctx, opts) {
   if (opts.scope === SCOPE_ADMIN) {
     const adminConfig = {
       ...rso,
+      sidekick: siteConfig.sidekick?.data,
       ...config,
       content: {
         ...config.content,
@@ -732,6 +777,7 @@ export async function getOrgConfigResponse(ctx, opts) {
   };
 
   computeOrgAdminRoles(adminConfig, orgConfig);
+  applyOrgAPIKeys(adminConfig, orgConfig);
   delete adminConfig.tokens;
   delete adminConfig.users;
   delete adminConfig.groups;