canopycms 0.0.59 → 0.0.60
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/__test__/mock-client.js +4 -4
- package/dist/api/__test__/mock-client.js.map +1 -1
- package/dist/api/branch-merge.d.ts.map +1 -1
- package/dist/api/branch-merge.js +2 -6
- package/dist/api/branch-merge.js.map +1 -1
- package/dist/api/branch-withdraw.d.ts.map +1 -1
- package/dist/api/branch-withdraw.js +19 -4
- package/dist/api/branch-withdraw.js.map +1 -1
- package/dist/api/entries.d.ts.map +1 -1
- package/dist/api/entries.js +22 -3
- package/dist/api/entries.js.map +1 -1
- package/dist/api/groups.d.ts +3 -0
- package/dist/api/groups.d.ts.map +1 -1
- package/dist/api/groups.js +89 -68
- package/dist/api/groups.js.map +1 -1
- package/dist/api/permissions.d.ts +1 -0
- package/dist/api/permissions.d.ts.map +1 -1
- package/dist/api/permissions.js +23 -20
- package/dist/api/permissions.js.map +1 -1
- package/dist/api/schema.d.ts.map +1 -1
- package/dist/api/schema.js +29 -15
- package/dist/api/schema.js.map +1 -1
- package/dist/authorization/groups/index.d.ts +1 -1
- package/dist/authorization/groups/index.d.ts.map +1 -1
- package/dist/authorization/groups/index.js +1 -1
- package/dist/authorization/groups/index.js.map +1 -1
- package/dist/authorization/groups/loader.d.ts +25 -4
- package/dist/authorization/groups/loader.d.ts.map +1 -1
- package/dist/authorization/groups/loader.js +39 -20
- package/dist/authorization/groups/loader.js.map +1 -1
- package/dist/authorization/groups/schema.d.ts +8 -7
- package/dist/authorization/groups/schema.d.ts.map +1 -1
- package/dist/authorization/groups/schema.js +8 -4
- package/dist/authorization/groups/schema.js.map +1 -1
- package/dist/authorization/index.d.ts +4 -3
- package/dist/authorization/index.d.ts.map +1 -1
- package/dist/authorization/index.js +6 -3
- package/dist/authorization/index.js.map +1 -1
- package/dist/authorization/path.d.ts +8 -0
- package/dist/authorization/path.d.ts.map +1 -1
- package/dist/authorization/path.js +16 -1
- package/dist/authorization/path.js.map +1 -1
- package/dist/authorization/permissions/index.d.ts +1 -1
- package/dist/authorization/permissions/index.d.ts.map +1 -1
- package/dist/authorization/permissions/index.js +1 -1
- package/dist/authorization/permissions/index.js.map +1 -1
- package/dist/authorization/permissions/loader.d.ts +18 -4
- package/dist/authorization/permissions/loader.d.ts.map +1 -1
- package/dist/authorization/permissions/loader.js +35 -24
- package/dist/authorization/permissions/loader.js.map +1 -1
- package/dist/authorization/permissions/schema.d.ts +8 -7
- package/dist/authorization/permissions/schema.d.ts.map +1 -1
- package/dist/authorization/permissions/schema.js +8 -4
- package/dist/authorization/permissions/schema.js.map +1 -1
- package/dist/authorization/settings-file-store.d.ts +127 -0
- package/dist/authorization/settings-file-store.d.ts.map +1 -0
- package/dist/authorization/settings-file-store.js +156 -0
- package/dist/authorization/settings-file-store.js.map +1 -0
- package/dist/branch-metadata.d.ts +11 -0
- package/dist/branch-metadata.d.ts.map +1 -1
- package/dist/branch-metadata.js +22 -0
- package/dist/branch-metadata.js.map +1 -1
- package/dist/cli/cli.js +245 -188
- package/dist/cli/generate-ai-content.js +18 -3
- package/dist/cli/init.js +12 -2
- package/dist/cli/migrate.d.ts.map +1 -1
- package/dist/cli/migrate.js +39 -11
- package/dist/cli/migrate.js.map +1 -1
- package/dist/config/index.d.ts +1 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js.map +1 -1
- package/dist/config/schemas/config.d.ts +55 -5
- package/dist/config/schemas/config.d.ts.map +1 -1
- package/dist/config/schemas/config.js +18 -1
- package/dist/config/schemas/config.js.map +1 -1
- package/dist/config/types.d.ts +11 -1
- package/dist/config/types.d.ts.map +1 -1
- package/dist/context.d.ts +3 -0
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +25 -3
- package/dist/context.js.map +1 -1
- package/dist/editor/BranchManager.d.ts +3 -0
- package/dist/editor/BranchManager.d.ts.map +1 -1
- package/dist/editor/BranchManager.js +18 -5
- package/dist/editor/BranchManager.js.map +1 -1
- package/dist/editor/hooks/useBranchManager.d.ts +3 -1
- package/dist/editor/hooks/useBranchManager.d.ts.map +1 -1
- package/dist/editor/hooks/useBranchManager.js +2 -0
- package/dist/editor/hooks/useBranchManager.js.map +1 -1
- package/dist/editor/hooks/useGroupManager.d.ts.map +1 -1
- package/dist/editor/hooks/useGroupManager.js +13 -2
- package/dist/editor/hooks/useGroupManager.js.map +1 -1
- package/dist/editor/hooks/usePermissionManager.d.ts.map +1 -1
- package/dist/editor/hooks/usePermissionManager.js +13 -2
- package/dist/editor/hooks/usePermissionManager.js.map +1 -1
- package/dist/git-manager.d.ts.map +1 -1
- package/dist/git-manager.js +6 -0
- package/dist/git-manager.js.map +1 -1
- package/dist/schema/schema-store.d.ts +98 -0
- package/dist/schema/schema-store.d.ts.map +1 -1
- package/dist/schema/schema-store.js +187 -29
- package/dist/schema/schema-store.js.map +1 -1
- package/dist/types.d.ts +13 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/worker/cms-worker.d.ts +36 -0
- package/dist/worker/cms-worker.d.ts.map +1 -1
- package/dist/worker/cms-worker.js +218 -8
- package/dist/worker/cms-worker.js.map +1 -1
- package/package.json +1 -1
package/dist/api/permissions.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import {
|
|
2
|
+
import { loadPermissionsFile, mutatePermissionsFile, SettingsVersionConflictError, SettingsFileConflictError, } from '../authorization/index.js';
|
|
3
3
|
import { permissionPathSchema } from './validators.js';
|
|
4
4
|
import { MAX_ENTRIES_PER_PAGE } from './entries-constants.js';
|
|
5
5
|
import { defineEndpoint } from './route-builder.js';
|
|
@@ -43,11 +43,11 @@ const getPermissionsHandler = async (_gc, ctx, _req) => {
|
|
|
43
43
|
return { ok: false, status: result.status, error: result.error };
|
|
44
44
|
}
|
|
45
45
|
const { context, mode } = result;
|
|
46
|
-
const
|
|
46
|
+
const file = await loadPermissionsFile(context.branchRoot, mode);
|
|
47
47
|
return {
|
|
48
48
|
ok: true,
|
|
49
49
|
status: 200,
|
|
50
|
-
data: { permissions },
|
|
50
|
+
data: { permissions: file?.pathPermissions ?? [], version: file?.version ?? 0 },
|
|
51
51
|
};
|
|
52
52
|
}
|
|
53
53
|
catch (error) {
|
|
@@ -71,23 +71,20 @@ const updatePermissionsHandler = async (_gc, ctx, req, body) => {
|
|
|
71
71
|
return { ok: false, status: result.status, error: result.error };
|
|
72
72
|
}
|
|
73
73
|
const { context, mode } = result;
|
|
74
|
-
// Load
|
|
75
|
-
|
|
76
|
-
//
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
if (
|
|
80
|
-
|
|
81
|
-
ok: false,
|
|
82
|
-
status: 409,
|
|
83
|
-
error: 'Permissions were modified by another user. Please reload and try again.',
|
|
84
|
-
};
|
|
74
|
+
// Load -> compare -> write happens atomically under the cross-host
|
|
75
|
+
// layered lock (see authorization/settings-file-store.ts) — no separate
|
|
76
|
+
// pre-read here, so there's no TOCTOU window between the version check
|
|
77
|
+
// and the write.
|
|
78
|
+
await mutatePermissionsFile(context.branchRoot, mode, (_current, version) => {
|
|
79
|
+
if (body.expectedContentVersion !== undefined && body.expectedContentVersion !== version) {
|
|
80
|
+
throw new SettingsVersionConflictError('Permissions were modified by another user. Please reload and try again.');
|
|
85
81
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
82
|
+
return {
|
|
83
|
+
updatedAt: new Date().toISOString(),
|
|
84
|
+
updatedBy: req.user.userId,
|
|
85
|
+
pathPermissions: body.permissions,
|
|
86
|
+
};
|
|
87
|
+
});
|
|
91
88
|
// Commit and push (mode-aware). A push failure means the change is saved
|
|
92
89
|
// to the branch working tree but NOT durably persisted (API-H1) - surface
|
|
93
90
|
// that to the client instead of reporting a bare 200.
|
|
@@ -108,6 +105,12 @@ const updatePermissionsHandler = async (_gc, ctx, req, body) => {
|
|
|
108
105
|
return { ok: true, status: 200, data: {} };
|
|
109
106
|
}
|
|
110
107
|
catch (error) {
|
|
108
|
+
if (error instanceof SettingsVersionConflictError) {
|
|
109
|
+
return { ok: false, status: 409, error: error.message };
|
|
110
|
+
}
|
|
111
|
+
if (error instanceof SettingsFileConflictError) {
|
|
112
|
+
return { ok: false, status: 409, error: 'Settings are busy, please try again.' };
|
|
113
|
+
}
|
|
111
114
|
return {
|
|
112
115
|
ok: false,
|
|
113
116
|
status: 500,
|
|
@@ -191,7 +194,7 @@ const getPermissions = defineEndpoint({
|
|
|
191
194
|
path: '/permissions',
|
|
192
195
|
responseType: 'PermissionsResponse',
|
|
193
196
|
response: {},
|
|
194
|
-
defaultMockData: { permissions: [] },
|
|
197
|
+
defaultMockData: { permissions: [], version: 0 },
|
|
195
198
|
guards: ['admin'],
|
|
196
199
|
handler: getPermissionsHandler,
|
|
197
200
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/api/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAKvB,OAAO,
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/api/permissions.ts"],"names":[],"mappings":"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"}
|
package/dist/api/schema.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/api/schema.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,OAAO,KAAK,EAA0B,WAAW,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/api/schema.ts"],"names":[],"mappings":"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"}
|
package/dist/api/schema.js
CHANGED
|
@@ -14,7 +14,7 @@ import path from 'node:path';
|
|
|
14
14
|
import { defineEndpoint } from './route-builder.js';
|
|
15
15
|
import { getErrorMessage, sanitizeErrorMessage } from '../utils/error.js';
|
|
16
16
|
import { branchNameSchema, logicalPathSchema } from './validators.js';
|
|
17
|
-
import { SchemaOps, createCollectionInputSchema, updateCollectionInputSchema, entryTypeInputSchema, updateEntryTypeInputSchema, } from '../schema/schema-store.js';
|
|
17
|
+
import { SchemaOps, SchemaStoreBusyError, createCollectionInputSchema, updateCollectionInputSchema, entryTypeInputSchema, updateEntryTypeInputSchema, } from '../schema/schema-store.js';
|
|
18
18
|
import { parseLogicalPath } from '../paths/index.js';
|
|
19
19
|
/** Strip `resolvedSchema` (type-inference-only) from fields before sending over the wire. */
|
|
20
20
|
function stripResolvedSchema(registry) {
|
|
@@ -262,6 +262,9 @@ const createCollectionHandler = async (_gc, ctx, req, params, body) => {
|
|
|
262
262
|
};
|
|
263
263
|
}
|
|
264
264
|
catch (err) {
|
|
265
|
+
if (err instanceof SchemaStoreBusyError) {
|
|
266
|
+
return { ok: false, status: 409, error: err.message };
|
|
267
|
+
}
|
|
265
268
|
return {
|
|
266
269
|
ok: false,
|
|
267
270
|
status: 400,
|
|
@@ -292,6 +295,9 @@ const updateCollectionHandler = async (_gc, ctx, req, params, body) => {
|
|
|
292
295
|
};
|
|
293
296
|
}
|
|
294
297
|
catch (err) {
|
|
298
|
+
if (err instanceof SchemaStoreBusyError) {
|
|
299
|
+
return { ok: false, status: 409, error: err.message };
|
|
300
|
+
}
|
|
295
301
|
return {
|
|
296
302
|
ok: false,
|
|
297
303
|
status: 400,
|
|
@@ -322,6 +328,9 @@ const deleteCollectionHandler = async (_gc, ctx, req, params) => {
|
|
|
322
328
|
};
|
|
323
329
|
}
|
|
324
330
|
catch (err) {
|
|
331
|
+
if (err instanceof SchemaStoreBusyError) {
|
|
332
|
+
return { ok: false, status: 409, error: err.message };
|
|
333
|
+
}
|
|
325
334
|
return {
|
|
326
335
|
ok: false,
|
|
327
336
|
status: 400,
|
|
@@ -352,6 +361,9 @@ const addEntryTypeHandler = async (_gc, ctx, req, params, body) => {
|
|
|
352
361
|
};
|
|
353
362
|
}
|
|
354
363
|
catch (err) {
|
|
364
|
+
if (err instanceof SchemaStoreBusyError) {
|
|
365
|
+
return { ok: false, status: 409, error: err.message };
|
|
366
|
+
}
|
|
355
367
|
return {
|
|
356
368
|
ok: false,
|
|
357
369
|
status: 400,
|
|
@@ -373,20 +385,13 @@ const updateEntryTypeHandler = async (_gc, ctx, req, params, body) => {
|
|
|
373
385
|
return { ok: false, status: 400, error: decodedPath.error };
|
|
374
386
|
}
|
|
375
387
|
const collectionPath = decodedPath.path;
|
|
376
|
-
//
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
return {
|
|
384
|
-
ok: false,
|
|
385
|
-
status: 400,
|
|
386
|
-
error: `Cannot modify schema or format for entry type with existing ${entryWord}. ${usageCount} ${entryWord} currently use this type.`,
|
|
387
|
-
};
|
|
388
|
-
}
|
|
389
|
-
}
|
|
388
|
+
// Note: the breaking-change usage guard (blocking format/schema changes
|
|
389
|
+
// while entries still use this type) used to live here, checked BEFORE
|
|
390
|
+
// calling the store. It moved into SchemaOps.updateEntryType itself so the
|
|
391
|
+
// usage count is read under the same schema lock that guards the write —
|
|
392
|
+
// otherwise a concurrent write could land a new entry between this
|
|
393
|
+
// handler's count and its call to the store (TOCTOU). See
|
|
394
|
+
// schema-store.ts's updateEntryTypeInner.
|
|
390
395
|
try {
|
|
391
396
|
await storeResult.store.updateEntryType(collectionPath, params.entryTypeName, body);
|
|
392
397
|
return {
|
|
@@ -396,6 +401,9 @@ const updateEntryTypeHandler = async (_gc, ctx, req, params, body) => {
|
|
|
396
401
|
};
|
|
397
402
|
}
|
|
398
403
|
catch (err) {
|
|
404
|
+
if (err instanceof SchemaStoreBusyError) {
|
|
405
|
+
return { ok: false, status: 409, error: err.message };
|
|
406
|
+
}
|
|
399
407
|
return {
|
|
400
408
|
ok: false,
|
|
401
409
|
status: 400,
|
|
@@ -426,6 +434,9 @@ const removeEntryTypeHandler = async (_gc, ctx, req, params) => {
|
|
|
426
434
|
};
|
|
427
435
|
}
|
|
428
436
|
catch (err) {
|
|
437
|
+
if (err instanceof SchemaStoreBusyError) {
|
|
438
|
+
return { ok: false, status: 409, error: err.message };
|
|
439
|
+
}
|
|
429
440
|
return {
|
|
430
441
|
ok: false,
|
|
431
442
|
status: 400,
|
|
@@ -456,6 +467,9 @@ const updateOrderHandler = async (_gc, ctx, req, params, body) => {
|
|
|
456
467
|
};
|
|
457
468
|
}
|
|
458
469
|
catch (err) {
|
|
470
|
+
if (err instanceof SchemaStoreBusyError) {
|
|
471
|
+
return { ok: false, status: 409, error: err.message };
|
|
472
|
+
}
|
|
459
473
|
return {
|
|
460
474
|
ok: false,
|
|
461
475
|
status: 400,
|
package/dist/api/schema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/api/schema.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/api/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
* Groups module exports
|
|
3
3
|
*/
|
|
4
4
|
export { GroupsFileSchema, createDefaultGroupsFile, type GroupsFile, type InternalGroup, } from './schema';
|
|
5
|
-
export { loadGroupsFile, loadInternalGroups,
|
|
5
|
+
export { loadGroupsFile, loadInternalGroups, deriveInternalGroups, mutateGroupsFile, } from './loader';
|
|
6
6
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/authorization/groups/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,KAAK,UAAU,EACf,KAAK,aAAa,GACnB,MAAM,UAAU,CAAA;AACjB,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/authorization/groups/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,KAAK,UAAU,EACf,KAAK,aAAa,GACnB,MAAM,UAAU,CAAA;AACjB,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,UAAU,CAAA"}
|
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
* Groups module exports
|
|
3
3
|
*/
|
|
4
4
|
export { GroupsFileSchema, createDefaultGroupsFile, } from './schema.js';
|
|
5
|
-
export { loadGroupsFile, loadInternalGroups,
|
|
5
|
+
export { loadGroupsFile, loadInternalGroups, deriveInternalGroups, mutateGroupsFile, } from './loader.js';
|
|
6
6
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/authorization/groups/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,gBAAgB,EAChB,uBAAuB,GAGxB,MAAM,UAAU,CAAA;AACjB,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/authorization/groups/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,gBAAgB,EAChB,uBAAuB,GAGxB,MAAM,UAAU,CAAA;AACjB,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,UAAU,CAAA"}
|
|
@@ -1,16 +1,27 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Groups file loader
|
|
3
3
|
*
|
|
4
|
-
* Handles loading
|
|
4
|
+
* Handles loading internal groups from the filesystem and mutating
|
|
5
|
+
* groups.json under the cross-host layered lock in
|
|
6
|
+
* authorization/settings-file-store.ts.
|
|
5
7
|
*/
|
|
6
|
-
import type { CanopyUserId } from '../../types';
|
|
7
8
|
import { type InternalGroup, type GroupsFile } from './schema';
|
|
8
9
|
import type { OperatingMode } from '../../operating-mode';
|
|
10
|
+
import type { OccWriteResult } from '../../utils/occ-json-write';
|
|
9
11
|
/**
|
|
10
12
|
* Load full groups file (for version checking)
|
|
11
13
|
* Returns null if file doesn't exist.
|
|
12
14
|
*/
|
|
13
15
|
export declare function loadGroupsFile(branchRoot: string, mode: OperatingMode): Promise<GroupsFile | null>;
|
|
16
|
+
/**
|
|
17
|
+
* Derive the effective internal groups list from the raw groups array
|
|
18
|
+
* stored on disk: ensures the reserved Admins/Reviewers groups always exist
|
|
19
|
+
* (synthesizing defaults when absent) and merges bootstrap admin IDs into
|
|
20
|
+
* Admins. Pure — no disk I/O — so a caller that already holds a freshly
|
|
21
|
+
* loaded file (e.g. a settings-file mutator, which reloads on every retry
|
|
22
|
+
* attempt) can reconcile against it without a second read.
|
|
23
|
+
*/
|
|
24
|
+
export declare function deriveInternalGroups(fileGroups: InternalGroup[], bootstrapAdminIds?: Set<string>): InternalGroup[];
|
|
14
25
|
/**
|
|
15
26
|
* Load internal groups from .canopycms/groups.json (or .local.json in dev mode)
|
|
16
27
|
* Ensures Admins and Reviewers groups always exist, adding them dynamically if not present.
|
|
@@ -18,7 +29,17 @@ export declare function loadGroupsFile(branchRoot: string, mode: OperatingMode):
|
|
|
18
29
|
*/
|
|
19
30
|
export declare function loadInternalGroups(branchRoot: string, mode: OperatingMode, bootstrapAdminIds?: Set<string>): Promise<InternalGroup[]>;
|
|
20
31
|
/**
|
|
21
|
-
*
|
|
32
|
+
* Mutate groups.json (or .local.json in dev mode) under the full cross-host
|
|
33
|
+
* lock + OCC-retry stack (see authorization/settings-file-store.ts).
|
|
34
|
+
* `mutate` is called with the current parsed file (`null` if it doesn't
|
|
35
|
+
* exist yet) and the version to write under; it returns the next raw
|
|
36
|
+
* payload, or `null` for a deliberate no-op. The returned payload is
|
|
37
|
+
* validated against {@link GroupsFileSchema} before being written,
|
|
38
|
+
* preserving the previous validate-before-write behavior of the old
|
|
39
|
+
* `saveInternalGroups`.
|
|
22
40
|
*/
|
|
23
|
-
export declare function
|
|
41
|
+
export declare function mutateGroupsFile(branchRoot: string, mode: OperatingMode, mutate: (current: GroupsFile | null, version: number) => Record<string, unknown> | null, options?: {
|
|
42
|
+
settleMs?: number;
|
|
43
|
+
maxAttempts?: number;
|
|
44
|
+
}): Promise<OccWriteResult | null>;
|
|
24
45
|
//# sourceMappingURL=loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/authorization/groups/loader.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/authorization/groups/loader.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAoB,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAA;AAChF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAIzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAShE;;;GAGG;AACH,wBAAsB,cAAc,CAClC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAe5B;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,aAAa,EAAE,EAC3B,iBAAiB,GAAE,GAAG,CAAC,MAAM,CAAa,GACzC,aAAa,EAAE,CAuCjB;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,aAAa,EACnB,iBAAiB,GAAE,GAAG,CAAC,MAAM,CAAa,GACzC,OAAO,CAAC,aAAa,EAAE,CAAC,CAG1B;AAED;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,EACvF,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GACpD,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAahC"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Groups file loader
|
|
3
3
|
*
|
|
4
|
-
* Handles loading
|
|
4
|
+
* Handles loading internal groups from the filesystem and mutating
|
|
5
|
+
* groups.json under the cross-host layered lock in
|
|
6
|
+
* authorization/settings-file-store.ts.
|
|
5
7
|
*/
|
|
6
8
|
import { promises as fs } from 'node:fs';
|
|
7
9
|
import { GroupsFileSchema } from './schema.js';
|
|
8
10
|
import { operatingStrategy } from '../../operating-mode/index.js';
|
|
9
11
|
import { RESERVED_GROUPS } from '../helpers.js';
|
|
10
|
-
import {
|
|
12
|
+
import { mutateSettingsJsonFile } from '../settings-file-store.js';
|
|
11
13
|
/**
|
|
12
14
|
* Get the appropriate groups file path based on mode
|
|
13
15
|
*/
|
|
@@ -35,13 +37,14 @@ export async function loadGroupsFile(branchRoot, mode) {
|
|
|
35
37
|
}
|
|
36
38
|
}
|
|
37
39
|
/**
|
|
38
|
-
*
|
|
39
|
-
*
|
|
40
|
-
*
|
|
40
|
+
* Derive the effective internal groups list from the raw groups array
|
|
41
|
+
* stored on disk: ensures the reserved Admins/Reviewers groups always exist
|
|
42
|
+
* (synthesizing defaults when absent) and merges bootstrap admin IDs into
|
|
43
|
+
* Admins. Pure — no disk I/O — so a caller that already holds a freshly
|
|
44
|
+
* loaded file (e.g. a settings-file mutator, which reloads on every retry
|
|
45
|
+
* attempt) can reconcile against it without a second read.
|
|
41
46
|
*/
|
|
42
|
-
export
|
|
43
|
-
const file = await loadGroupsFile(branchRoot, mode);
|
|
44
|
-
const fileGroups = file?.groups ?? [];
|
|
47
|
+
export function deriveInternalGroups(fileGroups, bootstrapAdminIds = new Set()) {
|
|
45
48
|
// Find existing Admins and Reviewers groups
|
|
46
49
|
let adminsGroup = fileGroups.find((g) => g.id === RESERVED_GROUPS.ADMINS);
|
|
47
50
|
let reviewersGroup = fileGroups.find((g) => g.id === RESERVED_GROUPS.REVIEWERS);
|
|
@@ -77,19 +80,35 @@ export async function loadInternalGroups(branchRoot, mode, bootstrapAdminIds = n
|
|
|
77
80
|
return [adminsGroup, reviewersGroup, ...otherGroups];
|
|
78
81
|
}
|
|
79
82
|
/**
|
|
80
|
-
*
|
|
83
|
+
* Load internal groups from .canopycms/groups.json (or .local.json in dev mode)
|
|
84
|
+
* Ensures Admins and Reviewers groups always exist, adding them dynamically if not present.
|
|
85
|
+
* If Admins group exists in file, merges with bootstrap admin IDs.
|
|
86
|
+
*/
|
|
87
|
+
export async function loadInternalGroups(branchRoot, mode, bootstrapAdminIds = new Set()) {
|
|
88
|
+
const file = await loadGroupsFile(branchRoot, mode);
|
|
89
|
+
return deriveInternalGroups(file?.groups ?? [], bootstrapAdminIds);
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* Mutate groups.json (or .local.json in dev mode) under the full cross-host
|
|
93
|
+
* lock + OCC-retry stack (see authorization/settings-file-store.ts).
|
|
94
|
+
* `mutate` is called with the current parsed file (`null` if it doesn't
|
|
95
|
+
* exist yet) and the version to write under; it returns the next raw
|
|
96
|
+
* payload, or `null` for a deliberate no-op. The returned payload is
|
|
97
|
+
* validated against {@link GroupsFileSchema} before being written,
|
|
98
|
+
* preserving the previous validate-before-write behavior of the old
|
|
99
|
+
* `saveInternalGroups`.
|
|
81
100
|
*/
|
|
82
|
-
export async function
|
|
101
|
+
export async function mutateGroupsFile(branchRoot, mode, mutate, options) {
|
|
83
102
|
const groupsPath = getGroupsFilePath(branchRoot, mode);
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
103
|
+
return mutateSettingsJsonFile({
|
|
104
|
+
filePath: groupsPath,
|
|
105
|
+
parse: (raw) => GroupsFileSchema.parse(JSON.parse(raw)),
|
|
106
|
+
mutate: (current, version) => {
|
|
107
|
+
const payload = mutate(current, version);
|
|
108
|
+
return payload === null ? null : GroupsFileSchema.parse(payload);
|
|
109
|
+
},
|
|
110
|
+
settleMs: options?.settleMs,
|
|
111
|
+
maxAttempts: options?.maxAttempts,
|
|
112
|
+
});
|
|
94
113
|
}
|
|
95
114
|
//# sourceMappingURL=loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/authorization/groups/loader.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/authorization/groups/loader.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAuC,MAAM,UAAU,CAAA;AAEhF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAG/D;;GAEG;AACH,SAAS,iBAAiB,CAAC,UAAkB,EAAE,IAAmB;IAChE,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAA;AAC9D,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,UAAkB,EAClB,IAAmB;IAEnB,MAAM,UAAU,GAAG,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IAEtD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QACtD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAClC,MAAM,SAAS,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAChD,OAAO,SAAS,CAAA;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,qBAAqB;QACrB,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACvD,OAAO,IAAI,CAAA;QACb,CAAC;QACD,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAClC,UAA2B,EAC3B,oBAAiC,IAAI,GAAG,EAAE;IAE1C,4CAA4C;IAC5C,IAAI,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,eAAe,CAAC,MAAM,CAAC,CAAA;IACzE,IAAI,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,eAAe,CAAC,SAAS,CAAC,CAAA;IAE/E,2DAA2D;IAC3D,IAAI,WAAW,EAAE,CAAC;QAChB,kDAAkD;QAClD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,OAAO,EAAE,GAAG,iBAAiB,CAAC,CAAC,CAAA;QACzE,WAAW,GAAG;YACZ,GAAG,WAAW;YACd,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;SAC/B,CAAA;IACH,CAAC;SAAM,CAAC;QACN,4CAA4C;QAC5C,WAAW,GAAG;YACZ,EAAE,EAAE,eAAe,CAAC,MAAM;YAC1B,IAAI,EAAE,eAAe,CAAC,MAAM;YAC5B,WAAW,EAAE,mCAAmC;YAChD,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC;SACvC,CAAA;IACH,CAAC;IAED,gCAAgC;IAChC,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,cAAc,GAAG;YACf,EAAE,EAAE,eAAe,CAAC,SAAS;YAC7B,IAAI,EAAE,eAAe,CAAC,SAAS;YAC/B,WAAW,EAAE,mDAAmD;YAChE,OAAO,EAAE,EAAE;SACZ,CAAA;IACH,CAAC;IAED,8DAA8D;IAC9D,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,eAAe,CAAC,MAAM,IAAI,CAAC,CAAC,EAAE,KAAK,eAAe,CAAC,SAAS,CAC7E,CAAA;IAED,OAAO,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC,CAAA;AACtD,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,UAAkB,EAClB,IAAmB,EACnB,oBAAiC,IAAI,GAAG,EAAE;IAE1C,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IACnD,OAAO,oBAAoB,CAAC,IAAI,EAAE,MAAM,IAAI,EAAE,EAAE,iBAAiB,CAAC,CAAA;AACpE,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,UAAkB,EAClB,IAAmB,EACnB,MAAuF,EACvF,OAAqD;IAErD,MAAM,UAAU,GAAG,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IAEtD,OAAO,sBAAsB,CAAa;QACxC,QAAQ,EAAE,UAAU;QACpB,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvD,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;YAC3B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACxC,OAAO,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAClE,CAAC;QACD,QAAQ,EAAE,OAAO,EAAE,QAAQ;QAC3B,WAAW,EAAE,OAAO,EAAE,WAAW;KAClC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -7,8 +7,8 @@ import type { CanopyUserId, CanopyGroupId } from '../../types';
|
|
|
7
7
|
* Schema for .canopycms/groups.json
|
|
8
8
|
*/
|
|
9
9
|
export declare const GroupsFileSchema: z.ZodObject<{
|
|
10
|
-
version: z.
|
|
11
|
-
|
|
10
|
+
version: z.ZodOptional<z.ZodNumber>;
|
|
11
|
+
writeId: z.ZodOptional<z.ZodString>;
|
|
12
12
|
updatedAt: z.ZodString;
|
|
13
13
|
updatedBy: z.ZodType<CanopyUserId>;
|
|
14
14
|
groups: z.ZodArray<z.ZodObject<{
|
|
@@ -28,7 +28,6 @@ export declare const GroupsFileSchema: z.ZodObject<{
|
|
|
28
28
|
description?: string | undefined;
|
|
29
29
|
}>, "many">;
|
|
30
30
|
}, "strip", z.ZodTypeAny, {
|
|
31
|
-
version: 1;
|
|
32
31
|
updatedAt: string;
|
|
33
32
|
groups: {
|
|
34
33
|
name: string;
|
|
@@ -37,9 +36,9 @@ export declare const GroupsFileSchema: z.ZodObject<{
|
|
|
37
36
|
description?: string | undefined;
|
|
38
37
|
}[];
|
|
39
38
|
updatedBy: string;
|
|
40
|
-
|
|
39
|
+
version?: number | undefined;
|
|
40
|
+
writeId?: string | undefined;
|
|
41
41
|
}, {
|
|
42
|
-
version: 1;
|
|
43
42
|
updatedAt: string;
|
|
44
43
|
groups: {
|
|
45
44
|
name: string;
|
|
@@ -48,7 +47,8 @@ export declare const GroupsFileSchema: z.ZodObject<{
|
|
|
48
47
|
description?: string | undefined;
|
|
49
48
|
}[];
|
|
50
49
|
updatedBy: string;
|
|
51
|
-
|
|
50
|
+
version?: number | undefined;
|
|
51
|
+
writeId?: string | undefined;
|
|
52
52
|
}>;
|
|
53
53
|
export type GroupsFile = z.infer<typeof GroupsFileSchema>;
|
|
54
54
|
/**
|
|
@@ -61,7 +61,8 @@ export interface InternalGroup {
|
|
|
61
61
|
members: CanopyUserId[];
|
|
62
62
|
}
|
|
63
63
|
/**
|
|
64
|
-
* Default groups file
|
|
64
|
+
* Default groups file. Omits `version`/`writeId` — the writer
|
|
65
|
+
* (mutateSettingsJsonFile via writeOccJsonFile) manages those.
|
|
65
66
|
*/
|
|
66
67
|
export declare function createDefaultGroupsFile(userId: CanopyUserId): GroupsFile;
|
|
67
68
|
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/authorization/groups/schema.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE9D;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/authorization/groups/schema.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE9D;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;eAQF,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;;YAG1B,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAM9C,CAAA;AAEF,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAEzD;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,aAAa,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,YAAY,EAAE,CAAA;CACxB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU,CAMxE"}
|
|
@@ -6,8 +6,12 @@ import { z } from 'zod';
|
|
|
6
6
|
* Schema for .canopycms/groups.json
|
|
7
7
|
*/
|
|
8
8
|
export const GroupsFileSchema = z.object({
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
// Managed by writeOccJsonFile (see authorization/settings-file-store.ts) —
|
|
10
|
+
// the single OCC counter for this file. Optional so a hand-written file
|
|
11
|
+
// with no version field parses as version 0. A legacy `contentVersion`
|
|
12
|
+
// field (if present) is silently stripped by this non-strict zod parse.
|
|
13
|
+
version: z.number().int().nonnegative().optional(),
|
|
14
|
+
writeId: z.string().optional(),
|
|
11
15
|
updatedAt: z.string().datetime(),
|
|
12
16
|
updatedBy: z.string(),
|
|
13
17
|
groups: z.array(z.object({
|
|
@@ -18,11 +22,11 @@ export const GroupsFileSchema = z.object({
|
|
|
18
22
|
})),
|
|
19
23
|
});
|
|
20
24
|
/**
|
|
21
|
-
* Default groups file
|
|
25
|
+
* Default groups file. Omits `version`/`writeId` — the writer
|
|
26
|
+
* (mutateSettingsJsonFile via writeOccJsonFile) manages those.
|
|
22
27
|
*/
|
|
23
28
|
export function createDefaultGroupsFile(userId) {
|
|
24
29
|
return {
|
|
25
|
-
version: 1,
|
|
26
30
|
updatedAt: new Date().toISOString(),
|
|
27
31
|
updatedBy: userId,
|
|
28
32
|
groups: [],
|