@adobe/helix-config-storage 1.3.1 → 1.4.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.4.0](https://github.com/adobe/helix-config-storage/compare/v1.3.2...v1.4.0) (2024-08-31)
+
+
+### Features
+
+* allow adding several users ([cc0722d](https://github.com/adobe/helix-config-storage/commit/cc0722d35b7dc75e78926922c9e9b1a55bbc8377))
+
+## [1.3.2](https://github.com/adobe/helix-config-storage/compare/v1.3.1...v1.3.2) (2024-08-31)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([99c0299](https://github.com/adobe/helix-config-storage/commit/99c0299c724c6574f7656559a86ad5a2073916f6))
+
 ## [1.3.1](https://github.com/adobe/helix-config-storage/compare/v1.3.0...v1.3.1) (2024-08-29)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config-storage",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "Helix Config Storage",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -44,7 +44,7 @@
     "c8": "10.1.2",
     "eslint": "8.57.0",
     "husky": "9.1.5",
-    "json-schema-to-typescript": "15.0.1",
+    "json-schema-to-typescript": "15.0.2",
     "junit-report-builder": "5.0.0",
     "lint-staged": "15.2.9",
     "mocha": "10.7.3",
@@ -66,6 +66,6 @@
     "@adobe/helix-shared-utils": "3.0.2",
     "ajv": "8.17.1",
     "ajv-formats": "3.0.1",
-    "jose": "5.7.0"
+    "jose": "5.8.0"
   }
 }

package/src/config-store.js

@@ -68,6 +68,13 @@ const FRAGMENTS = {
   },
   profiles: FRAGMENTS_COMMON,
   org: {
+    tokens: {
+      '.': 'tokens',
+      '.param': {
+        name: 'id',
+        '.': 'token',
+      },
+    },
     users: {
       '.': 'users',
       '.param': {
@@ -353,17 +360,28 @@ export class ConfigStore {
         // don't expose hash in return value
         delete ret.hash;
       } else if (frag.type === 'users') {
-        const user = createUser();
-        data = {
-          ...data,
-          ...user,
-        };
-        relPath = ['users', user.id];
-        frag.type = 'user';
         // todo: define via "schema"
         if (!old.users) {
           old.users = [];
         }
+        if (Array.isArray(data)) {
+          const users = [...old.users];
+          for (const userData of data) {
+            users.push({
+              ...createUser(),
+              ...userData,
+            });
+          }
+          data = users;
+        } else {
+          const user = createUser();
+          data = {
+            ...data,
+            ...user,
+          };
+          relPath = ['users', user.id];
+          frag.type = 'user';
+        }
       } else if (frag.type === 'user') {
         const user = deepGetOrCreate(old, relPath);
         if (!user) {

package/src/schemas/org.schema.json

@@ -17,6 +17,9 @@
     },
     "groups": {
       "$ref": "https://ns.adobe.com/helix/config/groups"
+    },
+    "tokens": {
+      "$ref": "https://ns.adobe.com/helix/config/tokens"
     }
   },
   "required": [

package/types/org-config.d.ts

@@ -26,6 +26,7 @@ export interface HelixOrgConfig {
   description?: string;
   users?: Users;
   groups?: Groups;
+  tokens?: Tokens;
 }
 export interface User {
   id: string;
@@ -49,3 +50,14 @@ export interface Group {
     [k: string]: unknown;
   }[];
 }
+export interface Tokens {
+  /**
+   * This interface was referenced by `Tokens`'s JSON-Schema definition
+   * via the `patternProperty` "^[a-zA-Z0-9-_=]+$".
+   */
+  [k: string]: {
+    id?: string;
+    hash?: string;
+    created?: string;
+  };
+}

package/types/profile-config.d.ts

@@ -49,6 +49,7 @@ export interface ContentSource {
   description?: string;
   contentBusId: string;
   source: GoogleContentSource | OnedriveContentSource | MarkupContentSource;
+  overlay?: MarkupContentSource;
 }
 export interface GoogleContentSource {
   type: 'google';

package/types/site-config.d.ts

@@ -56,6 +56,7 @@ export interface ContentSource {
   description?: string;
   contentBusId: string;
   source: GoogleContentSource | OnedriveContentSource | MarkupContentSource;
+  overlay?: MarkupContentSource;
 }
 export interface GoogleContentSource {
   type: 'google';

package/validate-json-schemas.sh

@@ -21,8 +21,8 @@ npx ajv-cli --spec=draft2019 -c ajv-formats compile \
 -s src/schemas/metadata-source.schema.json \
 -s src/schemas/user.schema.json \
 -s src/schemas/users.schema.json \
--s src/schemas/org.schema.json \
 -s src/schemas/tokens.schema.json \
+-s src/schemas/org.schema.json \
 -s src/schemas/sidekick.schema.json \
 -s src/schemas/robots.schema.json \
 -s src/schemas/public.schema.json \