@adobe/helix-config 4.8.4 → 4.10.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [4.10.0](https://github.com/adobe/helix-config/compare/v4.9.0...v4.10.0) (2024-12-16)
+
+
+### Features
+
+* remove clientCertDN ([#225](https://github.com/adobe/helix-config/issues/225)) ([8c43f12](https://github.com/adobe/helix-config/commit/8c43f12bb7b373504d202baf3852863f72fa4f4b))
+
+# [4.9.0](https://github.com/adobe/helix-config/compare/v4.8.4...v4.9.0) (2024-12-09)
+
+
+### Features
+
+* return legacy config for admin scope ([#222](https://github.com/adobe/helix-config/issues/222)) ([0d6b092](https://github.com/adobe/helix-config/commit/0d6b09286a8d13568a9c4d6f07eb32139aed397f))
+
 ## [4.8.4](https://github.com/adobe/helix-config/compare/v4.8.3...v4.8.4) (2024-12-07)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "4.8.4",
+  "version": "4.10.0",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -39,11 +39,11 @@
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "12.0.1",
-    "c8": "10.1.2",
+    "c8": "10.1.3",
     "eslint": "8.57.1",
     "husky": "9.1.7",
     "junit-report-builder": "5.1.1",
-    "lint-staged": "15.2.10",
+    "lint-staged": "15.2.11",
     "mocha": "11.0.1",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.5.1",

package/src/config-view.js

@@ -123,7 +123,6 @@ export async function getAccessConfig(ctx, config, orgConfig, partition, rso) {
       .map((jti) => jti.replaceAll('/', '_').replaceAll('+', '-'))
       .map((id) => tokens[id]?.hash)
       .filter((hash) => !!hash),
-    clientCertDN: toArray(pAccess.clientCertDN ?? access.site?.clientCertDN ?? access.clientCertDN),
   };
   // if an allow is defined but no apiKeyId, create a fake one so that auth is still enforced.
   if (allow.length && !cfg.apiKeyId.length) {
@@ -237,16 +236,12 @@ async function resolveConfig(ctx, rso, scope) {
   const key = `orgs/${rso.org}/sites/${rso.site}.json`;
   const res = await ctx.loader.getObject(HELIX_CONFIG_BUS, key);
   if (!res.body) {
-    if (scope !== SCOPE_ADMIN) {
-      const config = await resolveLegacyConfig(ctx, rso, scope);
-      if (config) {
-        const profile = await loadProfile(ctx, rso, 'default');
-        config.data.tokens = profile?.data.tokens || {};
-      }
-      return config;
-    } else {
-      return null;
+    const config = await resolveLegacyConfig(ctx, rso, scope);
+    if (config) {
+      const profile = await loadProfile(ctx, rso, 'default');
+      config.data.tokens = profile?.data.tokens || {};
     }
+    return config;
   }
   const site = new ConfigObject();
   site.data = res.json();
@@ -464,8 +459,6 @@ export async function getConfigResponse(ctx, opts) {
         'x-hlx-contentbus-id': config.content.contentBusId,
         'x-hlx-owner': config.code.owner,
         'x-hlx-repo': config.code.repo,
-        'x-hlx-auth-clientdn-preview': canonicalArrayString(config.access, 'preview', 'clientCertDN'),
-        'x-hlx-auth-clientdn-live': canonicalArrayString(config.access, 'live', 'clientCertDN'),
         'x-hlx-auth-hash-preview': canonicalArrayString(config.access, 'preview', 'tokenHash'),
         'x-hlx-auth-hash-live': canonicalArrayString(config.access, 'live', 'tokenHash'),
       },