@adobe/helix-config 2.13.0 → 2.14.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [2.14.0](https://github.com/adobe/helix-config/compare/v2.13.1...v2.14.0) (2024-05-07)
+
+
+### Features
+
+* simplify token cretion on empty org ([#74](https://github.com/adobe/helix-config/issues/74)) ([327747a](https://github.com/adobe/helix-config/commit/327747a4a34e4b3ae37f732e1631a40184190b8b))
+
+## [2.13.1](https://github.com/adobe/helix-config/compare/v2.13.0...v2.13.1) (2024-05-07)
+
+
+### Bug Fixes
+
+* support old configs without data ([#73](https://github.com/adobe/helix-config/issues/73)) ([bfe92bf](https://github.com/adobe/helix-config/commit/bfe92bf567af97317f69be0b43ed39cb4f1f33eb))
+
 # [2.13.0](https://github.com/adobe/helix-config/compare/v2.12.2...v2.13.0) (2024-05-07)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "2.13.0",
+  "version": "2.14.0",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/config-legacy.js

@@ -117,7 +117,8 @@ export async function resolveLegacyConfig(ctx, rso, scope) {
     return null;
   }
   const { contentBusId } = helixConfig.content.data['/'];
-  let source = helixConfig.fstab?.data.mountpoints['/'];
+  const fstab = helixConfig.fstab.data || helixConfig.fstab;
+  let source = fstab.mountpoints['/'];
   if (typeof source === 'string') {
     source = {
       type: source.startsWith('https://drive.google.com/')
@@ -142,9 +143,9 @@ export async function resolveLegacyConfig(ctx, rso, scope) {
       contentBusId,
       source,
     },
-    folders: helixConfig.fstab?.data.folders ?? {},
+    folders: fstab.folders ?? {},
     /* c8 ignore next */
-    head: helixConfig?.head?.data ?? {},
+    head: helixConfig?.head?.data ?? helixConfig?.head ?? {},
   };
   const configAllPreview = await fetchConfigAll(ctx, config.content.contentBusId, 'preview');
   const configAllLive = await fetchConfigAll(ctx, config.content.contentBusId, 'live');

package/src/storage/config-store.js

@@ -191,7 +191,7 @@ export class ConfigStore {
   async update(ctx, data, relPath = '') {
     const storage = HelixStorage.fromContext(ctx).configBus();
     const buf = await storage.get(this.key);
-    const old = buf ? JSON.parse(buf) : null;
+    let old = buf ? JSON.parse(buf) : null;
     const frag = getFragmentInfo(this.type, relPath);
     let config = data;
     // set config to null if empty object
@@ -205,7 +205,11 @@ export class ConfigStore {
     }
     if (frag) {
       if (!old) {
-        throw new StatusCodeError(404, 'config not found.');
+        if (this.type === 'org' && frag.type === 'tokens') {
+          old = {};
+        } else {
+          throw new StatusCodeError(404, 'config not found.');
+        }
       }
       if (relPath === 'code') {
         updateCodeSource(ctx, data);