@terreno/admin-backend 57.0.0 → 57.1.0

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.
Files changed (43) hide show
  1. package/README.md +3 -0
  2. package/dist/adminApp.d.ts +11 -4
  3. package/dist/adminApp.js +859 -263
  4. package/dist/adminConfigIdentity.d.ts +16 -0
  5. package/dist/adminConfigIdentity.js +100 -0
  6. package/dist/adminTextSearch.d.ts +17 -0
  7. package/dist/adminTextSearch.js +117 -0
  8. package/dist/adminUiV2.js +1 -1
  9. package/dist/aggregateAdmin.d.ts +20 -0
  10. package/dist/aggregateAdmin.js +275 -0
  11. package/dist/documentStorageApp.d.ts +3 -1
  12. package/dist/documentStorageApp.js +20 -42
  13. package/dist/filterParser.d.ts +11 -0
  14. package/dist/filterParser.js +260 -0
  15. package/dist/index.d.ts +9 -0
  16. package/dist/index.js +15 -1
  17. package/dist/legacy.d.ts +9 -0
  18. package/dist/legacy.js +61 -0
  19. package/dist/resolvedAdminModel.d.ts +23 -0
  20. package/dist/resolvedAdminModel.js +130 -0
  21. package/dist/routePath.d.ts +2 -0
  22. package/dist/routePath.js +18 -0
  23. package/package.json +4 -3
  24. package/src/adminApp.models.test.ts +894 -1
  25. package/src/adminApp.test.ts +35 -1
  26. package/src/adminApp.ts +599 -98
  27. package/src/adminConfigIdentity.test.ts +56 -0
  28. package/src/adminConfigIdentity.ts +87 -0
  29. package/src/adminTextSearch.test.ts +73 -0
  30. package/src/adminTextSearch.ts +74 -0
  31. package/src/adminUiV2.test.ts +1 -0
  32. package/src/adminUiV2.ts +1 -1
  33. package/src/aggregateAdmin.test.ts +220 -0
  34. package/src/aggregateAdmin.ts +206 -0
  35. package/src/documentStorageApp.test.ts +11 -0
  36. package/src/documentStorageApp.ts +20 -39
  37. package/src/filterParser.test.ts +68 -0
  38. package/src/filterParser.ts +229 -0
  39. package/src/index.ts +35 -0
  40. package/src/legacy.test.ts +34 -0
  41. package/src/legacy.ts +63 -0
  42. package/src/resolvedAdminModel.ts +114 -0
  43. package/src/routePath.ts +14 -0
package/dist/adminApp.js CHANGED
@@ -91,43 +91,147 @@ var api_1 = require("@terreno/api");
91
91
  var express_1 = __importDefault(require("express"));
92
92
  var luxon_1 = require("luxon");
93
93
  var mongoose_1 = __importDefault(require("mongoose"));
94
+ var adminConfigIdentity_1 = require("./adminConfigIdentity");
95
+ var adminTextSearch_1 = require("./adminTextSearch");
94
96
  var adminUiV2_1 = require("./adminUiV2");
97
+ var aggregateAdmin_1 = require("./aggregateAdmin");
98
+ var filterParser_1 = require("./filterParser");
95
99
  var scriptCli_1 = require("./scriptCli");
96
- var toPlainObject = function (value) {
97
- if (value &&
98
- typeof value === "object" &&
99
- "toObject" in value &&
100
- typeof value.toObject === "function") {
101
- return value.toObject();
102
- }
103
- return value;
104
- };
105
- var removeHiddenFields = function (value, hiddenFieldSet) {
100
+ var buildAllModelAdminsMap = function (models) {
106
101
  var e_1, _a;
107
- if (Array.isArray(value)) {
108
- return value.map(function (item) { return removeHiddenFields(item, hiddenFieldSet); });
109
- }
110
- if (!value || typeof value !== "object") {
111
- return value;
112
- }
113
- var plainValue = toPlainObject(value);
114
- var nextValue = {};
102
+ var map = {};
115
103
  try {
116
- for (var _b = __values(Object.entries(plainValue)), _c = _b.next(); !_c.done; _c = _b.next()) {
117
- var _d = __read(_c.value, 2), key = _d[0], fieldValue = _d[1];
118
- if (!hiddenFieldSet.has(key)) {
119
- nextValue[key] = fieldValue;
120
- }
104
+ for (var models_1 = __values(models), models_1_1 = models_1.next(); !models_1_1.done; models_1_1 = models_1.next()) {
105
+ var config = models_1_1.value;
106
+ map[config.model.modelName] = config.admin;
121
107
  }
122
108
  }
123
109
  catch (e_1_1) { e_1 = { error: e_1_1 }; }
124
110
  finally {
125
111
  try {
126
- if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
112
+ if (models_1_1 && !models_1_1.done && (_a = models_1.return)) _a.call(models_1);
127
113
  }
128
114
  finally { if (e_1) throw e_1.error; }
129
115
  }
130
- return nextValue;
116
+ return map;
117
+ };
118
+ var scrubAdminResponse = function (value, config, allModelAdmins) {
119
+ return (0, api_1.scrubAdminFields)(value, {
120
+ admin: config.admin,
121
+ allModelAdmins: allModelAdmins,
122
+ schema: config.model.schema,
123
+ });
124
+ };
125
+ var buildAdminListQueryFilter = function (config,
126
+ /** Resolved (possibly derived) search fields from `/admin/config`, not just explicit config. */
127
+ resolvedSearchFields) {
128
+ var _a;
129
+ var base = config.queryFilter;
130
+ var searchFields = (_a = resolvedSearchFields !== null && resolvedSearchFields !== void 0 ? resolvedSearchFields : config.searchFields) !== null && _a !== void 0 ? _a : [];
131
+ return function (user, query) { return __awaiter(void 0, void 0, void 0, function () {
132
+ var clientQuery, _a, consumedKeys, errors, filter, consumedKeys_1, consumedKeys_1_1, key, rawSearch, searchClause, merged, baseResult, result;
133
+ var e_2, _b, _c;
134
+ var _d;
135
+ return __generator(this, function (_e) {
136
+ switch (_e.label) {
137
+ case 0:
138
+ clientQuery = __assign({}, (query !== null && query !== void 0 ? query : {}));
139
+ _a = (0, filterParser_1.parseAdminListFilters)(clientQuery, (_d = config.filters) !== null && _d !== void 0 ? _d : []), consumedKeys = _a.consumedKeys, errors = _a.errors, filter = _a.filter;
140
+ if (Object.keys(errors).length > 0) {
141
+ throw new api_1.APIError({
142
+ detail: JSON.stringify(errors),
143
+ status: 400,
144
+ title: "Invalid filter",
145
+ });
146
+ }
147
+ try {
148
+ for (consumedKeys_1 = __values(consumedKeys), consumedKeys_1_1 = consumedKeys_1.next(); !consumedKeys_1_1.done; consumedKeys_1_1 = consumedKeys_1.next()) {
149
+ key = consumedKeys_1_1.value;
150
+ delete clientQuery[key];
151
+ }
152
+ }
153
+ catch (e_2_1) { e_2 = { error: e_2_1 }; }
154
+ finally {
155
+ try {
156
+ if (consumedKeys_1_1 && !consumedKeys_1_1.done && (_b = consumedKeys_1.return)) _b.call(consumedKeys_1);
157
+ }
158
+ finally { if (e_2) throw e_2.error; }
159
+ }
160
+ rawSearch = clientQuery[adminTextSearch_1.ADMIN_LIST_SEARCH_PARAM];
161
+ delete clientQuery[adminTextSearch_1.ADMIN_LIST_SEARCH_PARAM];
162
+ searchClause = typeof rawSearch === "string"
163
+ ? (0, adminTextSearch_1.buildAdminPartialSearchFilter)({
164
+ model: config.model,
165
+ q: rawSearch,
166
+ searchFields: searchFields,
167
+ })
168
+ : undefined;
169
+ merged = __assign(__assign({}, clientQuery), filter);
170
+ if (!base) return [3 /*break*/, 2];
171
+ return [4 /*yield*/, base(user, merged)];
172
+ case 1:
173
+ baseResult = _e.sent();
174
+ if (baseResult === null) {
175
+ return [2 /*return*/, null];
176
+ }
177
+ merged = __assign(__assign({}, merged), baseResult);
178
+ _e.label = 2;
179
+ case 2:
180
+ result = (0, adminTextSearch_1.andMongoFilters)(merged, searchClause);
181
+ return [2 /*return*/, __assign(__assign({}, result), (_c = {}, _c[adminTextSearch_1.ADMIN_LIST_SEARCH_PARAM] = undefined, _c))];
182
+ }
183
+ });
184
+ }); };
185
+ };
186
+ var ADMIN_TIMESTAMP_SORT_FIELDS = ["created", "createdAt", "updated", "updatedAt"];
187
+ var sortTokensToFields = function (sort) {
188
+ if (!sort) {
189
+ return [];
190
+ }
191
+ var raw = Array.isArray(sort) ? sort.join(" ") : sort;
192
+ return raw
193
+ .trim()
194
+ .split(/\s+/)
195
+ .map(function (token) { return token.replace(/^-/, ""); })
196
+ .filter(function (field) { return field.length > 0; });
197
+ };
198
+ var resolveAdminSortableFields = function (_a) {
199
+ var defaultSort = _a.defaultSort, listDisplay = _a.listDisplay, sortableFields = _a.sortableFields;
200
+ return __spreadArray([], __read(new Set(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((sortableFields !== null && sortableFields !== void 0 ? sortableFields : listDisplay)), false), [
201
+ "_id"
202
+ ], false), __read(ADMIN_TIMESTAMP_SORT_FIELDS), false), __read(sortTokensToFields(defaultSort)), false))), false);
203
+ };
204
+ var validateAdminSortParam = function (sortableFields) {
205
+ return function (req, _res, next) {
206
+ var e_3, _a;
207
+ var sort = req.query.sort;
208
+ if (typeof sort !== "string" || !sort.trim()) {
209
+ next();
210
+ return;
211
+ }
212
+ var tokens = sort.trim().split(/\s+/);
213
+ try {
214
+ for (var tokens_1 = __values(tokens), tokens_1_1 = tokens_1.next(); !tokens_1_1.done; tokens_1_1 = tokens_1.next()) {
215
+ var token = tokens_1_1.value;
216
+ var field = token.replace(/^-/, "");
217
+ if (!sortableFields.includes(field)) {
218
+ throw new api_1.APIError({
219
+ detail: field,
220
+ status: 400,
221
+ title: "Invalid sort field",
222
+ });
223
+ }
224
+ }
225
+ }
226
+ catch (e_3_1) { e_3 = { error: e_3_1 }; }
227
+ finally {
228
+ try {
229
+ if (tokens_1_1 && !tokens_1_1.done && (_a = tokens_1.return)) _a.call(tokens_1);
230
+ }
231
+ finally { if (e_3) throw e_3.error; }
232
+ }
233
+ next();
234
+ };
131
235
  };
132
236
  var auditDocumentToPlain = function (value) {
133
237
  if (value &&
@@ -139,7 +243,7 @@ var auditDocumentToPlain = function (value) {
139
243
  return value;
140
244
  };
141
245
  var auditLabelFromListFields = function (doc, listFields) {
142
- var e_2, _a;
246
+ var e_4, _a;
143
247
  try {
144
248
  for (var listFields_1 = __values(listFields), listFields_1_1 = listFields_1.next(); !listFields_1_1.done; listFields_1_1 = listFields_1.next()) {
145
249
  var key = listFields_1_1.value;
@@ -150,16 +254,31 @@ var auditLabelFromListFields = function (doc, listFields) {
150
254
  return String(fieldValue);
151
255
  }
152
256
  }
153
- catch (e_2_1) { e_2 = { error: e_2_1 }; }
257
+ catch (e_4_1) { e_4 = { error: e_4_1 }; }
154
258
  finally {
155
259
  try {
156
260
  if (listFields_1_1 && !listFields_1_1.done && (_a = listFields_1.return)) _a.call(listFields_1);
157
261
  }
158
- finally { if (e_2) throw e_2.error; }
262
+ finally { if (e_4) throw e_4.error; }
159
263
  }
160
264
  var id = doc._id;
161
265
  return id != null ? String(id) : undefined;
162
266
  };
267
+ var coerceAdminFlag = function (value) {
268
+ if (value === true || value === 1 || value === "1" || value === "true" || value === "yes") {
269
+ return true;
270
+ }
271
+ if (value === false ||
272
+ value === 0 ||
273
+ value === "0" ||
274
+ value === "false" ||
275
+ value === "no" ||
276
+ value === "" ||
277
+ value == null) {
278
+ return false;
279
+ }
280
+ throw new api_1.APIError({ status: 400, title: "admin must be a boolean" });
281
+ };
163
282
  var auditActorId = function (request) {
164
283
  var user = request.user;
165
284
  if (!user || user._id == null) {
@@ -176,7 +295,7 @@ var getArrayEmbeddedSchemaType = function (schemaPath) {
176
295
  };
177
296
  exports.getArrayEmbeddedSchemaType = getArrayEmbeddedSchemaType;
178
297
  var extractFieldMeta = function (properties, required) {
179
- var e_3, _a;
298
+ var e_5, _a;
180
299
  var _b, _c, _d;
181
300
  var fields = {};
182
301
  try {
@@ -213,12 +332,12 @@ var extractFieldMeta = function (properties, required) {
213
332
  }
214
333
  }
215
334
  }
216
- catch (e_3_1) { e_3 = { error: e_3_1 }; }
335
+ catch (e_5_1) { e_5 = { error: e_5_1 }; }
217
336
  finally {
218
337
  try {
219
338
  if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
220
339
  }
221
- finally { if (e_3) throw e_3.error; }
340
+ finally { if (e_5) throw e_5.error; }
222
341
  }
223
342
  return fields;
224
343
  };
@@ -282,6 +401,66 @@ var AdminApp = /** @class */ (function () {
282
401
  function AdminApp(options) {
283
402
  this.options = options;
284
403
  }
404
+ AdminApp.prototype.adminAccessPermissions = function () {
405
+ if (this.options.accessControl) {
406
+ return [this.options.accessControl.permission({ admin: ["access"] })];
407
+ }
408
+ return [api_1.Permissions.IsAdmin];
409
+ };
410
+ AdminApp.prototype.hasScriptPermission = function (user, action) {
411
+ return __awaiter(this, void 0, void 0, function () {
412
+ var result;
413
+ return __generator(this, function (_a) {
414
+ switch (_a.label) {
415
+ case 0:
416
+ if (!this.options.accessControl) {
417
+ return [2 /*return*/, Boolean(user === null || user === void 0 ? void 0 : user.admin)];
418
+ }
419
+ return [4 /*yield*/, this.options.accessControl.can({
420
+ permissions: { admin: [action] },
421
+ user: user,
422
+ })];
423
+ case 1:
424
+ result = _a.sent();
425
+ return [2 /*return*/, result.allowed];
426
+ }
427
+ });
428
+ });
429
+ };
430
+ AdminApp.prototype.hasConfigurationPermission = function (user, action) {
431
+ return __awaiter(this, void 0, void 0, function () {
432
+ var result;
433
+ return __generator(this, function (_a) {
434
+ switch (_a.label) {
435
+ case 0:
436
+ if (!this.options.accessControl) {
437
+ return [2 /*return*/, Boolean(user === null || user === void 0 ? void 0 : user.admin)];
438
+ }
439
+ return [4 /*yield*/, this.options.accessControl.can({
440
+ permissions: { configuration: [action] },
441
+ user: user,
442
+ })];
443
+ case 1:
444
+ result = _a.sent();
445
+ return [2 /*return*/, result.allowed];
446
+ }
447
+ });
448
+ });
449
+ };
450
+ AdminApp.prototype.resourceActionPermissions = function (modelName, action) {
451
+ var _a;
452
+ var shell = this.adminAccessPermissions();
453
+ var accessControl = this.options.accessControl;
454
+ if (!accessControl) {
455
+ return shell;
456
+ }
457
+ var resource = "".concat(modelName.charAt(0).toLowerCase()).concat(modelName.slice(1));
458
+ var knownActions = accessControl.statements[resource];
459
+ if (!knownActions) {
460
+ return [];
461
+ }
462
+ return __spreadArray(__spreadArray([], __read(shell), false), [accessControl.permission((_a = {}, _a[resource] = [action], _a))], false);
463
+ };
285
464
  /**
286
465
  * Register admin routes with the Express application.
287
466
  *
@@ -298,13 +477,18 @@ var AdminApp = /** @class */ (function () {
298
477
  *
299
478
  * @param app - The Express application instance to register with
300
479
  */
301
- AdminApp.prototype.register = function (app, openApi) {
302
- var e_4, _a, e_5, _b;
480
+ AdminApp.prototype.register = function (app, openApi, terrenoApp) {
481
+ var e_6, _a, e_7, _b;
303
482
  var _this = this;
304
- var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
483
+ var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
305
484
  var basePath = (_c = this.options.basePath) !== null && _c !== void 0 ? _c : "/admin";
306
485
  var openApiMw = openApi;
307
- var modelConfigs = this.options.models;
486
+ var aggregated = (0, aggregateAdmin_1.aggregateFromTerrenoApp)({
487
+ legacyModels: (_d = this.options.models) !== null && _d !== void 0 ? _d : [],
488
+ terrenoApp: terrenoApp,
489
+ });
490
+ var modelConfigs = aggregated.models;
491
+ var allModelAdmins = buildAllModelAdminsMap(modelConfigs);
308
492
  var onAdminAudit = this.options.onAdminAudit;
309
493
  /** Audit is best-effort: failures must not change HTTP outcomes after mutations succeed. */
310
494
  var safeOnAdminAudit = function (request, event) { return __awaiter(_this, void 0, void 0, function () {
@@ -332,8 +516,13 @@ var AdminApp = /** @class */ (function () {
332
516
  });
333
517
  }); };
334
518
  // Build config response with field metadata from Mongoose schemas
335
- var configModels = modelConfigs.map(function (config) {
336
- var e_6, _a, e_7, _b;
519
+ var configNames = (0, adminConfigIdentity_1.assignUniqueAdminConfigNames)(modelConfigs.map(function (config) { return ({
520
+ modelName: config.model.modelName,
521
+ routePath: config.routePath,
522
+ source: config.source,
523
+ }); }));
524
+ var configModels = modelConfigs.map(function (config, configIndex) {
525
+ var e_8, _a, e_9, _b;
337
526
  var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
338
527
  var _v = (0, api_1.getOpenApiSpecForModel)(config.model), properties = _v.properties, required = _v.required;
339
528
  var hiddenFieldSet = new Set((_c = config.hiddenFields) !== null && _c !== void 0 ? _c : []);
@@ -384,12 +573,12 @@ var AdminApp = /** @class */ (function () {
384
573
  }
385
574
  }
386
575
  }
387
- catch (e_6_1) { e_6 = { error: e_6_1 }; }
576
+ catch (e_8_1) { e_8 = { error: e_8_1 }; }
388
577
  finally {
389
578
  try {
390
579
  if (_x && !_x.done && (_a = _w.return)) _a.call(_w);
391
580
  }
392
- finally { if (e_6) throw e_6.error; }
581
+ finally { if (e_8) throw e_8.error; }
393
582
  }
394
583
  // Apply field overrides (e.g., widget: "markdown")
395
584
  if (config.fieldOverrides) {
@@ -401,12 +590,12 @@ var AdminApp = /** @class */ (function () {
401
590
  }
402
591
  }
403
592
  }
404
- catch (e_7_1) { e_7 = { error: e_7_1 }; }
593
+ catch (e_9_1) { e_9 = { error: e_9_1 }; }
405
594
  finally {
406
595
  try {
407
596
  if (_0 && !_0.done && (_b = _z.return)) _b.call(_z);
408
597
  }
409
- finally { if (e_7) throw e_7.error; }
598
+ finally { if (e_9) throw e_9.error; }
410
599
  }
411
600
  }
412
601
  var readonlyFields = (_g = config.readonlyFields) !== null && _g !== void 0 ? _g : [];
@@ -414,29 +603,33 @@ var AdminApp = /** @class */ (function () {
414
603
  var listDisplay = (_h = config.listDisplay) !== null && _h !== void 0 ? _h : listFields;
415
604
  var derivedSearchFields = listFields.filter(function (field) { var _a; return (_a = fields[field]) === null || _a === void 0 ? void 0 : _a.searchable; });
416
605
  var searchFields = (_j = config.searchFields) !== null && _j !== void 0 ? _j : derivedSearchFields;
417
- var sortableFields = (_k = config.sortableFields) !== null && _k !== void 0 ? _k : __spreadArray(__spreadArray([], __read(listDisplay), false), ["_id"], false);
606
+ var sortableFields = resolveAdminSortableFields({
607
+ defaultSort: config.defaultSort,
608
+ listDisplay: listDisplay,
609
+ sortableFields: config.sortableFields,
610
+ });
418
611
  var schemaPathKeys = new Set(Object.keys(config.model.schema.paths));
419
- var bulkPatchAllowlist = (_l = config.bulkPatchAllowlist) !== null && _l !== void 0 ? _l : (0, adminUiV2_1.defaultBulkPatchAllowlistFrom)({
612
+ var bulkPatchAllowlist = (_k = config.bulkPatchAllowlist) !== null && _k !== void 0 ? _k : (0, adminUiV2_1.defaultBulkPatchAllowlistFrom)({
420
613
  hiddenFieldSet: hiddenFieldSet,
421
614
  listFields: listFields,
422
615
  readonlyFields: readonlyFields,
423
616
  schemaPaths: schemaPathKeys,
424
617
  });
425
618
  return {
426
- actions: (_m = config.actions) !== null && _m !== void 0 ? _m : [],
619
+ actions: (_l = config.actions) !== null && _l !== void 0 ? _l : [],
427
620
  bulkPatchAllowlist: bulkPatchAllowlist,
428
- defaultSort: (_o = config.defaultSort) !== null && _o !== void 0 ? _o : "-created",
621
+ defaultSort: (_m = config.defaultSort) !== null && _m !== void 0 ? _m : "-created",
429
622
  displayName: config.displayName,
430
623
  fieldOrder: config.fieldOrder,
431
624
  fields: fields,
432
625
  fieldsets: config.fieldsets,
433
- filters: (_p = config.filters) !== null && _p !== void 0 ? _p : [],
626
+ filters: (_o = config.filters) !== null && _o !== void 0 ? _o : [],
434
627
  group: config.group,
435
628
  hiddenFields: __spreadArray([], __read(hiddenFieldSet), false),
436
629
  listDisplay: listDisplay,
437
- listDisplayLinks: (_q = config.listDisplayLinks) !== null && _q !== void 0 ? _q : [],
630
+ listDisplayLinks: (_p = config.listDisplayLinks) !== null && _p !== void 0 ? _p : [],
438
631
  listFields: listFields,
439
- name: config.model.modelName,
632
+ name: (_q = configNames[configIndex]) !== null && _q !== void 0 ? _q : config.model.modelName,
440
633
  pageSize: config.pageSize,
441
634
  permissions: {
442
635
  create: ((_r = config.permissions) === null || _r === void 0 ? void 0 : _r.create) !== false,
@@ -452,7 +645,7 @@ var AdminApp = /** @class */ (function () {
452
645
  };
453
646
  });
454
647
  // Build script metadata for config response
455
- var scriptConfigs = (_d = this.options.scripts) !== null && _d !== void 0 ? _d : [];
648
+ var scriptConfigs = __spreadArray(__spreadArray([], __read(((_e = this.options.scripts) !== null && _e !== void 0 ? _e : [])), false), __read(aggregated.scripts), false);
456
649
  var configScripts = scriptConfigs.map(function (script) {
457
650
  var _a;
458
651
  return ({
@@ -462,19 +655,35 @@ var AdminApp = /** @class */ (function () {
462
655
  });
463
656
  });
464
657
  var defaultScreens = [{ displayName: "Version Config", name: "version-config" }];
465
- var mergedScreens = __spreadArray(__spreadArray([], __read(defaultScreens), false), __read(((_e = this.options.customScreens) !== null && _e !== void 0 ? _e : [])), false);
658
+ var mergedScreens = __spreadArray(__spreadArray(__spreadArray([], __read(defaultScreens), false), __read(aggregated.customScreens), false), __read(((_f = this.options.customScreens) !== null && _f !== void 0 ? _f : [])), false);
466
659
  var configResponse = {
660
+ capabilities: {
661
+ actions: true,
662
+ fieldsets: true,
663
+ filters: true,
664
+ realtime: modelConfigs.some(function (config) { return config.realtime === true; }),
665
+ },
467
666
  customScreens: mergedScreens,
468
667
  home: (0, adminUiV2_1.normalizeAdminHome)(this.options.home),
469
668
  models: configModels,
470
669
  schemaVersion: adminUiV2_1.ADMIN_SCHEMA_VERSION,
471
670
  scripts: configScripts,
671
+ widgetIds: aggregated.widgetIds,
472
672
  };
473
673
  var adminConfigOpenApi = openApiMw
474
674
  ? (0, api_1.createOpenApiBuilder)({ openApi: openApiMw })
475
675
  .withTags(["admin"])
476
676
  .withSummary("Admin panel configuration")
477
677
  .withResponse(200, {
678
+ capabilities: {
679
+ properties: {
680
+ actions: { type: "boolean" },
681
+ fieldsets: { type: "boolean" },
682
+ filters: { type: "boolean" },
683
+ realtime: { type: "boolean" },
684
+ },
685
+ type: "object",
686
+ },
478
687
  customScreens: {
479
688
  items: {
480
689
  properties: {
@@ -500,6 +709,7 @@ var AdminApp = /** @class */ (function () {
500
709
  },
501
710
  type: "array",
502
711
  },
712
+ widgetIds: { items: { type: "string" }, type: "array" },
503
713
  })
504
714
  .build()
505
715
  : undefined;
@@ -507,7 +717,7 @@ var AdminApp = /** @class */ (function () {
507
717
  app.get.apply(app, __spreadArray(__spreadArray(["".concat(basePath, "/config"), (0, api_1.authenticateMiddleware)()], __read(asMiddlewareList(adminConfigOpenApi)), false), [(0, api_1.asyncHandler)(function (req, res) { return __awaiter(_this, void 0, void 0, function () {
508
718
  return __generator(this, function (_a) {
509
719
  switch (_a.label) {
510
- case 0: return [4 /*yield*/, (0, api_1.checkPermissions)("read", [api_1.Permissions.IsAdmin], req.user)];
720
+ case 0: return [4 /*yield*/, (0, api_1.checkPermissions)("read", this.adminAccessPermissions(), req.user)];
511
721
  case 1:
512
722
  if (!(_a.sent())) {
513
723
  throw new api_1.APIError({ status: 403, title: "Admin access required" });
@@ -541,15 +751,22 @@ var AdminApp = /** @class */ (function () {
541
751
  .build()
542
752
  : undefined;
543
753
  app.post.apply(app, __spreadArray(__spreadArray(["".concat(basePath, "/background-tasks"), (0, api_1.authenticateMiddleware)()], __read(asMiddlewareList(backgroundTasksOpenApi)), false), [(0, api_1.asyncHandler)(function (req, res) { return __awaiter(_this, void 0, void 0, function () {
544
- var user, raw, now, summary, task, err_2, detail;
545
- return __generator(this, function (_a) {
546
- switch (_a.label) {
547
- case 0: return [4 /*yield*/, (0, api_1.checkPermissions)("update", [api_1.Permissions.IsAdmin], req.user)];
754
+ var actor, _a, user, raw, now, summary, task, err_2, detail;
755
+ return __generator(this, function (_b) {
756
+ switch (_b.label) {
757
+ case 0:
758
+ actor = req.user;
759
+ _a = !actor;
760
+ if (_a) return [3 /*break*/, 2];
761
+ return [4 /*yield*/, this.hasScriptPermission(actor, "runScripts")];
548
762
  case 1:
549
- if (!(_a.sent())) {
763
+ _a = !(_b.sent());
764
+ _b.label = 2;
765
+ case 2:
766
+ if (_a) {
550
767
  throw new api_1.APIError({ status: 403, title: "Admin access required" });
551
768
  }
552
- user = req.user;
769
+ user = actor;
553
770
  raw = req.body;
554
771
  if (typeof raw.kind !== "string" || !raw.kind.trim()) {
555
772
  throw new api_1.APIError({ status: 400, title: "kind is required" });
@@ -562,9 +779,9 @@ var AdminApp = /** @class */ (function () {
562
779
  : {},
563
780
  resourceRoute: typeof raw.resourceRoute === "string" ? raw.resourceRoute : undefined,
564
781
  };
565
- _a.label = 2;
566
- case 2:
567
- _a.trys.push([2, 4, , 5]);
782
+ _b.label = 3;
783
+ case 3:
784
+ _b.trys.push([3, 5, , 6]);
568
785
  return [4 /*yield*/, api_1.BackgroundTask.create({
569
786
  createdBy: user === null || user === void 0 ? void 0 : user._id,
570
787
  isDryRun: false,
@@ -580,11 +797,11 @@ var AdminApp = /** @class */ (function () {
580
797
  status: "pending",
581
798
  taskType: raw.kind,
582
799
  })];
583
- case 3:
584
- task = (_a.sent());
585
- return [3 /*break*/, 5];
586
800
  case 4:
587
- err_2 = _a.sent();
801
+ task = (_b.sent());
802
+ return [3 /*break*/, 6];
803
+ case 5:
804
+ err_2 = _b.sent();
588
805
  detail = err_2 instanceof Error ? err_2.message : String(err_2);
589
806
  api_1.logger.error("Failed to create admin background task: ".concat(detail));
590
807
  throw new api_1.APIError({
@@ -592,7 +809,7 @@ var AdminApp = /** @class */ (function () {
592
809
  status: 500,
593
810
  title: "Failed to enqueue background task",
594
811
  });
595
- case 5: return [2 /*return*/, res.status(201).json({ taskId: task._id.toString() })];
812
+ case 6: return [2 /*return*/, res.status(201).json({ taskId: task._id.toString() })];
596
813
  }
597
814
  });
598
815
  }); })], false));
@@ -602,7 +819,7 @@ var AdminApp = /** @class */ (function () {
602
819
  var config, defaults;
603
820
  return __generator(this, function (_a) {
604
821
  switch (_a.label) {
605
- case 0: return [4 /*yield*/, (0, api_1.checkPermissions)("read", [api_1.Permissions.IsAdmin], req.user)];
822
+ case 0: return [4 /*yield*/, this.hasConfigurationPermission(req.user, "read")];
606
823
  case 1:
607
824
  if (!(_a.sent())) {
608
825
  throw new api_1.APIError({ status: 403, title: "Admin access required" });
@@ -625,10 +842,10 @@ var AdminApp = /** @class */ (function () {
625
842
  }); }));
626
843
  app.put(versionConfigPath, (0, api_1.authenticateMiddleware)(), (0, api_1.asyncHandler)(function (req, res) { return __awaiter(_this, void 0, void 0, function () {
627
844
  var raw, allowedFields, setFields, unsetFields, allowedFields_1, allowedFields_1_1, field, updateOp, doc;
628
- var e_8, _a;
845
+ var e_10, _a;
629
846
  return __generator(this, function (_b) {
630
847
  switch (_b.label) {
631
- case 0: return [4 /*yield*/, (0, api_1.checkPermissions)("update", [api_1.Permissions.IsAdmin], req.user)];
848
+ case 0: return [4 /*yield*/, this.hasConfigurationPermission(req.user, "update")];
632
849
  case 1:
633
850
  if (!(_b.sent())) {
634
851
  throw new api_1.APIError({ status: 403, title: "Admin access required" });
@@ -656,12 +873,12 @@ var AdminApp = /** @class */ (function () {
656
873
  }
657
874
  }
658
875
  }
659
- catch (e_8_1) { e_8 = { error: e_8_1 }; }
876
+ catch (e_10_1) { e_10 = { error: e_10_1 }; }
660
877
  finally {
661
878
  try {
662
879
  if (allowedFields_1_1 && !allowedFields_1_1.done && (_a = allowedFields_1.return)) _a.call(allowedFields_1);
663
880
  }
664
- finally { if (e_8) throw e_8.error; }
881
+ finally { if (e_10) throw e_10.error; }
665
882
  }
666
883
  updateOp = {};
667
884
  if (Object.keys(setFields).length > 0) {
@@ -683,16 +900,16 @@ var AdminApp = /** @class */ (function () {
683
900
  });
684
901
  }); }));
685
902
  var _loop_1 = function (config) {
686
- var e_9, _p;
903
+ var e_11, _t;
687
904
  // Determine searchable fields from the actual Mongoose schema type,
688
905
  // not the OpenAPI type (which reports ObjectId as "string")
689
906
  var searchableFields = [];
690
907
  var objectIdFields = [];
691
- var modelMeta = configModels.find(function (m) { return m.name === config.model.modelName; });
908
+ var modelMeta = (0, adminConfigIdentity_1.findAdminModelMetaByRoutePath)(configModels, "".concat(basePath).concat(config.routePath));
692
909
  if (modelMeta) {
693
910
  try {
694
- for (var _q = (e_9 = void 0, __values(Object.keys(modelMeta.fields))), _r = _q.next(); !_r.done; _r = _q.next()) {
695
- var key = _r.value;
911
+ for (var _u = (e_11 = void 0, __values(Object.keys(modelMeta.fields))), _v = _u.next(); !_v.done; _v = _u.next()) {
912
+ var key = _v.value;
696
913
  var schemaPath = config.model.schema.path(key);
697
914
  if (schemaPath && schemaPath.instance === "String" && !modelMeta.fields[key].enum) {
698
915
  searchableFields.push(key);
@@ -702,59 +919,42 @@ var AdminApp = /** @class */ (function () {
702
919
  }
703
920
  }
704
921
  }
705
- catch (e_9_1) { e_9 = { error: e_9_1 }; }
922
+ catch (e_11_1) { e_11 = { error: e_11_1 }; }
706
923
  finally {
707
924
  try {
708
- if (_r && !_r.done && (_p = _q.return)) _p.call(_q);
925
+ if (_v && !_v.done && (_t = _u.return)) _t.call(_u);
709
926
  }
710
- finally { if (e_9) throw e_9.error; }
927
+ finally { if (e_11) throw e_11.error; }
711
928
  }
712
929
  }
713
930
  app.get("".concat(basePath).concat(config.routePath, "/search"), (0, api_1.authenticateMiddleware)(), (0, api_1.asyncHandler)(function (req, res) { return __awaiter(_this, void 0, void 0, function () {
714
- var user, q, escapedQ, regex, fields, orConditions, objectIdFields_1, objectIdFields_1_1, field, results, err_3;
715
- var e_10, _a, _b;
716
- var _c;
717
- return __generator(this, function (_d) {
718
- switch (_d.label) {
719
- case 0:
720
- user = req.user;
721
- if (!(user === null || user === void 0 ? void 0 : user.admin)) {
931
+ var q, fields, searchClause, scoped, results, err_3;
932
+ var _a;
933
+ return __generator(this, function (_b) {
934
+ switch (_b.label) {
935
+ case 0: return [4 /*yield*/, (0, api_1.checkPermissions)("list", this.resourceActionPermissions(config.model.modelName, "list"), req.user)];
936
+ case 1:
937
+ if (!(_b.sent())) {
722
938
  throw new api_1.APIError({
723
939
  disableExternalErrorTracking: true,
724
940
  status: 403,
725
941
  title: "Forbidden",
726
942
  });
727
943
  }
728
- q = String((_c = req.query.q) !== null && _c !== void 0 ? _c : "");
944
+ q = String((_a = req.query.q) !== null && _a !== void 0 ? _a : "");
729
945
  if (!q) {
730
946
  return [2 /*return*/, res.json({ data: [] })];
731
947
  }
732
- escapedQ = q.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
733
- regex = new RegExp(escapedQ, "i");
734
948
  fields = typeof req.query.fields === "string"
735
949
  ? req.query.fields.split(",").filter(function (f) { return searchableFields.includes(f); })
736
950
  : searchableFields;
737
- orConditions = fields.map(function (field) {
738
- var _a;
739
- return (_a = {}, _a[field] = { $regex: regex }, _a);
951
+ searchClause = (0, adminTextSearch_1.buildAdminPartialSearchFilter)({
952
+ extraObjectIdFields: objectIdFields,
953
+ model: config.model,
954
+ q: q,
955
+ searchFields: fields,
740
956
  });
741
- // If the query is a valid ObjectId, also match against ObjectId fields
742
- if (mongoose_1.default.isValidObjectId(q)) {
743
- try {
744
- for (objectIdFields_1 = __values(objectIdFields), objectIdFields_1_1 = objectIdFields_1.next(); !objectIdFields_1_1.done; objectIdFields_1_1 = objectIdFields_1.next()) {
745
- field = objectIdFields_1_1.value;
746
- orConditions.push((_b = {}, _b[field] = new mongoose_1.default.Types.ObjectId(q), _b));
747
- }
748
- }
749
- catch (e_10_1) { e_10 = { error: e_10_1 }; }
750
- finally {
751
- try {
752
- if (objectIdFields_1_1 && !objectIdFields_1_1.done && (_a = objectIdFields_1.return)) _a.call(objectIdFields_1);
753
- }
754
- finally { if (e_10) throw e_10.error; }
755
- }
756
- }
757
- if (orConditions.length === 0) {
957
+ if (!searchClause) {
758
958
  return [2 /*return*/, res.json({ data: [] })];
759
959
  }
760
960
  api_1.logger.debug("Admin search query", {
@@ -762,26 +962,37 @@ var AdminApp = /** @class */ (function () {
762
962
  model: config.model.modelName,
763
963
  q: q,
764
964
  });
765
- _d.label = 1;
766
- case 1:
767
- _d.trys.push([1, 3, , 4]);
768
- return [4 /*yield*/, config.model.find({ $or: orConditions }).limit(20).lean()];
965
+ _b.label = 2;
769
966
  case 2:
770
- results = _d.sent();
967
+ _b.trys.push([2, 5, , 6]);
968
+ return [4 /*yield*/, buildAdminListQueryFilter(config, modelMeta === null || modelMeta === void 0 ? void 0 : modelMeta.searchFields)(req.user, {})];
969
+ case 3:
970
+ scoped = _b.sent();
971
+ if (scoped === null) {
972
+ return [2 /*return*/, res.json({ data: [] })];
973
+ }
974
+ return [4 /*yield*/, config.model
975
+ .find({ $and: [scoped, searchClause] })
976
+ .limit(20)
977
+ .lean()];
978
+ case 4:
979
+ results = _b.sent();
771
980
  api_1.logger.debug("Admin search results", {
772
981
  count: results.length,
773
982
  model: config.model.modelName,
774
983
  });
775
- return [2 /*return*/, res.json({ data: results })];
776
- case 3:
777
- err_3 = _d.sent();
984
+ return [2 /*return*/, res.json({
985
+ data: results.map(function (doc) { return scrubAdminResponse(doc, config, allModelAdmins); }),
986
+ })];
987
+ case 5:
988
+ err_3 = _b.sent();
778
989
  api_1.logger.error("Admin search failed", {
779
990
  error: err_3,
780
991
  fields: fields,
781
992
  model: config.model.modelName,
782
993
  });
783
994
  throw err_3;
784
- case 4: return [2 /*return*/];
995
+ case 6: return [2 /*return*/];
785
996
  }
786
997
  });
787
998
  }); }));
@@ -793,71 +1004,224 @@ var AdminApp = /** @class */ (function () {
793
1004
  _loop_1(config);
794
1005
  }
795
1006
  }
796
- catch (e_4_1) { e_4 = { error: e_4_1 }; }
1007
+ catch (e_6_1) { e_6 = { error: e_6_1 }; }
797
1008
  finally {
798
1009
  try {
799
1010
  if (modelConfigs_1_1 && !modelConfigs_1_1.done && (_a = modelConfigs_1.return)) _a.call(modelConfigs_1);
800
1011
  }
801
- finally { if (e_4) throw e_4.error; }
1012
+ finally { if (e_6) throw e_6.error; }
802
1013
  }
803
1014
  var _loop_2 = function (config) {
804
- var hiddenFieldSet = new Set((_f = config.hiddenFields) !== null && _f !== void 0 ? _f : []);
805
- var readonlySet = new Set((_g = config.readonlyFields) !== null && _g !== void 0 ? _g : []);
806
- var modelMeta = configModels.find(function (m) { return m.name === config.model.modelName; });
807
- var allowlist = new Set((_h = modelMeta === null || modelMeta === void 0 ? void 0 : modelMeta.bulkPatchAllowlist) !== null && _h !== void 0 ? _h : []);
808
- var adminPermission = function (allowed) {
1015
+ var hiddenFieldSet = new Set((_g = config.hiddenFields) !== null && _g !== void 0 ? _g : []);
1016
+ var readonlySet = new Set((_h = config.readonlyFields) !== null && _h !== void 0 ? _h : []);
1017
+ var excludeFieldSet = new Set((_j = config.excludeFields) !== null && _j !== void 0 ? _j : []);
1018
+ var modelMeta = (0, adminConfigIdentity_1.findAdminModelMetaByRoutePath)(configModels, "".concat(basePath).concat(config.routePath));
1019
+ var allowlist = new Set((_k = modelMeta === null || modelMeta === void 0 ? void 0 : modelMeta.bulkPatchAllowlist) !== null && _k !== void 0 ? _k : []);
1020
+ var adminPermission = function (allowed, action) {
809
1021
  if (allowed === false) {
810
1022
  return [];
811
1023
  }
812
- return [api_1.Permissions.IsAdmin];
1024
+ return _this.resourceActionPermissions(config.model.modelName, action);
813
1025
  };
1026
+ var updatePermissions = this_1.resourceActionPermissions(config.model.modelName, "update");
814
1027
  var stripProtectedFromBody = function (body) {
815
- var e_11, _a, e_12, _b, e_13, _c;
1028
+ var e_12, _a, e_13, _b, e_14, _c, e_15, _d;
816
1029
  if (!body || typeof body !== "object" || Array.isArray(body)) {
817
1030
  return {};
818
1031
  }
819
1032
  var next = __assign({}, body);
820
1033
  try {
821
- for (var readonlySet_1 = (e_11 = void 0, __values(readonlySet)), readonlySet_1_1 = readonlySet_1.next(); !readonlySet_1_1.done; readonlySet_1_1 = readonlySet_1.next()) {
1034
+ for (var readonlySet_1 = (e_12 = void 0, __values(readonlySet)), readonlySet_1_1 = readonlySet_1.next(); !readonlySet_1_1.done; readonlySet_1_1 = readonlySet_1.next()) {
822
1035
  var key = readonlySet_1_1.value;
823
1036
  delete next[key];
824
1037
  }
825
1038
  }
826
- catch (e_11_1) { e_11 = { error: e_11_1 }; }
1039
+ catch (e_12_1) { e_12 = { error: e_12_1 }; }
827
1040
  finally {
828
1041
  try {
829
1042
  if (readonlySet_1_1 && !readonlySet_1_1.done && (_a = readonlySet_1.return)) _a.call(readonlySet_1);
830
1043
  }
831
- finally { if (e_11) throw e_11.error; }
1044
+ finally { if (e_12) throw e_12.error; }
832
1045
  }
833
1046
  try {
834
- for (var hiddenFieldSet_1 = (e_12 = void 0, __values(hiddenFieldSet)), hiddenFieldSet_1_1 = hiddenFieldSet_1.next(); !hiddenFieldSet_1_1.done; hiddenFieldSet_1_1 = hiddenFieldSet_1.next()) {
1047
+ for (var hiddenFieldSet_1 = (e_13 = void 0, __values(hiddenFieldSet)), hiddenFieldSet_1_1 = hiddenFieldSet_1.next(); !hiddenFieldSet_1_1.done; hiddenFieldSet_1_1 = hiddenFieldSet_1.next()) {
835
1048
  var key = hiddenFieldSet_1_1.value;
836
1049
  delete next[key];
837
1050
  }
838
1051
  }
839
- catch (e_12_1) { e_12 = { error: e_12_1 }; }
1052
+ catch (e_13_1) { e_13 = { error: e_13_1 }; }
840
1053
  finally {
841
1054
  try {
842
1055
  if (hiddenFieldSet_1_1 && !hiddenFieldSet_1_1.done && (_b = hiddenFieldSet_1.return)) _b.call(hiddenFieldSet_1);
843
1056
  }
844
- finally { if (e_12) throw e_12.error; }
1057
+ finally { if (e_13) throw e_13.error; }
845
1058
  }
846
1059
  try {
847
- for (var SYSTEM_ADMIN_FIELDS_1 = (e_13 = void 0, __values(adminUiV2_1.SYSTEM_ADMIN_FIELDS)), SYSTEM_ADMIN_FIELDS_1_1 = SYSTEM_ADMIN_FIELDS_1.next(); !SYSTEM_ADMIN_FIELDS_1_1.done; SYSTEM_ADMIN_FIELDS_1_1 = SYSTEM_ADMIN_FIELDS_1.next()) {
1060
+ for (var excludeFieldSet_1 = (e_14 = void 0, __values(excludeFieldSet)), excludeFieldSet_1_1 = excludeFieldSet_1.next(); !excludeFieldSet_1_1.done; excludeFieldSet_1_1 = excludeFieldSet_1.next()) {
1061
+ var key = excludeFieldSet_1_1.value;
1062
+ delete next[key];
1063
+ }
1064
+ }
1065
+ catch (e_14_1) { e_14 = { error: e_14_1 }; }
1066
+ finally {
1067
+ try {
1068
+ if (excludeFieldSet_1_1 && !excludeFieldSet_1_1.done && (_c = excludeFieldSet_1.return)) _c.call(excludeFieldSet_1);
1069
+ }
1070
+ finally { if (e_14) throw e_14.error; }
1071
+ }
1072
+ try {
1073
+ for (var SYSTEM_ADMIN_FIELDS_1 = (e_15 = void 0, __values(adminUiV2_1.SYSTEM_ADMIN_FIELDS)), SYSTEM_ADMIN_FIELDS_1_1 = SYSTEM_ADMIN_FIELDS_1.next(); !SYSTEM_ADMIN_FIELDS_1_1.done; SYSTEM_ADMIN_FIELDS_1_1 = SYSTEM_ADMIN_FIELDS_1.next()) {
848
1074
  var key = SYSTEM_ADMIN_FIELDS_1_1.value;
849
1075
  delete next[key];
850
1076
  }
851
1077
  }
852
- catch (e_13_1) { e_13 = { error: e_13_1 }; }
1078
+ catch (e_15_1) { e_15 = { error: e_15_1 }; }
853
1079
  finally {
854
1080
  try {
855
- if (SYSTEM_ADMIN_FIELDS_1_1 && !SYSTEM_ADMIN_FIELDS_1_1.done && (_c = SYSTEM_ADMIN_FIELDS_1.return)) _c.call(SYSTEM_ADMIN_FIELDS_1);
1081
+ if (SYSTEM_ADMIN_FIELDS_1_1 && !SYSTEM_ADMIN_FIELDS_1_1.done && (_d = SYSTEM_ADMIN_FIELDS_1.return)) _d.call(SYSTEM_ADMIN_FIELDS_1);
856
1082
  }
857
- finally { if (e_13) throw e_13.error; }
1083
+ finally { if (e_15) throw e_15.error; }
1084
+ }
1085
+ // Self-service never writes these fields. Admin CRUD may set `admin`.
1086
+ // When RBAC is enabled, `roles` must go through RoleManager.assign and
1087
+ // tenant membership is not a generic User document field.
1088
+ if (config.model.modelName === "User" && _this.options.accessControl) {
1089
+ delete next.organizationIds;
1090
+ delete next.roles;
858
1091
  }
859
1092
  return next;
860
1093
  };
1094
+ var parseRoleNames = function (value) {
1095
+ if (!Array.isArray(value) || value.some(function (roleName) { return typeof roleName !== "string"; })) {
1096
+ throw new api_1.APIError({ status: 400, title: "roles must be an array of strings" });
1097
+ }
1098
+ return value;
1099
+ };
1100
+ var takePendingUserRoles = function (body, request) {
1101
+ if (config.model.modelName !== "User" || !_this.options.accessControl) {
1102
+ return;
1103
+ }
1104
+ if (!("roles" in body)) {
1105
+ return;
1106
+ }
1107
+ request.terrenoPendingUserRoles = parseRoleNames(body.roles);
1108
+ };
1109
+ var applyPendingUserRoles = function (value_1, request_1) {
1110
+ var args_1 = [];
1111
+ for (var _i = 2; _i < arguments.length; _i++) {
1112
+ args_1[_i - 2] = arguments[_i];
1113
+ }
1114
+ return __awaiter(_this, __spreadArray([value_1, request_1], __read(args_1), false), void 0, function (value, request, rollbackOnFailure) {
1115
+ var pending, actor, accessControl, record, userId, error_1, rollbackError_1;
1116
+ var _a;
1117
+ if (rollbackOnFailure === void 0) { rollbackOnFailure = false; }
1118
+ return __generator(this, function (_b) {
1119
+ switch (_b.label) {
1120
+ case 0:
1121
+ pending = request
1122
+ .terrenoPendingUserRoles;
1123
+ if (!pending) {
1124
+ return [2 /*return*/];
1125
+ }
1126
+ actor = request.user;
1127
+ accessControl = this.options.accessControl;
1128
+ if (!actor || !accessControl) {
1129
+ throw new api_1.APIError({ status: 401, title: "Unauthorized" });
1130
+ }
1131
+ record = value;
1132
+ userId = (_a = record.id) !== null && _a !== void 0 ? _a : (record._id != null ? String(record._id) : undefined);
1133
+ if (!userId) {
1134
+ throw new api_1.APIError({ status: 500, title: "User id missing after write" });
1135
+ }
1136
+ _b.label = 1;
1137
+ case 1:
1138
+ _b.trys.push([1, 3, , 8]);
1139
+ return [4 /*yield*/, accessControl.roles.assign({ actor: actor, roleNames: pending, userId: userId })];
1140
+ case 2:
1141
+ _b.sent();
1142
+ if (typeof record.set === "function") {
1143
+ record.set("roles", __spreadArray([], __read(pending), false));
1144
+ }
1145
+ else {
1146
+ record.roles = __spreadArray([], __read(pending), false);
1147
+ }
1148
+ return [3 /*break*/, 8];
1149
+ case 3:
1150
+ error_1 = _b.sent();
1151
+ if (!rollbackOnFailure) return [3 /*break*/, 7];
1152
+ _b.label = 4;
1153
+ case 4:
1154
+ _b.trys.push([4, 6, , 7]);
1155
+ return [4 /*yield*/, config.model.deleteOne({ _id: userId })];
1156
+ case 5:
1157
+ _b.sent();
1158
+ return [3 /*break*/, 7];
1159
+ case 6:
1160
+ rollbackError_1 = _b.sent();
1161
+ api_1.logger.error("Failed to roll back user after role assignment failure", {
1162
+ error: rollbackError_1,
1163
+ userId: userId,
1164
+ });
1165
+ return [3 /*break*/, 7];
1166
+ case 7: throw error_1;
1167
+ case 8: return [2 /*return*/];
1168
+ }
1169
+ });
1170
+ });
1171
+ };
1172
+ var restoreUserFieldsAfterFailedRoleAssign = function (value, prev, cleanedBody) { return __awaiter(_this, void 0, void 0, function () {
1173
+ var record, prevRecord, body, restore, _a, _b, key;
1174
+ var e_16, _c;
1175
+ return __generator(this, function (_d) {
1176
+ switch (_d.label) {
1177
+ case 0:
1178
+ if (!prev || typeof prev !== "object" || !cleanedBody || typeof cleanedBody !== "object") {
1179
+ return [2 /*return*/];
1180
+ }
1181
+ if (Array.isArray(cleanedBody)) {
1182
+ return [2 /*return*/];
1183
+ }
1184
+ record = value;
1185
+ prevRecord = prev;
1186
+ body = cleanedBody;
1187
+ restore = {};
1188
+ try {
1189
+ for (_a = __values(Object.keys(body)), _b = _a.next(); !_b.done; _b = _a.next()) {
1190
+ key = _b.value;
1191
+ if (key === "roles") {
1192
+ continue;
1193
+ }
1194
+ restore[key] = prevRecord[key];
1195
+ if (typeof record.set === "function") {
1196
+ record.set(key, prevRecord[key]);
1197
+ }
1198
+ }
1199
+ }
1200
+ catch (e_16_1) { e_16 = { error: e_16_1 }; }
1201
+ finally {
1202
+ try {
1203
+ if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
1204
+ }
1205
+ finally { if (e_16) throw e_16.error; }
1206
+ }
1207
+ if (Object.keys(restore).length === 0) {
1208
+ return [2 /*return*/];
1209
+ }
1210
+ if (!(typeof record.save === "function")) return [3 /*break*/, 2];
1211
+ return [4 /*yield*/, record.save()];
1212
+ case 1:
1213
+ _d.sent();
1214
+ return [2 /*return*/];
1215
+ case 2:
1216
+ if (!(record._id != null)) return [3 /*break*/, 4];
1217
+ return [4 /*yield*/, config.model.updateOne({ _id: record._id }, { $set: restore })];
1218
+ case 3:
1219
+ _d.sent();
1220
+ _d.label = 4;
1221
+ case 4: return [2 /*return*/];
1222
+ }
1223
+ });
1224
+ }); };
861
1225
  var bulkPatchOpenApi = openApiMw
862
1226
  ? (0, api_1.createOpenApiBuilder)({ openApi: openApiMw })
863
1227
  .withTags(["admin"])
@@ -946,52 +1310,197 @@ var AdminApp = /** @class */ (function () {
946
1310
  }); },
947
1311
  }
948
1312
  : {};
1313
+ var assertCanWriteUserAdminFlag = function (body_1, request_1) {
1314
+ var args_1 = [];
1315
+ for (var _i = 2; _i < arguments.length; _i++) {
1316
+ args_1[_i - 2] = arguments[_i];
1317
+ }
1318
+ return __awaiter(_this, __spreadArray([body_1, request_1], __read(args_1), false), void 0, function (body, request, currentAdmin, targetUserId) {
1319
+ var accessControl, actor, result, nextAdmin, isGrantingAdmin, isRevokingAdmin, targetId;
1320
+ var _a;
1321
+ if (currentAdmin === void 0) { currentAdmin = false; }
1322
+ return __generator(this, function (_b) {
1323
+ switch (_b.label) {
1324
+ case 0:
1325
+ if (config.model.modelName !== "User" || !("admin" in body)) {
1326
+ return [2 /*return*/];
1327
+ }
1328
+ accessControl = this.options.accessControl;
1329
+ if (!accessControl) {
1330
+ return [2 /*return*/];
1331
+ }
1332
+ if (coerceAdminFlag(body.admin) === Boolean(currentAdmin)) {
1333
+ return [2 /*return*/];
1334
+ }
1335
+ actor = request.user;
1336
+ if (!actor) {
1337
+ throw new api_1.APIError({ status: 401, title: "Unauthorized" });
1338
+ }
1339
+ return [4 /*yield*/, accessControl.can({
1340
+ permissions: { rbac: ["assignRoles"] },
1341
+ user: actor,
1342
+ })];
1343
+ case 1:
1344
+ result = _b.sent();
1345
+ if (!result.allowed) {
1346
+ throw new api_1.APIError({
1347
+ status: 403,
1348
+ title: "Missing rbac:assignRoles permission",
1349
+ });
1350
+ }
1351
+ nextAdmin = coerceAdminFlag(body.admin);
1352
+ isGrantingAdmin = nextAdmin === true && !currentAdmin;
1353
+ isRevokingAdmin = nextAdmin === false && currentAdmin;
1354
+ // assignRoles and manageRoles still cannot mint or strip the legacy admin
1355
+ // plane (IsAdmin, password reset, owner bypass). Only an existing admin can.
1356
+ if ((isGrantingAdmin || isRevokingAdmin) && !actor.admin) {
1357
+ throw new api_1.APIError({
1358
+ status: 403,
1359
+ title: isGrantingAdmin
1360
+ ? "Cannot grant the legacy admin flag without the admin privilege"
1361
+ : "Cannot revoke the legacy admin flag without the admin privilege",
1362
+ });
1363
+ }
1364
+ targetId = targetUserId !== null && targetUserId !== void 0 ? targetUserId : (_a = request.params) === null || _a === void 0 ? void 0 : _a.id;
1365
+ if (!targetId) return [3 /*break*/, 3];
1366
+ return [4 /*yield*/, accessControl.roles.assertCanModifyUser({ actor: actor, userId: String(targetId) })];
1367
+ case 2:
1368
+ _b.sent();
1369
+ _b.label = 3;
1370
+ case 3: return [2 /*return*/];
1371
+ }
1372
+ });
1373
+ });
1374
+ };
1375
+ var currentUserAdminFlag = function (request) { return __awaiter(_this, void 0, void 0, function () {
1376
+ var id, existing;
1377
+ var _a;
1378
+ return __generator(this, function (_b) {
1379
+ switch (_b.label) {
1380
+ case 0:
1381
+ id = (_a = request.params) === null || _a === void 0 ? void 0 : _a.id;
1382
+ if (!id) {
1383
+ return [2 /*return*/, false];
1384
+ }
1385
+ return [4 /*yield*/, config.model.findById(id).select("admin").lean()];
1386
+ case 1:
1387
+ existing = _b.sent();
1388
+ return [2 /*return*/, Boolean(existing === null || existing === void 0 ? void 0 : existing.admin)];
1389
+ }
1390
+ });
1391
+ }); };
1392
+ var markAuthorizedUserAdminWrite = function (body, request) {
1393
+ if (config.model.modelName !== "User" ||
1394
+ !_this.options.accessControl ||
1395
+ !("admin" in body)) {
1396
+ return;
1397
+ }
1398
+ request.terrenoAllowUserAdminWrite = true;
1399
+ };
949
1400
  // noExplicitAny: matches the Model<any> from AdminModelConfig above.
950
1401
  // biome-ignore lint/suspicious/noExplicitAny: matches the Model<any> from AdminModelConfig above.
951
- var routerOptions = __assign(__assign(__assign(__assign(__assign(__assign({}, (openApiMw ? { openApi: openApiMw } : {})), { defaultLimit: (_j = config.pageSize) !== null && _j !== void 0 ? _j : 100, maxLimit: 500, permissions: {
952
- create: adminPermission((_k = config.permissions) === null || _k === void 0 ? void 0 : _k.create),
953
- delete: adminPermission((_l = config.permissions) === null || _l === void 0 ? void 0 : _l.delete),
954
- list: [api_1.Permissions.IsAdmin],
955
- read: [api_1.Permissions.IsAdmin],
956
- update: adminPermission((_m = config.permissions) === null || _m === void 0 ? void 0 : _m.update),
957
- }, queryFields: (0, adminUiV2_1.buildAdminModelQueryFields)({
958
- filters: config.filters,
959
- listDisplay: config.listDisplay,
960
- listFields: config.listFields,
961
- searchFields: config.searchFields,
962
- }) }), (config.queryFilter ? { queryFilter: config.queryFilter } : {})), { preCreate: function (body, _req) { return __awaiter(_this, void 0, void 0, function () {
963
- return __generator(this, function (_a) {
964
- if (!body || typeof body !== "object") {
965
- return [2 /*return*/, body];
1402
+ var routerOptions = __assign(__assign(__assign(__assign(__assign({}, (openApiMw ? { openApi: openApiMw } : {})), (this_1.options.accessControl ? { accessControl: this_1.options.accessControl } : {})), { defaultLimit: (_l = config.pageSize) !== null && _l !== void 0 ? _l : 100, maxLimit: 500, permissions: {
1403
+ create: adminPermission((_m = config.permissions) === null || _m === void 0 ? void 0 : _m.create, "create"),
1404
+ delete: adminPermission((_o = config.permissions) === null || _o === void 0 ? void 0 : _o.delete, "delete"),
1405
+ list: adminPermission(true, "list"),
1406
+ read: adminPermission(true, "read"),
1407
+ update: adminPermission((_p = config.permissions) === null || _p === void 0 ? void 0 : _p.update, "update"),
1408
+ }, postCreate: function (value, request) { return __awaiter(_this, void 0, void 0, function () {
1409
+ var _a;
1410
+ return __generator(this, function (_b) {
1411
+ switch (_b.label) {
1412
+ case 0: return [4 /*yield*/, applyPendingUserRoles(value, request, true)];
1413
+ case 1:
1414
+ _b.sent();
1415
+ return [4 /*yield*/, ((_a = auditHooks.postCreate) === null || _a === void 0 ? void 0 : _a.call(auditHooks, value, request))];
1416
+ case 2:
1417
+ _b.sent();
1418
+ return [2 /*return*/];
1419
+ }
1420
+ });
1421
+ }); }, postUpdate: function (value, cleanedBody, request, prev) { return __awaiter(_this, void 0, void 0, function () {
1422
+ var error_2;
1423
+ var _a;
1424
+ return __generator(this, function (_b) {
1425
+ switch (_b.label) {
1426
+ case 0:
1427
+ _b.trys.push([0, 2, , 4]);
1428
+ return [4 /*yield*/, applyPendingUserRoles(value, request)];
1429
+ case 1:
1430
+ _b.sent();
1431
+ return [3 /*break*/, 4];
1432
+ case 2:
1433
+ error_2 = _b.sent();
1434
+ return [4 /*yield*/, restoreUserFieldsAfterFailedRoleAssign(value, prev, cleanedBody)];
1435
+ case 3:
1436
+ _b.sent();
1437
+ throw error_2;
1438
+ case 4: return [4 /*yield*/, ((_a = auditHooks.postUpdate) === null || _a === void 0 ? void 0 : _a.call(auditHooks, value, cleanedBody, request, prev))];
1439
+ case 5:
1440
+ _b.sent();
1441
+ return [2 /*return*/];
966
1442
  }
967
- return [2 /*return*/, stripProtectedFromBody(body)];
968
1443
  });
969
- }); }, preUpdate: function (body, _req) { return __awaiter(_this, void 0, void 0, function () {
1444
+ }); }, preCreate: function (body, req) { return __awaiter(_this, void 0, void 0, function () {
1445
+ var record;
970
1446
  return __generator(this, function (_a) {
971
- if (!body || typeof body !== "object") {
972
- return [2 /*return*/, body];
1447
+ switch (_a.label) {
1448
+ case 0:
1449
+ if (!body || typeof body !== "object") {
1450
+ return [2 /*return*/, body];
1451
+ }
1452
+ record = body;
1453
+ takePendingUserRoles(record, req);
1454
+ return [4 /*yield*/, assertCanWriteUserAdminFlag(record, req)];
1455
+ case 1:
1456
+ _a.sent();
1457
+ markAuthorizedUserAdminWrite(record, req);
1458
+ return [2 /*return*/, stripProtectedFromBody(body)];
1459
+ }
1460
+ });
1461
+ }); }, preUpdate: function (body, req) { return __awaiter(_this, void 0, void 0, function () {
1462
+ var record, _a, _b;
1463
+ return __generator(this, function (_c) {
1464
+ switch (_c.label) {
1465
+ case 0:
1466
+ if (!body || typeof body !== "object") {
1467
+ return [2 /*return*/, body];
1468
+ }
1469
+ record = body;
1470
+ takePendingUserRoles(record, req);
1471
+ _a = assertCanWriteUserAdminFlag;
1472
+ _b = [record, req];
1473
+ return [4 /*yield*/, currentUserAdminFlag(req)];
1474
+ case 1: return [4 /*yield*/, _a.apply(void 0, _b.concat([_c.sent()]))];
1475
+ case 2:
1476
+ _c.sent();
1477
+ markAuthorizedUserAdminWrite(record, req);
1478
+ return [2 /*return*/, stripProtectedFromBody(body)];
973
1479
  }
974
- return [2 /*return*/, stripProtectedFromBody(body)];
975
1480
  });
976
- }); }, responseHandler: hiddenFieldSet.size > 0
977
- ? function (value, _method, _request, _options) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
978
- return [2 /*return*/, removeHiddenFields(value, hiddenFieldSet)];
979
- }); }); }
980
- : undefined, sort: (_o = config.defaultSort) !== null && _o !== void 0 ? _o : "-created" }), (config.populatePaths ? { populatePaths: config.populatePaths } : {})), auditHooks);
1481
+ }); }, queryFields: (0, adminUiV2_1.buildAdminModelQueryFields)({
1482
+ filters: config.filters,
1483
+ listDisplay: config.listDisplay,
1484
+ listFields: config.listFields,
1485
+ searchFields: (_q = modelMeta === null || modelMeta === void 0 ? void 0 : modelMeta.searchFields) !== null && _q !== void 0 ? _q : config.searchFields,
1486
+ }), queryFilter: buildAdminListQueryFilter(config, modelMeta === null || modelMeta === void 0 ? void 0 : modelMeta.searchFields), responseHandler: function (value, _method, _request, _options) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
1487
+ return [2 /*return*/, scrubAdminResponse(value, config, allModelAdmins)];
1488
+ }); }); }, sort: (_r = config.defaultSort) !== null && _r !== void 0 ? _r : "-created" }), (config.populatePaths ? { populatePaths: config.populatePaths } : {})), (auditHooks.postDelete ? { postDelete: auditHooks.postDelete } : {}));
981
1489
  var modelBase = express_1.default.Router();
1490
+ modelBase.use(validateAdminSortParam((_s = modelMeta === null || modelMeta === void 0 ? void 0 : modelMeta.sortableFields) !== null && _s !== void 0 ? _s : []));
982
1491
  modelBase.post.apply(modelBase, __spreadArray(__spreadArray(["/bulk-patch",
983
1492
  (0, api_1.authenticateMiddleware)()], __read(asMiddlewareList(bulkPatchOpenApi)), false), [(0, api_1.asyncHandler)(function (req, res) { return __awaiter(_this, void 0, void 0, function () {
984
- var body, ids, rawPatch, unknownKeys, patch, updated, failures, ids_1, ids_1_1, id, resUpdate, err_4, message, e_14_1;
985
- var e_14, _a;
986
- var _b;
987
- return __generator(this, function (_c) {
988
- switch (_c.label) {
989
- case 0: return [4 /*yield*/, (0, api_1.checkPermissions)("update", [api_1.Permissions.IsAdmin], req.user)];
1493
+ var body, ids, rawPatch, unknownKeys, patch, pendingRoles, updated, failures, actor, ids_1, ids_1_1, id, doc, previousPatch, _a, _b, key, roleError_1, err_4, message, e_17_1;
1494
+ var e_17, _c, e_18, _d;
1495
+ var _e, _f;
1496
+ return __generator(this, function (_g) {
1497
+ switch (_g.label) {
1498
+ case 0: return [4 /*yield*/, (0, api_1.checkPermissions)("update", updatePermissions, req.user)];
990
1499
  case 1:
991
- if (!(_c.sent())) {
1500
+ if (!(_g.sent())) {
992
1501
  throw new api_1.APIError({ status: 403, title: "Admin access required" });
993
1502
  }
994
- if (((_b = config.permissions) === null || _b === void 0 ? void 0 : _b.update) === false) {
1503
+ if (((_e = config.permissions) === null || _e === void 0 ? void 0 : _e.update) === false) {
995
1504
  throw new api_1.APIError({ status: 403, title: "Updates are disabled for this model" });
996
1505
  }
997
1506
  body = req.body;
@@ -1021,7 +1530,12 @@ var AdminApp = /** @class */ (function () {
1021
1530
  });
1022
1531
  }
1023
1532
  patch = stripProtectedFromBody(rawPatch);
1024
- if (Object.keys(patch).length === 0) {
1533
+ if (config.model.modelName === "User" &&
1534
+ this.options.accessControl &&
1535
+ "roles" in rawPatch) {
1536
+ pendingRoles = parseRoleNames(rawPatch.roles);
1537
+ }
1538
+ if (Object.keys(patch).length === 0 && pendingRoles === undefined) {
1025
1539
  throw new api_1.APIError({
1026
1540
  status: 400,
1027
1541
  title: "Patch must include at least one writable field",
@@ -1029,57 +1543,111 @@ var AdminApp = /** @class */ (function () {
1029
1543
  }
1030
1544
  updated = 0;
1031
1545
  failures = [];
1032
- _c.label = 2;
1546
+ actor = req.user;
1547
+ _g.label = 2;
1033
1548
  case 2:
1034
- _c.trys.push([2, 9, 10, 11]);
1549
+ _g.trys.push([2, 19, 20, 21]);
1035
1550
  ids_1 = __values(ids), ids_1_1 = ids_1.next();
1036
- _c.label = 3;
1551
+ _g.label = 3;
1037
1552
  case 3:
1038
- if (!!ids_1_1.done) return [3 /*break*/, 8];
1553
+ if (!!ids_1_1.done) return [3 /*break*/, 18];
1039
1554
  id = ids_1_1.value;
1040
1555
  if (!mongoose_1.default.isValidObjectId(id)) {
1041
1556
  failures.push({ id: id, title: "Invalid id" });
1042
- return [3 /*break*/, 7];
1557
+ return [3 /*break*/, 17];
1043
1558
  }
1044
- _c.label = 4;
1559
+ _g.label = 4;
1045
1560
  case 4:
1046
- _c.trys.push([4, 6, , 7]);
1047
- return [4 /*yield*/, config.model.updateOne({ _id: id }, { $set: patch })];
1561
+ _g.trys.push([4, 16, , 17]);
1562
+ return [4 /*yield*/, config.model.findById(id)];
1048
1563
  case 5:
1049
- resUpdate = _c.sent();
1050
- if (resUpdate.matchedCount === 0) {
1564
+ doc = _g.sent();
1565
+ if (!doc) {
1051
1566
  failures.push({ id: id, title: "Not found" });
1567
+ return [3 /*break*/, 17];
1052
1568
  }
1053
- else {
1054
- updated += 1;
1055
- }
1056
- return [3 /*break*/, 7];
1569
+ return [4 /*yield*/, (0, api_1.checkPermissions)("update", updatePermissions, actor, doc)];
1057
1570
  case 6:
1058
- err_4 = _c.sent();
1571
+ if (!(_g.sent())) {
1572
+ failures.push({ id: id, title: "Forbidden" });
1573
+ return [3 /*break*/, 17];
1574
+ }
1575
+ return [4 /*yield*/, assertCanWriteUserAdminFlag(rawPatch, req, Boolean(doc.admin), id)];
1576
+ case 7:
1577
+ _g.sent();
1578
+ previousPatch = {};
1579
+ try {
1580
+ for (_a = (e_18 = void 0, __values(Object.keys(patch))), _b = _a.next(); !_b.done; _b = _a.next()) {
1581
+ key = _b.value;
1582
+ previousPatch[key] = doc[key];
1583
+ }
1584
+ }
1585
+ catch (e_18_1) { e_18 = { error: e_18_1 }; }
1586
+ finally {
1587
+ try {
1588
+ if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
1589
+ }
1590
+ finally { if (e_18) throw e_18.error; }
1591
+ }
1592
+ if (!(Object.keys(patch).length > 0)) return [3 /*break*/, 9];
1593
+ return [4 /*yield*/, doc.updateOne({ $set: patch })];
1594
+ case 8:
1595
+ _g.sent();
1596
+ _g.label = 9;
1597
+ case 9:
1598
+ _g.trys.push([9, 12, , 15]);
1599
+ if (!pendingRoles) return [3 /*break*/, 11];
1600
+ if (!actor) {
1601
+ failures.push({ id: id, title: "Forbidden" });
1602
+ return [3 /*break*/, 17];
1603
+ }
1604
+ return [4 /*yield*/, ((_f = this.options.accessControl) === null || _f === void 0 ? void 0 : _f.roles.assign({
1605
+ actor: actor,
1606
+ roleNames: pendingRoles,
1607
+ userId: id,
1608
+ }))];
1609
+ case 10:
1610
+ _g.sent();
1611
+ _g.label = 11;
1612
+ case 11: return [3 /*break*/, 15];
1613
+ case 12:
1614
+ roleError_1 = _g.sent();
1615
+ if (!(Object.keys(previousPatch).length > 0)) return [3 /*break*/, 14];
1616
+ return [4 /*yield*/, config.model.updateOne({ _id: id }, { $set: previousPatch })];
1617
+ case 13:
1618
+ _g.sent();
1619
+ _g.label = 14;
1620
+ case 14: throw roleError_1;
1621
+ case 15:
1622
+ updated += 1;
1623
+ return [3 /*break*/, 17];
1624
+ case 16:
1625
+ err_4 = _g.sent();
1059
1626
  message = err_4 instanceof Error ? err_4.message : String(err_4);
1060
1627
  failures.push({ id: id, title: message });
1061
- return [3 /*break*/, 7];
1062
- case 7:
1628
+ return [3 /*break*/, 17];
1629
+ case 17:
1063
1630
  ids_1_1 = ids_1.next();
1064
1631
  return [3 /*break*/, 3];
1065
- case 8: return [3 /*break*/, 11];
1066
- case 9:
1067
- e_14_1 = _c.sent();
1068
- e_14 = { error: e_14_1 };
1069
- return [3 /*break*/, 11];
1070
- case 10:
1632
+ case 18: return [3 /*break*/, 21];
1633
+ case 19:
1634
+ e_17_1 = _g.sent();
1635
+ e_17 = { error: e_17_1 };
1636
+ return [3 /*break*/, 21];
1637
+ case 20:
1071
1638
  try {
1072
- if (ids_1_1 && !ids_1_1.done && (_a = ids_1.return)) _a.call(ids_1);
1639
+ if (ids_1_1 && !ids_1_1.done && (_c = ids_1.return)) _c.call(ids_1);
1073
1640
  }
1074
- finally { if (e_14) throw e_14.error; }
1641
+ finally { if (e_17) throw e_17.error; }
1075
1642
  return [7 /*endfinally*/];
1076
- case 11: return [2 /*return*/, res.json({ failures: failures.length > 0 ? failures : undefined, updated: updated })];
1643
+ case 21: return [2 /*return*/, res.json({ failures: failures.length > 0 ? failures : undefined, updated: updated })];
1077
1644
  }
1078
1645
  });
1079
1646
  }); })], false));
1080
1647
  modelBase.use((0, api_1.modelRouter)(config.model, routerOptions));
1081
1648
  app.use("".concat(basePath).concat(config.routePath), modelBase);
1082
1649
  };
1650
+ var this_1 = this;
1083
1651
  try {
1084
1652
  // Mount modelRouter for each model with IsAdmin permissions
1085
1653
  for (var modelConfigs_2 = __values(modelConfigs), modelConfigs_2_1 = modelConfigs_2.next(); !modelConfigs_2_1.done; modelConfigs_2_1 = modelConfigs_2.next()) {
@@ -1087,12 +1655,12 @@ var AdminApp = /** @class */ (function () {
1087
1655
  _loop_2(config);
1088
1656
  }
1089
1657
  }
1090
- catch (e_5_1) { e_5 = { error: e_5_1 }; }
1658
+ catch (e_7_1) { e_7 = { error: e_7_1 }; }
1091
1659
  finally {
1092
1660
  try {
1093
1661
  if (modelConfigs_2_1 && !modelConfigs_2_1.done && (_b = modelConfigs_2.return)) _b.call(modelConfigs_2);
1094
1662
  }
1095
- finally { if (e_5) throw e_5.error; }
1663
+ finally { if (e_7) throw e_7.error; }
1096
1664
  }
1097
1665
  // Mount script routes
1098
1666
  if (scriptConfigs.length > 0) {
@@ -1108,12 +1676,19 @@ var AdminApp = /** @class */ (function () {
1108
1676
  var scriptNames = scripts.map(function (s) { return s.name; });
1109
1677
  // GET /admin/scripts/runs — Paginated history of script runs (BackgroundTasks)
1110
1678
  router.get("/runs", (0, api_1.asyncHandler)(function (req, res) { return __awaiter(_this, void 0, void 0, function () {
1111
- var user, limit, page, skip, requestedName, taskTypeFilter, query, _a, tasks, total, data;
1112
- return __generator(this, function (_b) {
1113
- switch (_b.label) {
1679
+ var user, _a, limit, page, skip, requestedName, taskTypeFilter, query, _b, tasks, total, data;
1680
+ return __generator(this, function (_c) {
1681
+ switch (_c.label) {
1114
1682
  case 0:
1115
1683
  user = req.user;
1116
- if (!(user === null || user === void 0 ? void 0 : user.admin)) {
1684
+ _a = !user;
1685
+ if (_a) return [3 /*break*/, 2];
1686
+ return [4 /*yield*/, this.hasScriptPermission(user, "viewBackgroundTasks")];
1687
+ case 1:
1688
+ _a = !(_c.sent());
1689
+ _c.label = 2;
1690
+ case 2:
1691
+ if (_a) {
1117
1692
  throw new api_1.APIError({ status: 403, title: "Only admins can view run history" });
1118
1693
  }
1119
1694
  limit = Math.min(Math.max(Number(req.query.limit) || 25, 1), 100);
@@ -1138,8 +1713,8 @@ var AdminApp = /** @class */ (function () {
1138
1713
  .lean(),
1139
1714
  api_1.BackgroundTask.countDocuments(query),
1140
1715
  ])];
1141
- case 1:
1142
- _a = __read.apply(void 0, [_b.sent(), 2]), tasks = _a[0], total = _a[1];
1716
+ case 3:
1717
+ _b = __read.apply(void 0, [_c.sent(), 2]), tasks = _b[0], total = _b[1];
1143
1718
  data = tasks.map(function (task) {
1144
1719
  var _a;
1145
1720
  var createdBy = task.createdBy;
@@ -1156,15 +1731,22 @@ var AdminApp = /** @class */ (function () {
1156
1731
  }); }));
1157
1732
  // POST /admin/scripts/:name/run — Execute a script
1158
1733
  router.post("/:name/run", (0, api_1.asyncHandler)(function (req, res) { return __awaiter(_this, void 0, void 0, function () {
1159
- var user, script, isWetRun, argValues, _a, _b, _c, key, value, rawBody, bodyValues, _d, _e, _f, key, value, _g, args, argErrors, now, task, err_5, detail, ctx;
1160
- var e_15, _h, e_16, _j;
1734
+ var user, _a, script, isWetRun, argValues, _b, _c, _d, key, value, rawBody, bodyValues, _e, _f, _g, key, value, _h, args, argErrors, now, task, err_5, detail, ctx;
1735
+ var e_19, _j, e_20, _k;
1161
1736
  var _this = this;
1162
- var _k, _l;
1163
- return __generator(this, function (_m) {
1164
- switch (_m.label) {
1737
+ var _l, _m;
1738
+ return __generator(this, function (_o) {
1739
+ switch (_o.label) {
1165
1740
  case 0:
1166
1741
  user = req.user;
1167
- if (!(user === null || user === void 0 ? void 0 : user.admin)) {
1742
+ _a = !user;
1743
+ if (_a) return [3 /*break*/, 2];
1744
+ return [4 /*yield*/, this.hasScriptPermission(user, "runScripts")];
1745
+ case 1:
1746
+ _a = !(_o.sent());
1747
+ _o.label = 2;
1748
+ case 2:
1749
+ if (_a) {
1168
1750
  throw new api_1.APIError({ status: 403, title: "Only admins can run scripts" });
1169
1751
  }
1170
1752
  script = scriptsByName.get(req.params.name);
@@ -1174,20 +1756,20 @@ var AdminApp = /** @class */ (function () {
1174
1756
  isWetRun = req.query.wetRun === "true";
1175
1757
  argValues = {};
1176
1758
  try {
1177
- for (_a = __values(Object.entries(req.query)), _b = _a.next(); !_b.done; _b = _a.next()) {
1178
- _c = __read(_b.value, 2), key = _c[0], value = _c[1];
1759
+ for (_b = __values(Object.entries(req.query)), _c = _b.next(); !_c.done; _c = _b.next()) {
1760
+ _d = __read(_c.value, 2), key = _d[0], value = _d[1];
1179
1761
  if (scriptCli_1.RESERVED_SCRIPT_FLAGS.includes(key) || value === undefined) {
1180
1762
  continue;
1181
1763
  }
1182
1764
  argValues[key] = value;
1183
1765
  }
1184
1766
  }
1185
- catch (e_15_1) { e_15 = { error: e_15_1 }; }
1767
+ catch (e_19_1) { e_19 = { error: e_19_1 }; }
1186
1768
  finally {
1187
1769
  try {
1188
- if (_b && !_b.done && (_h = _a.return)) _h.call(_a);
1770
+ if (_c && !_c.done && (_j = _b.return)) _j.call(_b);
1189
1771
  }
1190
- finally { if (e_15) throw e_15.error; }
1772
+ finally { if (e_19) throw e_19.error; }
1191
1773
  }
1192
1774
  rawBody = req.body && typeof req.body === "object" && !Array.isArray(req.body)
1193
1775
  ? req.body
@@ -1196,25 +1778,25 @@ var AdminApp = /** @class */ (function () {
1196
1778
  ? rawBody.args
1197
1779
  : rawBody;
1198
1780
  try {
1199
- for (_d = __values(Object.entries(bodyValues)), _e = _d.next(); !_e.done; _e = _d.next()) {
1200
- _f = __read(_e.value, 2), key = _f[0], value = _f[1];
1781
+ for (_e = __values(Object.entries(bodyValues)), _f = _e.next(); !_f.done; _f = _e.next()) {
1782
+ _g = __read(_f.value, 2), key = _g[0], value = _g[1];
1201
1783
  if (scriptCli_1.RESERVED_SCRIPT_FLAGS.includes(key)) {
1202
1784
  continue;
1203
1785
  }
1204
1786
  argValues[key] = value;
1205
1787
  }
1206
1788
  }
1207
- catch (e_16_1) { e_16 = { error: e_16_1 }; }
1789
+ catch (e_20_1) { e_20 = { error: e_20_1 }; }
1208
1790
  finally {
1209
1791
  try {
1210
- if (_e && !_e.done && (_j = _d.return)) _j.call(_d);
1792
+ if (_f && !_f.done && (_k = _e.return)) _k.call(_e);
1211
1793
  }
1212
- finally { if (e_16) throw e_16.error; }
1794
+ finally { if (e_20) throw e_20.error; }
1213
1795
  }
1214
- _g = (0, api_1.createScriptArgs)({
1215
- defs: (_k = script.args) !== null && _k !== void 0 ? _k : [],
1796
+ _h = (0, api_1.createScriptArgs)({
1797
+ defs: (_l = script.args) !== null && _l !== void 0 ? _l : [],
1216
1798
  values: argValues,
1217
- }), args = _g.args, argErrors = _g.errors;
1799
+ }), args = _h.args, argErrors = _h.errors;
1218
1800
  if (argErrors.length > 0) {
1219
1801
  throw new api_1.APIError({
1220
1802
  detail: argErrors.join("; "),
@@ -1223,25 +1805,25 @@ var AdminApp = /** @class */ (function () {
1223
1805
  });
1224
1806
  }
1225
1807
  now = luxon_1.DateTime.now().toJSDate();
1226
- _m.label = 1;
1227
- case 1:
1228
- _m.trys.push([1, 3, , 4]);
1808
+ _o.label = 3;
1809
+ case 3:
1810
+ _o.trys.push([3, 5, , 6]);
1229
1811
  return [4 /*yield*/, api_1.BackgroundTask.create({
1230
1812
  createdBy: user._id,
1231
1813
  isDryRun: !isWetRun,
1232
1814
  logs: [
1233
- { level: "info", message: "Script started by ".concat((_l = user.name) !== null && _l !== void 0 ? _l : "admin"), timestamp: now },
1815
+ { level: "info", message: "Script started by ".concat((_m = user.name) !== null && _m !== void 0 ? _m : "admin"), timestamp: now },
1234
1816
  ],
1235
1817
  progress: { message: "Starting...", percentage: 0, stage: "Queued" },
1236
1818
  startedAt: now,
1237
1819
  status: "running",
1238
1820
  taskType: script.name,
1239
1821
  })];
1240
- case 2:
1241
- task = (_m.sent());
1242
- return [3 /*break*/, 4];
1243
- case 3:
1244
- err_5 = _m.sent();
1822
+ case 4:
1823
+ task = (_o.sent());
1824
+ return [3 /*break*/, 6];
1825
+ case 5:
1826
+ err_5 = _o.sent();
1245
1827
  detail = err_5 instanceof Error ? err_5.message : String(err_5);
1246
1828
  api_1.logger.error("Failed to create background task for ".concat(script.name, ": ").concat(detail));
1247
1829
  throw new api_1.APIError({
@@ -1249,7 +1831,7 @@ var AdminApp = /** @class */ (function () {
1249
1831
  status: 500,
1250
1832
  title: "Failed to create background task for script: ".concat(script.name),
1251
1833
  });
1252
- case 4:
1834
+ case 6:
1253
1835
  ctx = {
1254
1836
  addLog: function (level, message) { return __awaiter(_this, void 0, void 0, function () {
1255
1837
  var current;
@@ -1349,26 +1931,33 @@ var AdminApp = /** @class */ (function () {
1349
1931
  }); }));
1350
1932
  // GET /admin/scripts/tasks/:id — Poll task status
1351
1933
  router.get("/tasks/:id", (0, api_1.asyncHandler)(function (req, res) { return __awaiter(_this, void 0, void 0, function () {
1352
- var user, task, err_7, detail;
1353
- return __generator(this, function (_a) {
1354
- switch (_a.label) {
1934
+ var user, _a, task, err_7, detail;
1935
+ return __generator(this, function (_b) {
1936
+ switch (_b.label) {
1355
1937
  case 0:
1356
1938
  user = req.user;
1357
- if (!(user === null || user === void 0 ? void 0 : user.admin)) {
1358
- throw new api_1.APIError({ status: 403, title: "Only admins can view tasks" });
1359
- }
1360
- _a.label = 1;
1939
+ _a = !user;
1940
+ if (_a) return [3 /*break*/, 2];
1941
+ return [4 /*yield*/, this.hasScriptPermission(user, "viewBackgroundTasks")];
1361
1942
  case 1:
1362
- _a.trys.push([1, 3, , 4]);
1363
- return [4 /*yield*/, api_1.BackgroundTask.findById(req.params.id)];
1943
+ _a = !(_b.sent());
1944
+ _b.label = 2;
1364
1945
  case 2:
1365
- task = _a.sent();
1366
- return [3 /*break*/, 4];
1946
+ if (_a) {
1947
+ throw new api_1.APIError({ status: 403, title: "Only admins can view tasks" });
1948
+ }
1949
+ _b.label = 3;
1367
1950
  case 3:
1368
- err_7 = _a.sent();
1951
+ _b.trys.push([3, 5, , 6]);
1952
+ return [4 /*yield*/, api_1.BackgroundTask.findById(req.params.id)];
1953
+ case 4:
1954
+ task = _b.sent();
1955
+ return [3 /*break*/, 6];
1956
+ case 5:
1957
+ err_7 = _b.sent();
1369
1958
  detail = err_7 instanceof Error ? err_7.message : String(err_7);
1370
1959
  throw new api_1.APIError({ detail: detail, status: 400, title: "Invalid task ID" });
1371
- case 4:
1960
+ case 6:
1372
1961
  if (!task) {
1373
1962
  throw new api_1.APIError({ status: 404, title: "Task not found" });
1374
1963
  }
@@ -1378,27 +1967,34 @@ var AdminApp = /** @class */ (function () {
1378
1967
  }); }));
1379
1968
  // DELETE /admin/scripts/tasks/:id — Cancel a running task
1380
1969
  router.delete("/tasks/:id", (0, api_1.asyncHandler)(function (req, res) { return __awaiter(_this, void 0, void 0, function () {
1381
- var user, task, err_8, detail, cancelled;
1382
- var _a;
1383
- return __generator(this, function (_b) {
1384
- switch (_b.label) {
1970
+ var user, _a, task, err_8, detail, cancelled;
1971
+ var _b;
1972
+ return __generator(this, function (_c) {
1973
+ switch (_c.label) {
1385
1974
  case 0:
1386
1975
  user = req.user;
1387
- if (!(user === null || user === void 0 ? void 0 : user.admin)) {
1388
- throw new api_1.APIError({ status: 403, title: "Only admins can cancel tasks" });
1389
- }
1390
- _b.label = 1;
1976
+ _a = !user;
1977
+ if (_a) return [3 /*break*/, 2];
1978
+ return [4 /*yield*/, this.hasScriptPermission(user, "runScripts")];
1391
1979
  case 1:
1392
- _b.trys.push([1, 3, , 4]);
1393
- return [4 /*yield*/, api_1.BackgroundTask.findById(req.params.id)];
1980
+ _a = !(_c.sent());
1981
+ _c.label = 2;
1394
1982
  case 2:
1395
- task = _b.sent();
1396
- return [3 /*break*/, 4];
1983
+ if (_a) {
1984
+ throw new api_1.APIError({ status: 403, title: "Only admins can cancel tasks" });
1985
+ }
1986
+ _c.label = 3;
1397
1987
  case 3:
1398
- err_8 = _b.sent();
1988
+ _c.trys.push([3, 5, , 6]);
1989
+ return [4 /*yield*/, api_1.BackgroundTask.findById(req.params.id)];
1990
+ case 4:
1991
+ task = _c.sent();
1992
+ return [3 /*break*/, 6];
1993
+ case 5:
1994
+ err_8 = _c.sent();
1399
1995
  detail = err_8 instanceof Error ? err_8.message : String(err_8);
1400
1996
  throw new api_1.APIError({ detail: detail, status: 400, title: "Invalid task ID" });
1401
- case 4:
1997
+ case 6:
1402
1998
  if (!task) {
1403
1999
  throw new api_1.APIError({ status: 404, title: "Task not found" });
1404
2000
  }
@@ -1412,7 +2008,7 @@ var AdminApp = /** @class */ (function () {
1412
2008
  $push: {
1413
2009
  logs: {
1414
2010
  level: "info",
1415
- message: "Task cancelled by ".concat((_a = user.name) !== null && _a !== void 0 ? _a : "admin"),
2011
+ message: "Task cancelled by ".concat((_b = user.name) !== null && _b !== void 0 ? _b : "admin"),
1416
2012
  timestamp: luxon_1.DateTime.now().toJSDate(),
1417
2013
  },
1418
2014
  },
@@ -1421,8 +2017,8 @@ var AdminApp = /** @class */ (function () {
1421
2017
  status: "cancelled",
1422
2018
  },
1423
2019
  }, { returnDocument: "after" })];
1424
- case 5:
1425
- cancelled = _b.sent();
2020
+ case 7:
2021
+ cancelled = _c.sent();
1426
2022
  if (!cancelled) {
1427
2023
  throw new api_1.APIError({
1428
2024
  status: 409,