@terreno/admin-backend 57.0.0 → 57.2.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 +25 -4
  3. package/dist/adminApp.js +1195 -269
  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 +276 -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 +10 -1
  16. package/dist/index.js +16 -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 +131 -0
  21. package/dist/routePath.d.ts +2 -0
  22. package/dist/routePath.js +18 -0
  23. package/package.json +5 -4
  24. package/src/adminApp.models.test.ts +1321 -1
  25. package/src/adminApp.test.ts +35 -1
  26. package/src/adminApp.ts +873 -102
  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 +207 -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 +36 -1
  40. package/src/legacy.test.ts +34 -0
  41. package/src/legacy.ts +63 -0
  42. package/src/resolvedAdminModel.ts +115 -0
  43. package/src/routePath.ts +14 -0
package/dist/adminApp.js CHANGED
@@ -46,6 +46,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
46
46
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
47
47
  }
48
48
  };
49
+ var __rest = (this && this.__rest) || function (s, e) {
50
+ var t = {};
51
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
52
+ t[p] = s[p];
53
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
54
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
55
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
56
+ t[p[i]] = s[p[i]];
57
+ }
58
+ return t;
59
+ };
49
60
  var __values = (this && this.__values) || function(o) {
50
61
  var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
51
62
  if (m) return m.call(o);
@@ -86,48 +97,166 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
86
97
  return (mod && mod.__esModule) ? mod : { "default": mod };
87
98
  };
88
99
  Object.defineProperty(exports, "__esModule", { value: true });
89
- exports.AdminApp = exports.getArrayEmbeddedSchemaType = void 0;
100
+ exports.AdminApp = exports.getArrayEmbeddedSchemaType = exports.adminOwnedBy = void 0;
90
101
  var api_1 = require("@terreno/api");
91
102
  var express_1 = __importDefault(require("express"));
92
103
  var luxon_1 = require("luxon");
93
104
  var mongoose_1 = __importDefault(require("mongoose"));
105
+ var adminConfigIdentity_1 = require("./adminConfigIdentity");
106
+ var adminTextSearch_1 = require("./adminTextSearch");
94
107
  var adminUiV2_1 = require("./adminUiV2");
108
+ var aggregateAdmin_1 = require("./aggregateAdmin");
109
+ var filterParser_1 = require("./filterParser");
95
110
  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;
111
+ /**
112
+ * Builds an ownership check for writeOwned admin access. The field may contain an id
113
+ * directly or a populated document with `_id`.
114
+ */
115
+ var adminOwnedBy = function (field) {
116
+ return function (_a) {
117
+ var _b;
118
+ var instance = _a.instance, user = _a.user;
119
+ var value = instance === null || instance === void 0 ? void 0 : instance[field];
120
+ var ownerId = (_b = value === null || value === void 0 ? void 0 : value._id) !== null && _b !== void 0 ? _b : value;
121
+ return ownerId != null && String(ownerId) === String(user.id);
122
+ };
104
123
  };
105
- var removeHiddenFields = function (value, hiddenFieldSet) {
124
+ exports.adminOwnedBy = adminOwnedBy;
125
+ var buildAllModelAdminsMap = function (models) {
106
126
  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 = {};
127
+ var map = {};
115
128
  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
- }
129
+ for (var models_1 = __values(models), models_1_1 = models_1.next(); !models_1_1.done; models_1_1 = models_1.next()) {
130
+ var config = models_1_1.value;
131
+ map[config.model.modelName] = config.admin;
121
132
  }
122
133
  }
123
134
  catch (e_1_1) { e_1 = { error: e_1_1 }; }
124
135
  finally {
125
136
  try {
126
- if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
137
+ if (models_1_1 && !models_1_1.done && (_a = models_1.return)) _a.call(models_1);
127
138
  }
128
139
  finally { if (e_1) throw e_1.error; }
129
140
  }
130
- return nextValue;
141
+ return map;
142
+ };
143
+ var scrubAdminResponse = function (value, config, allModelAdmins) {
144
+ return (0, api_1.scrubAdminFields)(value, {
145
+ admin: config.admin,
146
+ allModelAdmins: allModelAdmins,
147
+ schema: config.model.schema,
148
+ });
149
+ };
150
+ var buildAdminListQueryFilter = function (config,
151
+ /** Resolved (possibly derived) search fields from `/admin/config`, not just explicit config. */
152
+ resolvedSearchFields) {
153
+ var _a;
154
+ var base = config.queryFilter;
155
+ var searchFields = (_a = resolvedSearchFields !== null && resolvedSearchFields !== void 0 ? resolvedSearchFields : config.searchFields) !== null && _a !== void 0 ? _a : [];
156
+ return function (user, query) { return __awaiter(void 0, void 0, void 0, function () {
157
+ var clientQuery, _a, consumedKeys, errors, filter, consumedKeys_1, consumedKeys_1_1, key, rawSearch, searchClause, merged, baseResult, result;
158
+ var e_2, _b, _c;
159
+ var _d;
160
+ return __generator(this, function (_e) {
161
+ switch (_e.label) {
162
+ case 0:
163
+ clientQuery = __assign({}, (query !== null && query !== void 0 ? query : {}));
164
+ _a = (0, filterParser_1.parseAdminListFilters)(clientQuery, (_d = config.filters) !== null && _d !== void 0 ? _d : []), consumedKeys = _a.consumedKeys, errors = _a.errors, filter = _a.filter;
165
+ if (Object.keys(errors).length > 0) {
166
+ throw new api_1.APIError({
167
+ detail: JSON.stringify(errors),
168
+ status: 400,
169
+ title: "Invalid filter",
170
+ });
171
+ }
172
+ try {
173
+ for (consumedKeys_1 = __values(consumedKeys), consumedKeys_1_1 = consumedKeys_1.next(); !consumedKeys_1_1.done; consumedKeys_1_1 = consumedKeys_1.next()) {
174
+ key = consumedKeys_1_1.value;
175
+ delete clientQuery[key];
176
+ }
177
+ }
178
+ catch (e_2_1) { e_2 = { error: e_2_1 }; }
179
+ finally {
180
+ try {
181
+ if (consumedKeys_1_1 && !consumedKeys_1_1.done && (_b = consumedKeys_1.return)) _b.call(consumedKeys_1);
182
+ }
183
+ finally { if (e_2) throw e_2.error; }
184
+ }
185
+ rawSearch = clientQuery[adminTextSearch_1.ADMIN_LIST_SEARCH_PARAM];
186
+ delete clientQuery[adminTextSearch_1.ADMIN_LIST_SEARCH_PARAM];
187
+ searchClause = typeof rawSearch === "string"
188
+ ? (0, adminTextSearch_1.buildAdminPartialSearchFilter)({
189
+ model: config.model,
190
+ q: rawSearch,
191
+ searchFields: searchFields,
192
+ })
193
+ : undefined;
194
+ merged = __assign(__assign({}, clientQuery), filter);
195
+ if (!base) return [3 /*break*/, 2];
196
+ return [4 /*yield*/, base(user, merged)];
197
+ case 1:
198
+ baseResult = _e.sent();
199
+ if (baseResult === null) {
200
+ return [2 /*return*/, null];
201
+ }
202
+ merged = __assign(__assign({}, merged), baseResult);
203
+ _e.label = 2;
204
+ case 2:
205
+ result = (0, adminTextSearch_1.andMongoFilters)(merged, searchClause);
206
+ return [2 /*return*/, __assign(__assign({}, result), (_c = {}, _c[adminTextSearch_1.ADMIN_LIST_SEARCH_PARAM] = undefined, _c))];
207
+ }
208
+ });
209
+ }); };
210
+ };
211
+ var ADMIN_TIMESTAMP_SORT_FIELDS = ["created", "createdAt", "updated", "updatedAt"];
212
+ var sortTokensToFields = function (sort) {
213
+ if (!sort) {
214
+ return [];
215
+ }
216
+ var raw = Array.isArray(sort) ? sort.join(" ") : sort;
217
+ return raw
218
+ .trim()
219
+ .split(/\s+/)
220
+ .map(function (token) { return token.replace(/^-/, ""); })
221
+ .filter(function (field) { return field.length > 0; });
222
+ };
223
+ var resolveAdminSortableFields = function (_a) {
224
+ var defaultSort = _a.defaultSort, listDisplay = _a.listDisplay, sortableFields = _a.sortableFields;
225
+ return __spreadArray([], __read(new Set(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((sortableFields !== null && sortableFields !== void 0 ? sortableFields : listDisplay)), false), [
226
+ "_id"
227
+ ], false), __read(ADMIN_TIMESTAMP_SORT_FIELDS), false), __read(sortTokensToFields(defaultSort)), false))), false);
228
+ };
229
+ var validateAdminSortParam = function (sortableFields) {
230
+ return function (req, _res, next) {
231
+ var e_3, _a;
232
+ var sort = req.query.sort;
233
+ if (typeof sort !== "string" || !sort.trim()) {
234
+ next();
235
+ return;
236
+ }
237
+ var tokens = sort.trim().split(/\s+/);
238
+ try {
239
+ for (var tokens_1 = __values(tokens), tokens_1_1 = tokens_1.next(); !tokens_1_1.done; tokens_1_1 = tokens_1.next()) {
240
+ var token = tokens_1_1.value;
241
+ var field = token.replace(/^-/, "");
242
+ if (!sortableFields.includes(field)) {
243
+ throw new api_1.APIError({
244
+ detail: field,
245
+ status: 400,
246
+ title: "Invalid sort field",
247
+ });
248
+ }
249
+ }
250
+ }
251
+ catch (e_3_1) { e_3 = { error: e_3_1 }; }
252
+ finally {
253
+ try {
254
+ if (tokens_1_1 && !tokens_1_1.done && (_a = tokens_1.return)) _a.call(tokens_1);
255
+ }
256
+ finally { if (e_3) throw e_3.error; }
257
+ }
258
+ next();
259
+ };
131
260
  };
132
261
  var auditDocumentToPlain = function (value) {
133
262
  if (value &&
@@ -139,7 +268,7 @@ var auditDocumentToPlain = function (value) {
139
268
  return value;
140
269
  };
141
270
  var auditLabelFromListFields = function (doc, listFields) {
142
- var e_2, _a;
271
+ var e_4, _a;
143
272
  try {
144
273
  for (var listFields_1 = __values(listFields), listFields_1_1 = listFields_1.next(); !listFields_1_1.done; listFields_1_1 = listFields_1.next()) {
145
274
  var key = listFields_1_1.value;
@@ -150,16 +279,31 @@ var auditLabelFromListFields = function (doc, listFields) {
150
279
  return String(fieldValue);
151
280
  }
152
281
  }
153
- catch (e_2_1) { e_2 = { error: e_2_1 }; }
282
+ catch (e_4_1) { e_4 = { error: e_4_1 }; }
154
283
  finally {
155
284
  try {
156
285
  if (listFields_1_1 && !listFields_1_1.done && (_a = listFields_1.return)) _a.call(listFields_1);
157
286
  }
158
- finally { if (e_2) throw e_2.error; }
287
+ finally { if (e_4) throw e_4.error; }
159
288
  }
160
289
  var id = doc._id;
161
290
  return id != null ? String(id) : undefined;
162
291
  };
292
+ var coerceAdminFlag = function (value) {
293
+ if (value === true || value === 1 || value === "1" || value === "true" || value === "yes") {
294
+ return true;
295
+ }
296
+ if (value === false ||
297
+ value === 0 ||
298
+ value === "0" ||
299
+ value === "false" ||
300
+ value === "no" ||
301
+ value === "" ||
302
+ value == null) {
303
+ return false;
304
+ }
305
+ throw new api_1.APIError({ status: 400, title: "admin must be a boolean" });
306
+ };
163
307
  var auditActorId = function (request) {
164
308
  var user = request.user;
165
309
  if (!user || user._id == null) {
@@ -176,7 +320,7 @@ var getArrayEmbeddedSchemaType = function (schemaPath) {
176
320
  };
177
321
  exports.getArrayEmbeddedSchemaType = getArrayEmbeddedSchemaType;
178
322
  var extractFieldMeta = function (properties, required) {
179
- var e_3, _a;
323
+ var e_5, _a;
180
324
  var _b, _c, _d;
181
325
  var fields = {};
182
326
  try {
@@ -213,12 +357,12 @@ var extractFieldMeta = function (properties, required) {
213
357
  }
214
358
  }
215
359
  }
216
- catch (e_3_1) { e_3 = { error: e_3_1 }; }
360
+ catch (e_5_1) { e_5 = { error: e_5_1 }; }
217
361
  finally {
218
362
  try {
219
363
  if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
220
364
  }
221
- finally { if (e_3) throw e_3.error; }
365
+ finally { if (e_5) throw e_5.error; }
222
366
  }
223
367
  return fields;
224
368
  };
@@ -282,6 +426,184 @@ var AdminApp = /** @class */ (function () {
282
426
  function AdminApp(options) {
283
427
  this.options = options;
284
428
  }
429
+ AdminApp.prototype.adminAccessPermissions = function () {
430
+ if (this.options.accessControl) {
431
+ return [this.options.accessControl.permission({ admin: [api_1.ADMIN_PAGE_ACTION] })];
432
+ }
433
+ return [api_1.Permissions.IsAdmin];
434
+ };
435
+ AdminApp.prototype.hasScriptPermission = function (user, action) {
436
+ return __awaiter(this, void 0, void 0, function () {
437
+ var result;
438
+ return __generator(this, function (_a) {
439
+ switch (_a.label) {
440
+ case 0:
441
+ if (!this.options.accessControl) {
442
+ return [2 /*return*/, Boolean(user === null || user === void 0 ? void 0 : user.admin)];
443
+ }
444
+ return [4 /*yield*/, this.options.accessControl.can({
445
+ permissions: { admin: [action] },
446
+ user: user,
447
+ })];
448
+ case 1:
449
+ result = _a.sent();
450
+ return [2 /*return*/, result.allowed];
451
+ }
452
+ });
453
+ });
454
+ };
455
+ AdminApp.prototype.hasConfigurationPermission = function (user, action) {
456
+ return __awaiter(this, void 0, void 0, function () {
457
+ var result;
458
+ return __generator(this, function (_a) {
459
+ switch (_a.label) {
460
+ case 0:
461
+ if (!this.options.accessControl) {
462
+ return [2 /*return*/, Boolean(user === null || user === void 0 ? void 0 : user.admin)];
463
+ }
464
+ return [4 /*yield*/, this.options.accessControl.can({
465
+ permissions: { configuration: [action] },
466
+ user: user,
467
+ })];
468
+ case 1:
469
+ result = _a.sent();
470
+ return [2 /*return*/, result.allowed];
471
+ }
472
+ });
473
+ });
474
+ };
475
+ AdminApp.prototype.canAnyResourceAction = function (user, resource, actions, instance) {
476
+ return __awaiter(this, void 0, void 0, function () {
477
+ var accessControl, actions_1, actions_1_1, action, result, e_6_1;
478
+ var e_6, _a, _b;
479
+ return __generator(this, function (_c) {
480
+ switch (_c.label) {
481
+ case 0:
482
+ accessControl = this.options.accessControl;
483
+ if (!accessControl || !user) {
484
+ return [2 /*return*/, Boolean(user === null || user === void 0 ? void 0 : user.admin)];
485
+ }
486
+ _c.label = 1;
487
+ case 1:
488
+ _c.trys.push([1, 6, 7, 8]);
489
+ actions_1 = __values(actions), actions_1_1 = actions_1.next();
490
+ _c.label = 2;
491
+ case 2:
492
+ if (!!actions_1_1.done) return [3 /*break*/, 5];
493
+ action = actions_1_1.value;
494
+ return [4 /*yield*/, accessControl.can({
495
+ doc: instance,
496
+ permissions: (_b = {}, _b[resource] = [action], _b),
497
+ user: user,
498
+ })];
499
+ case 3:
500
+ result = _c.sent();
501
+ if (result.allowed) {
502
+ return [2 /*return*/, true];
503
+ }
504
+ _c.label = 4;
505
+ case 4:
506
+ actions_1_1 = actions_1.next();
507
+ return [3 /*break*/, 2];
508
+ case 5: return [3 /*break*/, 8];
509
+ case 6:
510
+ e_6_1 = _c.sent();
511
+ e_6 = { error: e_6_1 };
512
+ return [3 /*break*/, 8];
513
+ case 7:
514
+ try {
515
+ if (actions_1_1 && !actions_1_1.done && (_a = actions_1.return)) _a.call(actions_1);
516
+ }
517
+ finally { if (e_6) throw e_6.error; }
518
+ return [7 /*endfinally*/];
519
+ case 8: return [2 /*return*/, false];
520
+ }
521
+ });
522
+ });
523
+ };
524
+ AdminApp.prototype.adminResource = function (config) {
525
+ var _a;
526
+ var accessControl = this.options.accessControl;
527
+ var explicit = (_a = config.adminAccess) === null || _a === void 0 ? void 0 : _a.resource;
528
+ if (explicit) {
529
+ return explicit;
530
+ }
531
+ var standard = "admin".concat(config.model.modelName);
532
+ if (accessControl === null || accessControl === void 0 ? void 0 : accessControl.statements[standard]) {
533
+ return standard;
534
+ }
535
+ return "".concat(config.model.modelName.charAt(0).toLowerCase()).concat(config.model.modelName.slice(1));
536
+ };
537
+ AdminApp.prototype.isAdminModelOwned = function (config, user, instance) {
538
+ return __awaiter(this, void 0, void 0, function () {
539
+ var owner, ownerId;
540
+ var _a, _b;
541
+ return __generator(this, function (_c) {
542
+ if ((_a = config.adminAccess) === null || _a === void 0 ? void 0 : _a.isOwned) {
543
+ return [2 /*return*/, config.adminAccess.isOwned({ instance: instance, user: user })];
544
+ }
545
+ owner = instance === null || instance === void 0 ? void 0 : instance.ownerId;
546
+ ownerId = (_b = owner === null || owner === void 0 ? void 0 : owner._id) !== null && _b !== void 0 ? _b : owner;
547
+ return [2 /*return*/, ownerId != null && String(ownerId) === String(user.id)];
548
+ });
549
+ });
550
+ };
551
+ AdminApp.prototype.resourceActionPermissions = function (config, action) {
552
+ var _a;
553
+ var _this = this;
554
+ var _b;
555
+ var shell = this.adminAccessPermissions();
556
+ var accessControl = this.options.accessControl;
557
+ if (!accessControl) {
558
+ return shell;
559
+ }
560
+ if ((_b = config.adminAccess) === null || _b === void 0 ? void 0 : _b.authorize) {
561
+ return __spreadArray(__spreadArray([], __read(shell), false), [
562
+ function (_method, user, instance) { return __awaiter(_this, void 0, void 0, function () { var _a, _b, _c; return __generator(this, function (_d) {
563
+ return [2 /*return*/, (_c = (_b = (_a = config.adminAccess) === null || _a === void 0 ? void 0 : _a.authorize) === null || _b === void 0 ? void 0 : _b.call(_a, { action: action, instance: instance, user: user })) !== null && _c !== void 0 ? _c : false];
564
+ }); }); },
565
+ ], false);
566
+ }
567
+ var resource = this.adminResource(config);
568
+ var knownActions = accessControl.statements[resource];
569
+ if (!knownActions) {
570
+ return [];
571
+ }
572
+ var hasStandardAccess = knownActions.includes("write") || knownActions.includes("writeOwned");
573
+ if (hasStandardAccess) {
574
+ return __spreadArray(__spreadArray([], __read(shell), false), [
575
+ function (_method, user, instance) { return __awaiter(_this, void 0, void 0, function () {
576
+ return __generator(this, function (_a) {
577
+ switch (_a.label) {
578
+ case 0:
579
+ if (!user) {
580
+ return [2 /*return*/, false];
581
+ }
582
+ if (action === "list" || action === "read") {
583
+ return [2 /*return*/, this.canAnyResourceAction(user, resource, ["read"], instance)];
584
+ }
585
+ return [4 /*yield*/, this.canAnyResourceAction(user, resource, ["write"], instance)];
586
+ case 1:
587
+ if (_a.sent()) {
588
+ return [2 /*return*/, true];
589
+ }
590
+ return [4 /*yield*/, this.canAnyResourceAction(user, resource, ["writeOwned"], instance)];
591
+ case 2:
592
+ if (!(_a.sent())) {
593
+ return [2 /*return*/, false];
594
+ }
595
+ // writeOwned always allows create. Ownership applies to update/delete.
596
+ if (action === "create" || instance === undefined) {
597
+ return [2 /*return*/, true];
598
+ }
599
+ return [2 /*return*/, this.isAdminModelOwned(config, user, instance)];
600
+ }
601
+ });
602
+ }); },
603
+ ], false);
604
+ }
605
+ return __spreadArray(__spreadArray([], __read(shell), false), [accessControl.permission((_a = {}, _a[resource] = [action], _a))], false);
606
+ };
285
607
  /**
286
608
  * Register admin routes with the Express application.
287
609
  *
@@ -298,13 +620,18 @@ var AdminApp = /** @class */ (function () {
298
620
  *
299
621
  * @param app - The Express application instance to register with
300
622
  */
301
- AdminApp.prototype.register = function (app, openApi) {
302
- var e_4, _a, e_5, _b;
623
+ AdminApp.prototype.register = function (app, openApi, terrenoApp) {
624
+ var e_7, _a, e_8, _b;
303
625
  var _this = this;
304
- var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
626
+ var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
305
627
  var basePath = (_c = this.options.basePath) !== null && _c !== void 0 ? _c : "/admin";
306
628
  var openApiMw = openApi;
307
- var modelConfigs = this.options.models;
629
+ var aggregated = (0, aggregateAdmin_1.aggregateFromTerrenoApp)({
630
+ legacyModels: (_d = this.options.models) !== null && _d !== void 0 ? _d : [],
631
+ terrenoApp: terrenoApp,
632
+ });
633
+ var modelConfigs = aggregated.models;
634
+ var allModelAdmins = buildAllModelAdminsMap(modelConfigs);
308
635
  var onAdminAudit = this.options.onAdminAudit;
309
636
  /** Audit is best-effort: failures must not change HTTP outcomes after mutations succeed. */
310
637
  var safeOnAdminAudit = function (request, event) { return __awaiter(_this, void 0, void 0, function () {
@@ -332,8 +659,13 @@ var AdminApp = /** @class */ (function () {
332
659
  });
333
660
  }); };
334
661
  // Build config response with field metadata from Mongoose schemas
335
- var configModels = modelConfigs.map(function (config) {
336
- var e_6, _a, e_7, _b;
662
+ var configNames = (0, adminConfigIdentity_1.assignUniqueAdminConfigNames)(modelConfigs.map(function (config) { return ({
663
+ modelName: config.model.modelName,
664
+ routePath: config.routePath,
665
+ source: config.source,
666
+ }); }));
667
+ var configModels = modelConfigs.map(function (config, configIndex) {
668
+ var e_9, _a, e_10, _b;
337
669
  var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
338
670
  var _v = (0, api_1.getOpenApiSpecForModel)(config.model), properties = _v.properties, required = _v.required;
339
671
  var hiddenFieldSet = new Set((_c = config.hiddenFields) !== null && _c !== void 0 ? _c : []);
@@ -384,12 +716,12 @@ var AdminApp = /** @class */ (function () {
384
716
  }
385
717
  }
386
718
  }
387
- catch (e_6_1) { e_6 = { error: e_6_1 }; }
719
+ catch (e_9_1) { e_9 = { error: e_9_1 }; }
388
720
  finally {
389
721
  try {
390
722
  if (_x && !_x.done && (_a = _w.return)) _a.call(_w);
391
723
  }
392
- finally { if (e_6) throw e_6.error; }
724
+ finally { if (e_9) throw e_9.error; }
393
725
  }
394
726
  // Apply field overrides (e.g., widget: "markdown")
395
727
  if (config.fieldOverrides) {
@@ -401,12 +733,12 @@ var AdminApp = /** @class */ (function () {
401
733
  }
402
734
  }
403
735
  }
404
- catch (e_7_1) { e_7 = { error: e_7_1 }; }
736
+ catch (e_10_1) { e_10 = { error: e_10_1 }; }
405
737
  finally {
406
738
  try {
407
739
  if (_0 && !_0.done && (_b = _z.return)) _b.call(_z);
408
740
  }
409
- finally { if (e_7) throw e_7.error; }
741
+ finally { if (e_10) throw e_10.error; }
410
742
  }
411
743
  }
412
744
  var readonlyFields = (_g = config.readonlyFields) !== null && _g !== void 0 ? _g : [];
@@ -414,29 +746,33 @@ var AdminApp = /** @class */ (function () {
414
746
  var listDisplay = (_h = config.listDisplay) !== null && _h !== void 0 ? _h : listFields;
415
747
  var derivedSearchFields = listFields.filter(function (field) { var _a; return (_a = fields[field]) === null || _a === void 0 ? void 0 : _a.searchable; });
416
748
  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);
749
+ var sortableFields = resolveAdminSortableFields({
750
+ defaultSort: config.defaultSort,
751
+ listDisplay: listDisplay,
752
+ sortableFields: config.sortableFields,
753
+ });
418
754
  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)({
755
+ var bulkPatchAllowlist = (_k = config.bulkPatchAllowlist) !== null && _k !== void 0 ? _k : (0, adminUiV2_1.defaultBulkPatchAllowlistFrom)({
420
756
  hiddenFieldSet: hiddenFieldSet,
421
757
  listFields: listFields,
422
758
  readonlyFields: readonlyFields,
423
759
  schemaPaths: schemaPathKeys,
424
760
  });
425
761
  return {
426
- actions: (_m = config.actions) !== null && _m !== void 0 ? _m : [],
762
+ actions: (_l = config.actions) !== null && _l !== void 0 ? _l : [],
427
763
  bulkPatchAllowlist: bulkPatchAllowlist,
428
- defaultSort: (_o = config.defaultSort) !== null && _o !== void 0 ? _o : "-created",
764
+ defaultSort: (_m = config.defaultSort) !== null && _m !== void 0 ? _m : "-created",
429
765
  displayName: config.displayName,
430
766
  fieldOrder: config.fieldOrder,
431
767
  fields: fields,
432
768
  fieldsets: config.fieldsets,
433
- filters: (_p = config.filters) !== null && _p !== void 0 ? _p : [],
769
+ filters: (_o = config.filters) !== null && _o !== void 0 ? _o : [],
434
770
  group: config.group,
435
771
  hiddenFields: __spreadArray([], __read(hiddenFieldSet), false),
436
772
  listDisplay: listDisplay,
437
- listDisplayLinks: (_q = config.listDisplayLinks) !== null && _q !== void 0 ? _q : [],
773
+ listDisplayLinks: (_p = config.listDisplayLinks) !== null && _p !== void 0 ? _p : [],
438
774
  listFields: listFields,
439
- name: config.model.modelName,
775
+ name: (_q = configNames[configIndex]) !== null && _q !== void 0 ? _q : config.model.modelName,
440
776
  pageSize: config.pageSize,
441
777
  permissions: {
442
778
  create: ((_r = config.permissions) === null || _r === void 0 ? void 0 : _r.create) !== false,
@@ -452,7 +788,7 @@ var AdminApp = /** @class */ (function () {
452
788
  };
453
789
  });
454
790
  // Build script metadata for config response
455
- var scriptConfigs = (_d = this.options.scripts) !== null && _d !== void 0 ? _d : [];
791
+ var scriptConfigs = __spreadArray(__spreadArray([], __read(((_e = this.options.scripts) !== null && _e !== void 0 ? _e : [])), false), __read(aggregated.scripts), false);
456
792
  var configScripts = scriptConfigs.map(function (script) {
457
793
  var _a;
458
794
  return ({
@@ -461,20 +797,159 @@ var AdminApp = /** @class */ (function () {
461
797
  name: script.name,
462
798
  });
463
799
  });
464
- 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);
466
- var configResponse = {
800
+ var defaultScreens = [
801
+ {
802
+ adminAccess: { action: "read", resource: "configuration" },
803
+ displayName: "Version Config",
804
+ name: "version-config",
805
+ },
806
+ ];
807
+ var mergedScreens = __spreadArray(__spreadArray(__spreadArray([], __read(defaultScreens), false), __read(aggregated.customScreens), false), __read(((_f = this.options.customScreens) !== null && _f !== void 0 ? _f : [])), false);
808
+ var baseConfigResponse = {
809
+ capabilities: {
810
+ actions: true,
811
+ fieldsets: true,
812
+ filters: true,
813
+ realtime: modelConfigs.some(function (config) { return config.realtime === true; }),
814
+ },
467
815
  customScreens: mergedScreens,
468
816
  home: (0, adminUiV2_1.normalizeAdminHome)(this.options.home),
469
817
  models: configModels,
818
+ platformTools: {
819
+ configuration: true,
820
+ roles: true,
821
+ runScripts: true,
822
+ scripts: true,
823
+ version: true,
824
+ viewScripts: true,
825
+ },
470
826
  schemaVersion: adminUiV2_1.ADMIN_SCHEMA_VERSION,
471
827
  scripts: configScripts,
828
+ widgetIds: aggregated.widgetIds,
472
829
  };
830
+ var buildAuthorizedConfig = function (user) { return __awaiter(_this, void 0, void 0, function () {
831
+ var authorizedModels, authorizedScreens, canReadConfiguration, canReadRoles, canRunScripts, canViewScripts, canUseScripts;
832
+ var _this = this;
833
+ return __generator(this, function (_a) {
834
+ switch (_a.label) {
835
+ case 0: return [4 /*yield*/, Promise.all(configModels.map(function (modelMeta, index) { return __awaiter(_this, void 0, void 0, function () {
836
+ var config, canRead, canCreate, _a, canDelete, _b, canUpdate, _c;
837
+ return __generator(this, function (_d) {
838
+ switch (_d.label) {
839
+ case 0:
840
+ config = modelConfigs[index];
841
+ if (!config) {
842
+ return [2 /*return*/, null];
843
+ }
844
+ return [4 /*yield*/, (0, api_1.checkPermissions)("list", this.resourceActionPermissions(config, "list"), user)];
845
+ case 1:
846
+ canRead = _d.sent();
847
+ if (!canRead) {
848
+ return [2 /*return*/, null];
849
+ }
850
+ _a = modelMeta.permissions.create;
851
+ if (!_a) return [3 /*break*/, 3];
852
+ return [4 /*yield*/, (0, api_1.checkPermissions)("create", this.resourceActionPermissions(config, "create"), user)];
853
+ case 2:
854
+ _a = (_d.sent());
855
+ _d.label = 3;
856
+ case 3:
857
+ canCreate = _a;
858
+ _b = modelMeta.permissions.delete;
859
+ if (!_b) return [3 /*break*/, 5];
860
+ return [4 /*yield*/, (0, api_1.checkPermissions)("delete", this.resourceActionPermissions(config, "delete"), user)];
861
+ case 4:
862
+ _b = (_d.sent());
863
+ _d.label = 5;
864
+ case 5:
865
+ canDelete = _b;
866
+ _c = modelMeta.permissions.update;
867
+ if (!_c) return [3 /*break*/, 7];
868
+ return [4 /*yield*/, (0, api_1.checkPermissions)("update", this.resourceActionPermissions(config, "update"), user)];
869
+ case 6:
870
+ _c = (_d.sent());
871
+ _d.label = 7;
872
+ case 7:
873
+ canUpdate = _c;
874
+ return [2 /*return*/, __assign(__assign({}, modelMeta), { permissions: { create: canCreate, delete: canDelete, update: canUpdate } })];
875
+ }
876
+ });
877
+ }); }))];
878
+ case 1:
879
+ authorizedModels = (_a.sent()).filter(function (model) { return model !== null; });
880
+ return [4 /*yield*/, Promise.all(mergedScreens.map(function (screen) { return __awaiter(_this, void 0, void 0, function () {
881
+ var allowed_1, allowed;
882
+ var _a, _b;
883
+ return __generator(this, function (_c) {
884
+ switch (_c.label) {
885
+ case 0:
886
+ if (!screen.adminAccess) {
887
+ return [2 /*return*/, screen];
888
+ }
889
+ if (!screen.adminAccess.authorize) return [3 /*break*/, 2];
890
+ return [4 /*yield*/, screen.adminAccess.authorize({
891
+ action: (_a = screen.adminAccess.action) !== null && _a !== void 0 ? _a : "read",
892
+ user: user,
893
+ })];
894
+ case 1:
895
+ allowed_1 = _c.sent();
896
+ return [2 /*return*/, allowed_1 ? screen : null];
897
+ case 2:
898
+ if (!screen.adminAccess.resource) {
899
+ return [2 /*return*/, screen];
900
+ }
901
+ return [4 /*yield*/, this.canAnyResourceAction(user, screen.adminAccess.resource, [
902
+ (_b = screen.adminAccess.action) !== null && _b !== void 0 ? _b : "read",
903
+ ])];
904
+ case 3:
905
+ allowed = _c.sent();
906
+ return [2 /*return*/, allowed ? screen : null];
907
+ }
908
+ });
909
+ }); }))];
910
+ case 2:
911
+ authorizedScreens = (_a.sent()).filter(function (screen) { return screen !== null; });
912
+ return [4 /*yield*/, this.hasConfigurationPermission(user, "read")];
913
+ case 3:
914
+ canReadConfiguration = _a.sent();
915
+ return [4 /*yield*/, this.canAnyResourceAction(user, "rbac", ["read"])];
916
+ case 4:
917
+ canReadRoles = _a.sent();
918
+ return [4 /*yield*/, this.hasScriptPermission(user, "runScripts")];
919
+ case 5:
920
+ canRunScripts = _a.sent();
921
+ return [4 /*yield*/, this.hasScriptPermission(user, "viewBackgroundTasks")];
922
+ case 6:
923
+ canViewScripts = _a.sent();
924
+ canUseScripts = canRunScripts || canViewScripts;
925
+ return [2 /*return*/, __assign(__assign({}, baseConfigResponse), { customScreens: authorizedScreens.map(function (_a) {
926
+ var _adminAccess = _a.adminAccess, screen = __rest(_a, ["adminAccess"]);
927
+ return screen;
928
+ }), models: authorizedModels, platformTools: {
929
+ configuration: canReadConfiguration,
930
+ roles: canReadRoles,
931
+ runScripts: canRunScripts,
932
+ scripts: canUseScripts,
933
+ version: canReadConfiguration,
934
+ viewScripts: canViewScripts,
935
+ }, scripts: canUseScripts ? configScripts : [] })];
936
+ }
937
+ });
938
+ }); };
473
939
  var adminConfigOpenApi = openApiMw
474
940
  ? (0, api_1.createOpenApiBuilder)({ openApi: openApiMw })
475
941
  .withTags(["admin"])
476
942
  .withSummary("Admin panel configuration")
477
943
  .withResponse(200, {
944
+ capabilities: {
945
+ properties: {
946
+ actions: { type: "boolean" },
947
+ fieldsets: { type: "boolean" },
948
+ filters: { type: "boolean" },
949
+ realtime: { type: "boolean" },
950
+ },
951
+ type: "object",
952
+ },
478
953
  customScreens: {
479
954
  items: {
480
955
  properties: {
@@ -488,6 +963,17 @@ var AdminApp = /** @class */ (function () {
488
963
  },
489
964
  home: { type: "object" },
490
965
  models: { type: "array" },
966
+ platformTools: {
967
+ properties: {
968
+ configuration: { type: "boolean" },
969
+ roles: { type: "boolean" },
970
+ runScripts: { type: "boolean" },
971
+ scripts: { type: "boolean" },
972
+ version: { type: "boolean" },
973
+ viewScripts: { type: "boolean" },
974
+ },
975
+ type: "object",
976
+ },
491
977
  schemaVersion: { type: "number" },
492
978
  scripts: {
493
979
  items: {
@@ -500,19 +986,23 @@ var AdminApp = /** @class */ (function () {
500
986
  },
501
987
  type: "array",
502
988
  },
989
+ widgetIds: { items: { type: "string" }, type: "array" },
503
990
  })
504
991
  .build()
505
992
  : undefined;
506
993
  // GET /admin/config
507
994
  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
- return __generator(this, function (_a) {
509
- switch (_a.label) {
510
- case 0: return [4 /*yield*/, (0, api_1.checkPermissions)("read", [api_1.Permissions.IsAdmin], req.user)];
995
+ var _a, _b;
996
+ return __generator(this, function (_c) {
997
+ switch (_c.label) {
998
+ case 0: return [4 /*yield*/, (0, api_1.checkPermissions)("read", this.adminAccessPermissions(), req.user)];
511
999
  case 1:
512
- if (!(_a.sent())) {
1000
+ if (!(_c.sent())) {
513
1001
  throw new api_1.APIError({ status: 403, title: "Admin access required" });
514
1002
  }
515
- return [2 /*return*/, res.json(configResponse)];
1003
+ _b = (_a = res).json;
1004
+ return [4 /*yield*/, buildAuthorizedConfig(req.user)];
1005
+ case 2: return [2 /*return*/, _b.apply(_a, [_c.sent()])];
516
1006
  }
517
1007
  });
518
1008
  }); })], false));
@@ -541,15 +1031,22 @@ var AdminApp = /** @class */ (function () {
541
1031
  .build()
542
1032
  : undefined;
543
1033
  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)];
1034
+ var actor, _a, user, raw, now, summary, task, err_2, detail;
1035
+ return __generator(this, function (_b) {
1036
+ switch (_b.label) {
1037
+ case 0:
1038
+ actor = req.user;
1039
+ _a = !actor;
1040
+ if (_a) return [3 /*break*/, 2];
1041
+ return [4 /*yield*/, this.hasScriptPermission(actor, "runScripts")];
548
1042
  case 1:
549
- if (!(_a.sent())) {
1043
+ _a = !(_b.sent());
1044
+ _b.label = 2;
1045
+ case 2:
1046
+ if (_a) {
550
1047
  throw new api_1.APIError({ status: 403, title: "Admin access required" });
551
1048
  }
552
- user = req.user;
1049
+ user = actor;
553
1050
  raw = req.body;
554
1051
  if (typeof raw.kind !== "string" || !raw.kind.trim()) {
555
1052
  throw new api_1.APIError({ status: 400, title: "kind is required" });
@@ -562,9 +1059,9 @@ var AdminApp = /** @class */ (function () {
562
1059
  : {},
563
1060
  resourceRoute: typeof raw.resourceRoute === "string" ? raw.resourceRoute : undefined,
564
1061
  };
565
- _a.label = 2;
566
- case 2:
567
- _a.trys.push([2, 4, , 5]);
1062
+ _b.label = 3;
1063
+ case 3:
1064
+ _b.trys.push([3, 5, , 6]);
568
1065
  return [4 /*yield*/, api_1.BackgroundTask.create({
569
1066
  createdBy: user === null || user === void 0 ? void 0 : user._id,
570
1067
  isDryRun: false,
@@ -580,11 +1077,11 @@ var AdminApp = /** @class */ (function () {
580
1077
  status: "pending",
581
1078
  taskType: raw.kind,
582
1079
  })];
583
- case 3:
584
- task = (_a.sent());
585
- return [3 /*break*/, 5];
586
1080
  case 4:
587
- err_2 = _a.sent();
1081
+ task = (_b.sent());
1082
+ return [3 /*break*/, 6];
1083
+ case 5:
1084
+ err_2 = _b.sent();
588
1085
  detail = err_2 instanceof Error ? err_2.message : String(err_2);
589
1086
  api_1.logger.error("Failed to create admin background task: ".concat(detail));
590
1087
  throw new api_1.APIError({
@@ -592,7 +1089,7 @@ var AdminApp = /** @class */ (function () {
592
1089
  status: 500,
593
1090
  title: "Failed to enqueue background task",
594
1091
  });
595
- case 5: return [2 /*return*/, res.status(201).json({ taskId: task._id.toString() })];
1092
+ case 6: return [2 /*return*/, res.status(201).json({ taskId: task._id.toString() })];
596
1093
  }
597
1094
  });
598
1095
  }); })], false));
@@ -602,7 +1099,7 @@ var AdminApp = /** @class */ (function () {
602
1099
  var config, defaults;
603
1100
  return __generator(this, function (_a) {
604
1101
  switch (_a.label) {
605
- case 0: return [4 /*yield*/, (0, api_1.checkPermissions)("read", [api_1.Permissions.IsAdmin], req.user)];
1102
+ case 0: return [4 /*yield*/, this.hasConfigurationPermission(req.user, "read")];
606
1103
  case 1:
607
1104
  if (!(_a.sent())) {
608
1105
  throw new api_1.APIError({ status: 403, title: "Admin access required" });
@@ -625,10 +1122,10 @@ var AdminApp = /** @class */ (function () {
625
1122
  }); }));
626
1123
  app.put(versionConfigPath, (0, api_1.authenticateMiddleware)(), (0, api_1.asyncHandler)(function (req, res) { return __awaiter(_this, void 0, void 0, function () {
627
1124
  var raw, allowedFields, setFields, unsetFields, allowedFields_1, allowedFields_1_1, field, updateOp, doc;
628
- var e_8, _a;
1125
+ var e_11, _a;
629
1126
  return __generator(this, function (_b) {
630
1127
  switch (_b.label) {
631
- case 0: return [4 /*yield*/, (0, api_1.checkPermissions)("update", [api_1.Permissions.IsAdmin], req.user)];
1128
+ case 0: return [4 /*yield*/, this.hasConfigurationPermission(req.user, "update")];
632
1129
  case 1:
633
1130
  if (!(_b.sent())) {
634
1131
  throw new api_1.APIError({ status: 403, title: "Admin access required" });
@@ -656,12 +1153,12 @@ var AdminApp = /** @class */ (function () {
656
1153
  }
657
1154
  }
658
1155
  }
659
- catch (e_8_1) { e_8 = { error: e_8_1 }; }
1156
+ catch (e_11_1) { e_11 = { error: e_11_1 }; }
660
1157
  finally {
661
1158
  try {
662
1159
  if (allowedFields_1_1 && !allowedFields_1_1.done && (_a = allowedFields_1.return)) _a.call(allowedFields_1);
663
1160
  }
664
- finally { if (e_8) throw e_8.error; }
1161
+ finally { if (e_11) throw e_11.error; }
665
1162
  }
666
1163
  updateOp = {};
667
1164
  if (Object.keys(setFields).length > 0) {
@@ -683,16 +1180,16 @@ var AdminApp = /** @class */ (function () {
683
1180
  });
684
1181
  }); }));
685
1182
  var _loop_1 = function (config) {
686
- var e_9, _p;
1183
+ var e_12, _t;
687
1184
  // Determine searchable fields from the actual Mongoose schema type,
688
1185
  // not the OpenAPI type (which reports ObjectId as "string")
689
1186
  var searchableFields = [];
690
1187
  var objectIdFields = [];
691
- var modelMeta = configModels.find(function (m) { return m.name === config.model.modelName; });
1188
+ var modelMeta = (0, adminConfigIdentity_1.findAdminModelMetaByRoutePath)(configModels, "".concat(basePath).concat(config.routePath));
692
1189
  if (modelMeta) {
693
1190
  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;
1191
+ for (var _u = (e_12 = void 0, __values(Object.keys(modelMeta.fields))), _v = _u.next(); !_v.done; _v = _u.next()) {
1192
+ var key = _v.value;
696
1193
  var schemaPath = config.model.schema.path(key);
697
1194
  if (schemaPath && schemaPath.instance === "String" && !modelMeta.fields[key].enum) {
698
1195
  searchableFields.push(key);
@@ -702,59 +1199,42 @@ var AdminApp = /** @class */ (function () {
702
1199
  }
703
1200
  }
704
1201
  }
705
- catch (e_9_1) { e_9 = { error: e_9_1 }; }
1202
+ catch (e_12_1) { e_12 = { error: e_12_1 }; }
706
1203
  finally {
707
1204
  try {
708
- if (_r && !_r.done && (_p = _q.return)) _p.call(_q);
1205
+ if (_v && !_v.done && (_t = _u.return)) _t.call(_u);
709
1206
  }
710
- finally { if (e_9) throw e_9.error; }
1207
+ finally { if (e_12) throw e_12.error; }
711
1208
  }
712
1209
  }
713
1210
  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)) {
1211
+ var q, fields, searchClause, scoped, results, err_3;
1212
+ var _a;
1213
+ return __generator(this, function (_b) {
1214
+ switch (_b.label) {
1215
+ case 0: return [4 /*yield*/, (0, api_1.checkPermissions)("list", this.resourceActionPermissions(config, "list"), req.user)];
1216
+ case 1:
1217
+ if (!(_b.sent())) {
722
1218
  throw new api_1.APIError({
723
1219
  disableExternalErrorTracking: true,
724
1220
  status: 403,
725
1221
  title: "Forbidden",
726
1222
  });
727
1223
  }
728
- q = String((_c = req.query.q) !== null && _c !== void 0 ? _c : "");
1224
+ q = String((_a = req.query.q) !== null && _a !== void 0 ? _a : "");
729
1225
  if (!q) {
730
1226
  return [2 /*return*/, res.json({ data: [] })];
731
1227
  }
732
- escapedQ = q.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
733
- regex = new RegExp(escapedQ, "i");
734
1228
  fields = typeof req.query.fields === "string"
735
1229
  ? req.query.fields.split(",").filter(function (f) { return searchableFields.includes(f); })
736
1230
  : searchableFields;
737
- orConditions = fields.map(function (field) {
738
- var _a;
739
- return (_a = {}, _a[field] = { $regex: regex }, _a);
1231
+ searchClause = (0, adminTextSearch_1.buildAdminPartialSearchFilter)({
1232
+ extraObjectIdFields: objectIdFields,
1233
+ model: config.model,
1234
+ q: q,
1235
+ searchFields: fields,
740
1236
  });
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) {
1237
+ if (!searchClause) {
758
1238
  return [2 /*return*/, res.json({ data: [] })];
759
1239
  }
760
1240
  api_1.logger.debug("Admin search query", {
@@ -762,26 +1242,37 @@ var AdminApp = /** @class */ (function () {
762
1242
  model: config.model.modelName,
763
1243
  q: q,
764
1244
  });
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()];
1245
+ _b.label = 2;
769
1246
  case 2:
770
- results = _d.sent();
1247
+ _b.trys.push([2, 5, , 6]);
1248
+ return [4 /*yield*/, buildAdminListQueryFilter(config, modelMeta === null || modelMeta === void 0 ? void 0 : modelMeta.searchFields)(req.user, {})];
1249
+ case 3:
1250
+ scoped = _b.sent();
1251
+ if (scoped === null) {
1252
+ return [2 /*return*/, res.json({ data: [] })];
1253
+ }
1254
+ return [4 /*yield*/, config.model
1255
+ .find({ $and: [scoped, searchClause] })
1256
+ .limit(20)
1257
+ .lean()];
1258
+ case 4:
1259
+ results = _b.sent();
771
1260
  api_1.logger.debug("Admin search results", {
772
1261
  count: results.length,
773
1262
  model: config.model.modelName,
774
1263
  });
775
- return [2 /*return*/, res.json({ data: results })];
776
- case 3:
777
- err_3 = _d.sent();
1264
+ return [2 /*return*/, res.json({
1265
+ data: results.map(function (doc) { return scrubAdminResponse(doc, config, allModelAdmins); }),
1266
+ })];
1267
+ case 5:
1268
+ err_3 = _b.sent();
778
1269
  api_1.logger.error("Admin search failed", {
779
1270
  error: err_3,
780
1271
  fields: fields,
781
1272
  model: config.model.modelName,
782
1273
  });
783
1274
  throw err_3;
784
- case 4: return [2 /*return*/];
1275
+ case 6: return [2 /*return*/];
785
1276
  }
786
1277
  });
787
1278
  }); }));
@@ -793,71 +1284,224 @@ var AdminApp = /** @class */ (function () {
793
1284
  _loop_1(config);
794
1285
  }
795
1286
  }
796
- catch (e_4_1) { e_4 = { error: e_4_1 }; }
1287
+ catch (e_7_1) { e_7 = { error: e_7_1 }; }
797
1288
  finally {
798
1289
  try {
799
1290
  if (modelConfigs_1_1 && !modelConfigs_1_1.done && (_a = modelConfigs_1.return)) _a.call(modelConfigs_1);
800
1291
  }
801
- finally { if (e_4) throw e_4.error; }
1292
+ finally { if (e_7) throw e_7.error; }
802
1293
  }
803
1294
  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) {
1295
+ var hiddenFieldSet = new Set((_g = config.hiddenFields) !== null && _g !== void 0 ? _g : []);
1296
+ var readonlySet = new Set((_h = config.readonlyFields) !== null && _h !== void 0 ? _h : []);
1297
+ var excludeFieldSet = new Set((_j = config.excludeFields) !== null && _j !== void 0 ? _j : []);
1298
+ var modelMeta = (0, adminConfigIdentity_1.findAdminModelMetaByRoutePath)(configModels, "".concat(basePath).concat(config.routePath));
1299
+ var allowlist = new Set((_k = modelMeta === null || modelMeta === void 0 ? void 0 : modelMeta.bulkPatchAllowlist) !== null && _k !== void 0 ? _k : []);
1300
+ var adminPermission = function (allowed, action) {
809
1301
  if (allowed === false) {
810
1302
  return [];
811
1303
  }
812
- return [api_1.Permissions.IsAdmin];
1304
+ return _this.resourceActionPermissions(config, action);
813
1305
  };
1306
+ var updatePermissions = this_1.resourceActionPermissions(config, "update");
814
1307
  var stripProtectedFromBody = function (body) {
815
- var e_11, _a, e_12, _b, e_13, _c;
1308
+ var e_13, _a, e_14, _b, e_15, _c, e_16, _d;
816
1309
  if (!body || typeof body !== "object" || Array.isArray(body)) {
817
1310
  return {};
818
1311
  }
819
1312
  var next = __assign({}, body);
820
1313
  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()) {
1314
+ for (var readonlySet_1 = (e_13 = void 0, __values(readonlySet)), readonlySet_1_1 = readonlySet_1.next(); !readonlySet_1_1.done; readonlySet_1_1 = readonlySet_1.next()) {
822
1315
  var key = readonlySet_1_1.value;
823
1316
  delete next[key];
824
1317
  }
825
1318
  }
826
- catch (e_11_1) { e_11 = { error: e_11_1 }; }
1319
+ catch (e_13_1) { e_13 = { error: e_13_1 }; }
827
1320
  finally {
828
1321
  try {
829
1322
  if (readonlySet_1_1 && !readonlySet_1_1.done && (_a = readonlySet_1.return)) _a.call(readonlySet_1);
830
1323
  }
831
- finally { if (e_11) throw e_11.error; }
1324
+ finally { if (e_13) throw e_13.error; }
832
1325
  }
833
1326
  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()) {
1327
+ for (var hiddenFieldSet_1 = (e_14 = void 0, __values(hiddenFieldSet)), hiddenFieldSet_1_1 = hiddenFieldSet_1.next(); !hiddenFieldSet_1_1.done; hiddenFieldSet_1_1 = hiddenFieldSet_1.next()) {
835
1328
  var key = hiddenFieldSet_1_1.value;
836
1329
  delete next[key];
837
1330
  }
838
1331
  }
839
- catch (e_12_1) { e_12 = { error: e_12_1 }; }
1332
+ catch (e_14_1) { e_14 = { error: e_14_1 }; }
840
1333
  finally {
841
1334
  try {
842
1335
  if (hiddenFieldSet_1_1 && !hiddenFieldSet_1_1.done && (_b = hiddenFieldSet_1.return)) _b.call(hiddenFieldSet_1);
843
1336
  }
844
- finally { if (e_12) throw e_12.error; }
1337
+ finally { if (e_14) throw e_14.error; }
1338
+ }
1339
+ try {
1340
+ for (var excludeFieldSet_1 = (e_15 = void 0, __values(excludeFieldSet)), excludeFieldSet_1_1 = excludeFieldSet_1.next(); !excludeFieldSet_1_1.done; excludeFieldSet_1_1 = excludeFieldSet_1.next()) {
1341
+ var key = excludeFieldSet_1_1.value;
1342
+ delete next[key];
1343
+ }
1344
+ }
1345
+ catch (e_15_1) { e_15 = { error: e_15_1 }; }
1346
+ finally {
1347
+ try {
1348
+ if (excludeFieldSet_1_1 && !excludeFieldSet_1_1.done && (_c = excludeFieldSet_1.return)) _c.call(excludeFieldSet_1);
1349
+ }
1350
+ finally { if (e_15) throw e_15.error; }
845
1351
  }
846
1352
  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()) {
1353
+ for (var SYSTEM_ADMIN_FIELDS_1 = (e_16 = 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
1354
  var key = SYSTEM_ADMIN_FIELDS_1_1.value;
849
1355
  delete next[key];
850
1356
  }
851
1357
  }
852
- catch (e_13_1) { e_13 = { error: e_13_1 }; }
1358
+ catch (e_16_1) { e_16 = { error: e_16_1 }; }
853
1359
  finally {
854
1360
  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);
1361
+ 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
1362
  }
857
- finally { if (e_13) throw e_13.error; }
1363
+ finally { if (e_16) throw e_16.error; }
1364
+ }
1365
+ // Self-service never writes these fields. Admin CRUD may set `admin`.
1366
+ // When RBAC is enabled, `roles` must go through RoleManager.assign and
1367
+ // tenant membership is not a generic User document field.
1368
+ if (config.model.modelName === "User" && _this.options.accessControl) {
1369
+ delete next.organizationIds;
1370
+ delete next.roles;
858
1371
  }
859
1372
  return next;
860
1373
  };
1374
+ var parseRoleNames = function (value) {
1375
+ if (!Array.isArray(value) || value.some(function (roleName) { return typeof roleName !== "string"; })) {
1376
+ throw new api_1.APIError({ status: 400, title: "roles must be an array of strings" });
1377
+ }
1378
+ return value;
1379
+ };
1380
+ var takePendingUserRoles = function (body, request) {
1381
+ if (config.model.modelName !== "User" || !_this.options.accessControl) {
1382
+ return;
1383
+ }
1384
+ if (!("roles" in body)) {
1385
+ return;
1386
+ }
1387
+ request.terrenoPendingUserRoles = parseRoleNames(body.roles);
1388
+ };
1389
+ var applyPendingUserRoles = function (value_1, request_1) {
1390
+ var args_1 = [];
1391
+ for (var _i = 2; _i < arguments.length; _i++) {
1392
+ args_1[_i - 2] = arguments[_i];
1393
+ }
1394
+ return __awaiter(_this, __spreadArray([value_1, request_1], __read(args_1), false), void 0, function (value, request, rollbackOnFailure) {
1395
+ var pending, actor, accessControl, record, userId, error_1, rollbackError_1;
1396
+ var _a;
1397
+ if (rollbackOnFailure === void 0) { rollbackOnFailure = false; }
1398
+ return __generator(this, function (_b) {
1399
+ switch (_b.label) {
1400
+ case 0:
1401
+ pending = request
1402
+ .terrenoPendingUserRoles;
1403
+ if (!pending) {
1404
+ return [2 /*return*/];
1405
+ }
1406
+ actor = request.user;
1407
+ accessControl = this.options.accessControl;
1408
+ if (!actor || !accessControl) {
1409
+ throw new api_1.APIError({ status: 401, title: "Unauthorized" });
1410
+ }
1411
+ record = value;
1412
+ userId = (_a = record.id) !== null && _a !== void 0 ? _a : (record._id != null ? String(record._id) : undefined);
1413
+ if (!userId) {
1414
+ throw new api_1.APIError({ status: 500, title: "User id missing after write" });
1415
+ }
1416
+ _b.label = 1;
1417
+ case 1:
1418
+ _b.trys.push([1, 3, , 8]);
1419
+ return [4 /*yield*/, accessControl.roles.assign({ actor: actor, roleNames: pending, userId: userId })];
1420
+ case 2:
1421
+ _b.sent();
1422
+ if (typeof record.set === "function") {
1423
+ record.set("roles", __spreadArray([], __read(pending), false));
1424
+ }
1425
+ else {
1426
+ record.roles = __spreadArray([], __read(pending), false);
1427
+ }
1428
+ return [3 /*break*/, 8];
1429
+ case 3:
1430
+ error_1 = _b.sent();
1431
+ if (!rollbackOnFailure) return [3 /*break*/, 7];
1432
+ _b.label = 4;
1433
+ case 4:
1434
+ _b.trys.push([4, 6, , 7]);
1435
+ return [4 /*yield*/, config.model.deleteOne({ _id: userId })];
1436
+ case 5:
1437
+ _b.sent();
1438
+ return [3 /*break*/, 7];
1439
+ case 6:
1440
+ rollbackError_1 = _b.sent();
1441
+ api_1.logger.error("Failed to roll back user after role assignment failure", {
1442
+ error: rollbackError_1,
1443
+ userId: userId,
1444
+ });
1445
+ return [3 /*break*/, 7];
1446
+ case 7: throw error_1;
1447
+ case 8: return [2 /*return*/];
1448
+ }
1449
+ });
1450
+ });
1451
+ };
1452
+ var restoreUserFieldsAfterFailedRoleAssign = function (value, prev, cleanedBody) { return __awaiter(_this, void 0, void 0, function () {
1453
+ var record, prevRecord, body, restore, _a, _b, key;
1454
+ var e_17, _c;
1455
+ return __generator(this, function (_d) {
1456
+ switch (_d.label) {
1457
+ case 0:
1458
+ if (!prev || typeof prev !== "object" || !cleanedBody || typeof cleanedBody !== "object") {
1459
+ return [2 /*return*/];
1460
+ }
1461
+ if (Array.isArray(cleanedBody)) {
1462
+ return [2 /*return*/];
1463
+ }
1464
+ record = value;
1465
+ prevRecord = prev;
1466
+ body = cleanedBody;
1467
+ restore = {};
1468
+ try {
1469
+ for (_a = __values(Object.keys(body)), _b = _a.next(); !_b.done; _b = _a.next()) {
1470
+ key = _b.value;
1471
+ if (key === "roles") {
1472
+ continue;
1473
+ }
1474
+ restore[key] = prevRecord[key];
1475
+ if (typeof record.set === "function") {
1476
+ record.set(key, prevRecord[key]);
1477
+ }
1478
+ }
1479
+ }
1480
+ catch (e_17_1) { e_17 = { error: e_17_1 }; }
1481
+ finally {
1482
+ try {
1483
+ if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
1484
+ }
1485
+ finally { if (e_17) throw e_17.error; }
1486
+ }
1487
+ if (Object.keys(restore).length === 0) {
1488
+ return [2 /*return*/];
1489
+ }
1490
+ if (!(typeof record.save === "function")) return [3 /*break*/, 2];
1491
+ return [4 /*yield*/, record.save()];
1492
+ case 1:
1493
+ _d.sent();
1494
+ return [2 /*return*/];
1495
+ case 2:
1496
+ if (!(record._id != null)) return [3 /*break*/, 4];
1497
+ return [4 /*yield*/, config.model.updateOne({ _id: record._id }, { $set: restore })];
1498
+ case 3:
1499
+ _d.sent();
1500
+ _d.label = 4;
1501
+ case 4: return [2 /*return*/];
1502
+ }
1503
+ });
1504
+ }); };
861
1505
  var bulkPatchOpenApi = openApiMw
862
1506
  ? (0, api_1.createOpenApiBuilder)({ openApi: openApiMw })
863
1507
  .withTags(["admin"])
@@ -946,52 +1590,247 @@ var AdminApp = /** @class */ (function () {
946
1590
  }); },
947
1591
  }
948
1592
  : {};
1593
+ var assertCanWriteUserAdminFlag = function (body_1, request_1) {
1594
+ var args_1 = [];
1595
+ for (var _i = 2; _i < arguments.length; _i++) {
1596
+ args_1[_i - 2] = arguments[_i];
1597
+ }
1598
+ return __awaiter(_this, __spreadArray([body_1, request_1], __read(args_1), false), void 0, function (body, request, currentAdmin, targetUserId) {
1599
+ var accessControl, actor, result, nextAdmin, isGrantingAdmin, isRevokingAdmin, targetId;
1600
+ var _a;
1601
+ if (currentAdmin === void 0) { currentAdmin = false; }
1602
+ return __generator(this, function (_b) {
1603
+ switch (_b.label) {
1604
+ case 0:
1605
+ if (config.model.modelName !== "User" || !("admin" in body)) {
1606
+ return [2 /*return*/];
1607
+ }
1608
+ accessControl = this.options.accessControl;
1609
+ if (!accessControl) {
1610
+ return [2 /*return*/];
1611
+ }
1612
+ if (coerceAdminFlag(body.admin) === Boolean(currentAdmin)) {
1613
+ return [2 /*return*/];
1614
+ }
1615
+ actor = request.user;
1616
+ if (!actor) {
1617
+ throw new api_1.APIError({ status: 401, title: "Unauthorized" });
1618
+ }
1619
+ return [4 /*yield*/, accessControl.can({
1620
+ permissions: { rbac: ["assignRoles"] },
1621
+ user: actor,
1622
+ })];
1623
+ case 1:
1624
+ result = _b.sent();
1625
+ if (!result.allowed) {
1626
+ throw new api_1.APIError({
1627
+ status: 403,
1628
+ title: "Missing rbac:assignRoles permission",
1629
+ });
1630
+ }
1631
+ nextAdmin = coerceAdminFlag(body.admin);
1632
+ isGrantingAdmin = nextAdmin === true && !currentAdmin;
1633
+ isRevokingAdmin = nextAdmin === false && currentAdmin;
1634
+ // assignRoles and manageRoles still cannot mint or strip the legacy admin
1635
+ // plane (IsAdmin, password reset, owner bypass). Only an existing admin can.
1636
+ if ((isGrantingAdmin || isRevokingAdmin) && !actor.admin) {
1637
+ throw new api_1.APIError({
1638
+ status: 403,
1639
+ title: isGrantingAdmin
1640
+ ? "Cannot grant the legacy admin flag without the admin privilege"
1641
+ : "Cannot revoke the legacy admin flag without the admin privilege",
1642
+ });
1643
+ }
1644
+ targetId = targetUserId !== null && targetUserId !== void 0 ? targetUserId : (_a = request.params) === null || _a === void 0 ? void 0 : _a.id;
1645
+ if (!targetId) return [3 /*break*/, 3];
1646
+ return [4 /*yield*/, accessControl.roles.assertCanModifyUser({ actor: actor, userId: String(targetId) })];
1647
+ case 2:
1648
+ _b.sent();
1649
+ _b.label = 3;
1650
+ case 3: return [2 /*return*/];
1651
+ }
1652
+ });
1653
+ });
1654
+ };
1655
+ var currentUserAdminFlag = function (request) { return __awaiter(_this, void 0, void 0, function () {
1656
+ var id, existing;
1657
+ var _a;
1658
+ return __generator(this, function (_b) {
1659
+ switch (_b.label) {
1660
+ case 0:
1661
+ id = (_a = request.params) === null || _a === void 0 ? void 0 : _a.id;
1662
+ if (!id) {
1663
+ return [2 /*return*/, false];
1664
+ }
1665
+ return [4 /*yield*/, config.model.findById(id).select("admin").lean()];
1666
+ case 1:
1667
+ existing = _b.sent();
1668
+ return [2 /*return*/, Boolean(existing === null || existing === void 0 ? void 0 : existing.admin)];
1669
+ }
1670
+ });
1671
+ }); };
1672
+ var markAuthorizedUserAdminWrite = function (body, request) {
1673
+ if (config.model.modelName !== "User" ||
1674
+ !_this.options.accessControl ||
1675
+ !("admin" in body)) {
1676
+ return;
1677
+ }
1678
+ request.terrenoAllowUserAdminWrite = true;
1679
+ };
1680
+ var addRecordCapabilities = function (value, request) { return __awaiter(_this, void 0, void 0, function () {
1681
+ var scrubbed, sourceItems, scrubbedItems, withCapabilities;
1682
+ var _this = this;
1683
+ return __generator(this, function (_a) {
1684
+ switch (_a.label) {
1685
+ case 0:
1686
+ scrubbed = scrubAdminResponse(value, config, allModelAdmins);
1687
+ sourceItems = Array.isArray(value) ? value : [value];
1688
+ scrubbedItems = Array.isArray(scrubbed) ? scrubbed : [scrubbed];
1689
+ return [4 /*yield*/, Promise.all(scrubbedItems.map(function (item, index) { return __awaiter(_this, void 0, void 0, function () {
1690
+ var instance, canUpdate, _a, canDelete, _b;
1691
+ var _c, _d;
1692
+ return __generator(this, function (_e) {
1693
+ switch (_e.label) {
1694
+ case 0:
1695
+ if (!item || typeof item !== "object" || Array.isArray(item)) {
1696
+ return [2 /*return*/, item];
1697
+ }
1698
+ instance = sourceItems[index];
1699
+ _a = ((_c = config.permissions) === null || _c === void 0 ? void 0 : _c.update) !== false;
1700
+ if (!_a) return [3 /*break*/, 2];
1701
+ return [4 /*yield*/, (0, api_1.checkPermissions)("update", this.resourceActionPermissions(config, "update"), request.user, instance)];
1702
+ case 1:
1703
+ _a = (_e.sent());
1704
+ _e.label = 2;
1705
+ case 2:
1706
+ canUpdate = _a;
1707
+ _b = ((_d = config.permissions) === null || _d === void 0 ? void 0 : _d.delete) !== false;
1708
+ if (!_b) return [3 /*break*/, 4];
1709
+ return [4 /*yield*/, (0, api_1.checkPermissions)("delete", this.resourceActionPermissions(config, "delete"), request.user, instance)];
1710
+ case 3:
1711
+ _b = (_e.sent());
1712
+ _e.label = 4;
1713
+ case 4:
1714
+ canDelete = _b;
1715
+ return [2 /*return*/, __assign(__assign({}, item), { _adminCapabilities: { delete: canDelete, update: canUpdate } })];
1716
+ }
1717
+ });
1718
+ }); }))];
1719
+ case 1:
1720
+ withCapabilities = _a.sent();
1721
+ return [2 /*return*/, (Array.isArray(scrubbed) ? withCapabilities : withCapabilities[0])];
1722
+ }
1723
+ });
1724
+ }); };
949
1725
  // noExplicitAny: matches the Model<any> from AdminModelConfig above.
950
1726
  // 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];
1727
+ 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: {
1728
+ create: adminPermission((_m = config.permissions) === null || _m === void 0 ? void 0 : _m.create, "create"),
1729
+ delete: adminPermission((_o = config.permissions) === null || _o === void 0 ? void 0 : _o.delete, "delete"),
1730
+ list: adminPermission(true, "list"),
1731
+ read: adminPermission(true, "read"),
1732
+ update: adminPermission((_p = config.permissions) === null || _p === void 0 ? void 0 : _p.update, "update"),
1733
+ }, postCreate: function (value, request) { return __awaiter(_this, void 0, void 0, function () {
1734
+ var _a;
1735
+ return __generator(this, function (_b) {
1736
+ switch (_b.label) {
1737
+ case 0: return [4 /*yield*/, applyPendingUserRoles(value, request, true)];
1738
+ case 1:
1739
+ _b.sent();
1740
+ return [4 /*yield*/, ((_a = auditHooks.postCreate) === null || _a === void 0 ? void 0 : _a.call(auditHooks, value, request))];
1741
+ case 2:
1742
+ _b.sent();
1743
+ return [2 /*return*/];
1744
+ }
1745
+ });
1746
+ }); }, postUpdate: function (value, cleanedBody, request, prev) { return __awaiter(_this, void 0, void 0, function () {
1747
+ var error_2;
1748
+ var _a;
1749
+ return __generator(this, function (_b) {
1750
+ switch (_b.label) {
1751
+ case 0:
1752
+ _b.trys.push([0, 2, , 4]);
1753
+ return [4 /*yield*/, applyPendingUserRoles(value, request)];
1754
+ case 1:
1755
+ _b.sent();
1756
+ return [3 /*break*/, 4];
1757
+ case 2:
1758
+ error_2 = _b.sent();
1759
+ return [4 /*yield*/, restoreUserFieldsAfterFailedRoleAssign(value, prev, cleanedBody)];
1760
+ case 3:
1761
+ _b.sent();
1762
+ throw error_2;
1763
+ case 4: return [4 /*yield*/, ((_a = auditHooks.postUpdate) === null || _a === void 0 ? void 0 : _a.call(auditHooks, value, cleanedBody, request, prev))];
1764
+ case 5:
1765
+ _b.sent();
1766
+ return [2 /*return*/];
966
1767
  }
967
- return [2 /*return*/, stripProtectedFromBody(body)];
968
1768
  });
969
- }); }, preUpdate: function (body, _req) { return __awaiter(_this, void 0, void 0, function () {
1769
+ }); }, preCreate: function (body, req) { return __awaiter(_this, void 0, void 0, function () {
1770
+ var record;
970
1771
  return __generator(this, function (_a) {
971
- if (!body || typeof body !== "object") {
972
- return [2 /*return*/, body];
1772
+ switch (_a.label) {
1773
+ case 0:
1774
+ if (!body || typeof body !== "object") {
1775
+ return [2 /*return*/, body];
1776
+ }
1777
+ record = body;
1778
+ return [4 /*yield*/, (0, api_1.checkPermissions)("create", this.resourceActionPermissions(config, "create"), req.user, record)];
1779
+ case 1:
1780
+ if (!(_a.sent())) {
1781
+ throw new api_1.APIError({ status: 403, title: "Admin create access denied" });
1782
+ }
1783
+ takePendingUserRoles(record, req);
1784
+ return [4 /*yield*/, assertCanWriteUserAdminFlag(record, req)];
1785
+ case 2:
1786
+ _a.sent();
1787
+ markAuthorizedUserAdminWrite(record, req);
1788
+ return [2 /*return*/, stripProtectedFromBody(body)];
973
1789
  }
974
- return [2 /*return*/, stripProtectedFromBody(body)];
975
1790
  });
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);
1791
+ }); }, preUpdate: function (body, req) { return __awaiter(_this, void 0, void 0, function () {
1792
+ var record, _a, _b;
1793
+ return __generator(this, function (_c) {
1794
+ switch (_c.label) {
1795
+ case 0:
1796
+ if (!body || typeof body !== "object") {
1797
+ return [2 /*return*/, body];
1798
+ }
1799
+ record = body;
1800
+ takePendingUserRoles(record, req);
1801
+ _a = assertCanWriteUserAdminFlag;
1802
+ _b = [record, req];
1803
+ return [4 /*yield*/, currentUserAdminFlag(req)];
1804
+ case 1: return [4 /*yield*/, _a.apply(void 0, _b.concat([_c.sent()]))];
1805
+ case 2:
1806
+ _c.sent();
1807
+ markAuthorizedUserAdminWrite(record, req);
1808
+ return [2 /*return*/, stripProtectedFromBody(body)];
1809
+ }
1810
+ });
1811
+ }); }, queryFields: (0, adminUiV2_1.buildAdminModelQueryFields)({
1812
+ filters: config.filters,
1813
+ listDisplay: config.listDisplay,
1814
+ listFields: config.listFields,
1815
+ searchFields: (_q = modelMeta === null || modelMeta === void 0 ? void 0 : modelMeta.searchFields) !== null && _q !== void 0 ? _q : config.searchFields,
1816
+ }), queryFilter: buildAdminListQueryFilter(config, modelMeta === null || modelMeta === void 0 ? void 0 : modelMeta.searchFields), responseHandler: function (value, _method, request) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
1817
+ return [2 /*return*/, addRecordCapabilities(value, request)];
1818
+ }); }); }, sort: (_r = config.defaultSort) !== null && _r !== void 0 ? _r : "-created" }), (config.populatePaths ? { populatePaths: config.populatePaths } : {})), (auditHooks.postDelete ? { postDelete: auditHooks.postDelete } : {}));
981
1819
  var modelBase = express_1.default.Router();
1820
+ modelBase.use(validateAdminSortParam((_s = modelMeta === null || modelMeta === void 0 ? void 0 : modelMeta.sortableFields) !== null && _s !== void 0 ? _s : []));
982
1821
  modelBase.post.apply(modelBase, __spreadArray(__spreadArray(["/bulk-patch",
983
1822
  (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)];
1823
+ 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_18_1;
1824
+ var e_18, _c, e_19, _d;
1825
+ var _e, _f;
1826
+ return __generator(this, function (_g) {
1827
+ switch (_g.label) {
1828
+ case 0: return [4 /*yield*/, (0, api_1.checkPermissions)("update", updatePermissions, req.user)];
990
1829
  case 1:
991
- if (!(_c.sent())) {
1830
+ if (!(_g.sent())) {
992
1831
  throw new api_1.APIError({ status: 403, title: "Admin access required" });
993
1832
  }
994
- if (((_b = config.permissions) === null || _b === void 0 ? void 0 : _b.update) === false) {
1833
+ if (((_e = config.permissions) === null || _e === void 0 ? void 0 : _e.update) === false) {
995
1834
  throw new api_1.APIError({ status: 403, title: "Updates are disabled for this model" });
996
1835
  }
997
1836
  body = req.body;
@@ -1021,7 +1860,12 @@ var AdminApp = /** @class */ (function () {
1021
1860
  });
1022
1861
  }
1023
1862
  patch = stripProtectedFromBody(rawPatch);
1024
- if (Object.keys(patch).length === 0) {
1863
+ if (config.model.modelName === "User" &&
1864
+ this.options.accessControl &&
1865
+ "roles" in rawPatch) {
1866
+ pendingRoles = parseRoleNames(rawPatch.roles);
1867
+ }
1868
+ if (Object.keys(patch).length === 0 && pendingRoles === undefined) {
1025
1869
  throw new api_1.APIError({
1026
1870
  status: 400,
1027
1871
  title: "Patch must include at least one writable field",
@@ -1029,57 +1873,111 @@ var AdminApp = /** @class */ (function () {
1029
1873
  }
1030
1874
  updated = 0;
1031
1875
  failures = [];
1032
- _c.label = 2;
1876
+ actor = req.user;
1877
+ _g.label = 2;
1033
1878
  case 2:
1034
- _c.trys.push([2, 9, 10, 11]);
1879
+ _g.trys.push([2, 19, 20, 21]);
1035
1880
  ids_1 = __values(ids), ids_1_1 = ids_1.next();
1036
- _c.label = 3;
1881
+ _g.label = 3;
1037
1882
  case 3:
1038
- if (!!ids_1_1.done) return [3 /*break*/, 8];
1883
+ if (!!ids_1_1.done) return [3 /*break*/, 18];
1039
1884
  id = ids_1_1.value;
1040
1885
  if (!mongoose_1.default.isValidObjectId(id)) {
1041
1886
  failures.push({ id: id, title: "Invalid id" });
1042
- return [3 /*break*/, 7];
1887
+ return [3 /*break*/, 17];
1043
1888
  }
1044
- _c.label = 4;
1889
+ _g.label = 4;
1045
1890
  case 4:
1046
- _c.trys.push([4, 6, , 7]);
1047
- return [4 /*yield*/, config.model.updateOne({ _id: id }, { $set: patch })];
1891
+ _g.trys.push([4, 16, , 17]);
1892
+ return [4 /*yield*/, config.model.findById(id)];
1048
1893
  case 5:
1049
- resUpdate = _c.sent();
1050
- if (resUpdate.matchedCount === 0) {
1894
+ doc = _g.sent();
1895
+ if (!doc) {
1051
1896
  failures.push({ id: id, title: "Not found" });
1897
+ return [3 /*break*/, 17];
1052
1898
  }
1053
- else {
1054
- updated += 1;
1055
- }
1056
- return [3 /*break*/, 7];
1899
+ return [4 /*yield*/, (0, api_1.checkPermissions)("update", updatePermissions, actor, doc)];
1057
1900
  case 6:
1058
- err_4 = _c.sent();
1901
+ if (!(_g.sent())) {
1902
+ failures.push({ id: id, title: "Forbidden" });
1903
+ return [3 /*break*/, 17];
1904
+ }
1905
+ return [4 /*yield*/, assertCanWriteUserAdminFlag(rawPatch, req, Boolean(doc.admin), id)];
1906
+ case 7:
1907
+ _g.sent();
1908
+ previousPatch = {};
1909
+ try {
1910
+ for (_a = (e_19 = void 0, __values(Object.keys(patch))), _b = _a.next(); !_b.done; _b = _a.next()) {
1911
+ key = _b.value;
1912
+ previousPatch[key] = doc[key];
1913
+ }
1914
+ }
1915
+ catch (e_19_1) { e_19 = { error: e_19_1 }; }
1916
+ finally {
1917
+ try {
1918
+ if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
1919
+ }
1920
+ finally { if (e_19) throw e_19.error; }
1921
+ }
1922
+ if (!(Object.keys(patch).length > 0)) return [3 /*break*/, 9];
1923
+ return [4 /*yield*/, doc.updateOne({ $set: patch })];
1924
+ case 8:
1925
+ _g.sent();
1926
+ _g.label = 9;
1927
+ case 9:
1928
+ _g.trys.push([9, 12, , 15]);
1929
+ if (!pendingRoles) return [3 /*break*/, 11];
1930
+ if (!actor) {
1931
+ failures.push({ id: id, title: "Forbidden" });
1932
+ return [3 /*break*/, 17];
1933
+ }
1934
+ return [4 /*yield*/, ((_f = this.options.accessControl) === null || _f === void 0 ? void 0 : _f.roles.assign({
1935
+ actor: actor,
1936
+ roleNames: pendingRoles,
1937
+ userId: id,
1938
+ }))];
1939
+ case 10:
1940
+ _g.sent();
1941
+ _g.label = 11;
1942
+ case 11: return [3 /*break*/, 15];
1943
+ case 12:
1944
+ roleError_1 = _g.sent();
1945
+ if (!(Object.keys(previousPatch).length > 0)) return [3 /*break*/, 14];
1946
+ return [4 /*yield*/, config.model.updateOne({ _id: id }, { $set: previousPatch })];
1947
+ case 13:
1948
+ _g.sent();
1949
+ _g.label = 14;
1950
+ case 14: throw roleError_1;
1951
+ case 15:
1952
+ updated += 1;
1953
+ return [3 /*break*/, 17];
1954
+ case 16:
1955
+ err_4 = _g.sent();
1059
1956
  message = err_4 instanceof Error ? err_4.message : String(err_4);
1060
1957
  failures.push({ id: id, title: message });
1061
- return [3 /*break*/, 7];
1062
- case 7:
1958
+ return [3 /*break*/, 17];
1959
+ case 17:
1063
1960
  ids_1_1 = ids_1.next();
1064
1961
  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:
1962
+ case 18: return [3 /*break*/, 21];
1963
+ case 19:
1964
+ e_18_1 = _g.sent();
1965
+ e_18 = { error: e_18_1 };
1966
+ return [3 /*break*/, 21];
1967
+ case 20:
1071
1968
  try {
1072
- if (ids_1_1 && !ids_1_1.done && (_a = ids_1.return)) _a.call(ids_1);
1969
+ if (ids_1_1 && !ids_1_1.done && (_c = ids_1.return)) _c.call(ids_1);
1073
1970
  }
1074
- finally { if (e_14) throw e_14.error; }
1971
+ finally { if (e_18) throw e_18.error; }
1075
1972
  return [7 /*endfinally*/];
1076
- case 11: return [2 /*return*/, res.json({ failures: failures.length > 0 ? failures : undefined, updated: updated })];
1973
+ case 21: return [2 /*return*/, res.json({ failures: failures.length > 0 ? failures : undefined, updated: updated })];
1077
1974
  }
1078
1975
  });
1079
1976
  }); })], false));
1080
1977
  modelBase.use((0, api_1.modelRouter)(config.model, routerOptions));
1081
1978
  app.use("".concat(basePath).concat(config.routePath), modelBase);
1082
1979
  };
1980
+ var this_1 = this;
1083
1981
  try {
1084
1982
  // Mount modelRouter for each model with IsAdmin permissions
1085
1983
  for (var modelConfigs_2 = __values(modelConfigs), modelConfigs_2_1 = modelConfigs_2.next(); !modelConfigs_2_1.done; modelConfigs_2_1 = modelConfigs_2.next()) {
@@ -1087,12 +1985,12 @@ var AdminApp = /** @class */ (function () {
1087
1985
  _loop_2(config);
1088
1986
  }
1089
1987
  }
1090
- catch (e_5_1) { e_5 = { error: e_5_1 }; }
1988
+ catch (e_8_1) { e_8 = { error: e_8_1 }; }
1091
1989
  finally {
1092
1990
  try {
1093
1991
  if (modelConfigs_2_1 && !modelConfigs_2_1.done && (_b = modelConfigs_2.return)) _b.call(modelConfigs_2);
1094
1992
  }
1095
- finally { if (e_5) throw e_5.error; }
1993
+ finally { if (e_8) throw e_8.error; }
1096
1994
  }
1097
1995
  // Mount script routes
1098
1996
  if (scriptConfigs.length > 0) {
@@ -1108,12 +2006,19 @@ var AdminApp = /** @class */ (function () {
1108
2006
  var scriptNames = scripts.map(function (s) { return s.name; });
1109
2007
  // GET /admin/scripts/runs — Paginated history of script runs (BackgroundTasks)
1110
2008
  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) {
2009
+ var user, _a, limit, page, skip, requestedName, taskTypeFilter, query, _b, tasks, total, data;
2010
+ return __generator(this, function (_c) {
2011
+ switch (_c.label) {
1114
2012
  case 0:
1115
2013
  user = req.user;
1116
- if (!(user === null || user === void 0 ? void 0 : user.admin)) {
2014
+ _a = !user;
2015
+ if (_a) return [3 /*break*/, 2];
2016
+ return [4 /*yield*/, this.hasScriptPermission(user, "viewBackgroundTasks")];
2017
+ case 1:
2018
+ _a = !(_c.sent());
2019
+ _c.label = 2;
2020
+ case 2:
2021
+ if (_a) {
1117
2022
  throw new api_1.APIError({ status: 403, title: "Only admins can view run history" });
1118
2023
  }
1119
2024
  limit = Math.min(Math.max(Number(req.query.limit) || 25, 1), 100);
@@ -1138,8 +2043,8 @@ var AdminApp = /** @class */ (function () {
1138
2043
  .lean(),
1139
2044
  api_1.BackgroundTask.countDocuments(query),
1140
2045
  ])];
1141
- case 1:
1142
- _a = __read.apply(void 0, [_b.sent(), 2]), tasks = _a[0], total = _a[1];
2046
+ case 3:
2047
+ _b = __read.apply(void 0, [_c.sent(), 2]), tasks = _b[0], total = _b[1];
1143
2048
  data = tasks.map(function (task) {
1144
2049
  var _a;
1145
2050
  var createdBy = task.createdBy;
@@ -1156,15 +2061,22 @@ var AdminApp = /** @class */ (function () {
1156
2061
  }); }));
1157
2062
  // POST /admin/scripts/:name/run — Execute a script
1158
2063
  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;
2064
+ 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;
2065
+ var e_20, _j, e_21, _k;
1161
2066
  var _this = this;
1162
- var _k, _l;
1163
- return __generator(this, function (_m) {
1164
- switch (_m.label) {
2067
+ var _l, _m;
2068
+ return __generator(this, function (_o) {
2069
+ switch (_o.label) {
1165
2070
  case 0:
1166
2071
  user = req.user;
1167
- if (!(user === null || user === void 0 ? void 0 : user.admin)) {
2072
+ _a = !user;
2073
+ if (_a) return [3 /*break*/, 2];
2074
+ return [4 /*yield*/, this.hasScriptPermission(user, "runScripts")];
2075
+ case 1:
2076
+ _a = !(_o.sent());
2077
+ _o.label = 2;
2078
+ case 2:
2079
+ if (_a) {
1168
2080
  throw new api_1.APIError({ status: 403, title: "Only admins can run scripts" });
1169
2081
  }
1170
2082
  script = scriptsByName.get(req.params.name);
@@ -1174,20 +2086,20 @@ var AdminApp = /** @class */ (function () {
1174
2086
  isWetRun = req.query.wetRun === "true";
1175
2087
  argValues = {};
1176
2088
  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];
2089
+ for (_b = __values(Object.entries(req.query)), _c = _b.next(); !_c.done; _c = _b.next()) {
2090
+ _d = __read(_c.value, 2), key = _d[0], value = _d[1];
1179
2091
  if (scriptCli_1.RESERVED_SCRIPT_FLAGS.includes(key) || value === undefined) {
1180
2092
  continue;
1181
2093
  }
1182
2094
  argValues[key] = value;
1183
2095
  }
1184
2096
  }
1185
- catch (e_15_1) { e_15 = { error: e_15_1 }; }
2097
+ catch (e_20_1) { e_20 = { error: e_20_1 }; }
1186
2098
  finally {
1187
2099
  try {
1188
- if (_b && !_b.done && (_h = _a.return)) _h.call(_a);
2100
+ if (_c && !_c.done && (_j = _b.return)) _j.call(_b);
1189
2101
  }
1190
- finally { if (e_15) throw e_15.error; }
2102
+ finally { if (e_20) throw e_20.error; }
1191
2103
  }
1192
2104
  rawBody = req.body && typeof req.body === "object" && !Array.isArray(req.body)
1193
2105
  ? req.body
@@ -1196,25 +2108,25 @@ var AdminApp = /** @class */ (function () {
1196
2108
  ? rawBody.args
1197
2109
  : rawBody;
1198
2110
  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];
2111
+ for (_e = __values(Object.entries(bodyValues)), _f = _e.next(); !_f.done; _f = _e.next()) {
2112
+ _g = __read(_f.value, 2), key = _g[0], value = _g[1];
1201
2113
  if (scriptCli_1.RESERVED_SCRIPT_FLAGS.includes(key)) {
1202
2114
  continue;
1203
2115
  }
1204
2116
  argValues[key] = value;
1205
2117
  }
1206
2118
  }
1207
- catch (e_16_1) { e_16 = { error: e_16_1 }; }
2119
+ catch (e_21_1) { e_21 = { error: e_21_1 }; }
1208
2120
  finally {
1209
2121
  try {
1210
- if (_e && !_e.done && (_j = _d.return)) _j.call(_d);
2122
+ if (_f && !_f.done && (_k = _e.return)) _k.call(_e);
1211
2123
  }
1212
- finally { if (e_16) throw e_16.error; }
2124
+ finally { if (e_21) throw e_21.error; }
1213
2125
  }
1214
- _g = (0, api_1.createScriptArgs)({
1215
- defs: (_k = script.args) !== null && _k !== void 0 ? _k : [],
2126
+ _h = (0, api_1.createScriptArgs)({
2127
+ defs: (_l = script.args) !== null && _l !== void 0 ? _l : [],
1216
2128
  values: argValues,
1217
- }), args = _g.args, argErrors = _g.errors;
2129
+ }), args = _h.args, argErrors = _h.errors;
1218
2130
  if (argErrors.length > 0) {
1219
2131
  throw new api_1.APIError({
1220
2132
  detail: argErrors.join("; "),
@@ -1223,25 +2135,25 @@ var AdminApp = /** @class */ (function () {
1223
2135
  });
1224
2136
  }
1225
2137
  now = luxon_1.DateTime.now().toJSDate();
1226
- _m.label = 1;
1227
- case 1:
1228
- _m.trys.push([1, 3, , 4]);
2138
+ _o.label = 3;
2139
+ case 3:
2140
+ _o.trys.push([3, 5, , 6]);
1229
2141
  return [4 /*yield*/, api_1.BackgroundTask.create({
1230
2142
  createdBy: user._id,
1231
2143
  isDryRun: !isWetRun,
1232
2144
  logs: [
1233
- { level: "info", message: "Script started by ".concat((_l = user.name) !== null && _l !== void 0 ? _l : "admin"), timestamp: now },
2145
+ { level: "info", message: "Script started by ".concat((_m = user.name) !== null && _m !== void 0 ? _m : "admin"), timestamp: now },
1234
2146
  ],
1235
2147
  progress: { message: "Starting...", percentage: 0, stage: "Queued" },
1236
2148
  startedAt: now,
1237
2149
  status: "running",
1238
2150
  taskType: script.name,
1239
2151
  })];
1240
- case 2:
1241
- task = (_m.sent());
1242
- return [3 /*break*/, 4];
1243
- case 3:
1244
- err_5 = _m.sent();
2152
+ case 4:
2153
+ task = (_o.sent());
2154
+ return [3 /*break*/, 6];
2155
+ case 5:
2156
+ err_5 = _o.sent();
1245
2157
  detail = err_5 instanceof Error ? err_5.message : String(err_5);
1246
2158
  api_1.logger.error("Failed to create background task for ".concat(script.name, ": ").concat(detail));
1247
2159
  throw new api_1.APIError({
@@ -1249,7 +2161,7 @@ var AdminApp = /** @class */ (function () {
1249
2161
  status: 500,
1250
2162
  title: "Failed to create background task for script: ".concat(script.name),
1251
2163
  });
1252
- case 4:
2164
+ case 6:
1253
2165
  ctx = {
1254
2166
  addLog: function (level, message) { return __awaiter(_this, void 0, void 0, function () {
1255
2167
  var current;
@@ -1349,26 +2261,33 @@ var AdminApp = /** @class */ (function () {
1349
2261
  }); }));
1350
2262
  // GET /admin/scripts/tasks/:id — Poll task status
1351
2263
  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) {
2264
+ var user, _a, task, err_7, detail;
2265
+ return __generator(this, function (_b) {
2266
+ switch (_b.label) {
1355
2267
  case 0:
1356
2268
  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;
2269
+ _a = !user;
2270
+ if (_a) return [3 /*break*/, 2];
2271
+ return [4 /*yield*/, this.hasScriptPermission(user, "viewBackgroundTasks")];
1361
2272
  case 1:
1362
- _a.trys.push([1, 3, , 4]);
1363
- return [4 /*yield*/, api_1.BackgroundTask.findById(req.params.id)];
2273
+ _a = !(_b.sent());
2274
+ _b.label = 2;
1364
2275
  case 2:
1365
- task = _a.sent();
1366
- return [3 /*break*/, 4];
2276
+ if (_a) {
2277
+ throw new api_1.APIError({ status: 403, title: "Only admins can view tasks" });
2278
+ }
2279
+ _b.label = 3;
1367
2280
  case 3:
1368
- err_7 = _a.sent();
2281
+ _b.trys.push([3, 5, , 6]);
2282
+ return [4 /*yield*/, api_1.BackgroundTask.findById(req.params.id)];
2283
+ case 4:
2284
+ task = _b.sent();
2285
+ return [3 /*break*/, 6];
2286
+ case 5:
2287
+ err_7 = _b.sent();
1369
2288
  detail = err_7 instanceof Error ? err_7.message : String(err_7);
1370
2289
  throw new api_1.APIError({ detail: detail, status: 400, title: "Invalid task ID" });
1371
- case 4:
2290
+ case 6:
1372
2291
  if (!task) {
1373
2292
  throw new api_1.APIError({ status: 404, title: "Task not found" });
1374
2293
  }
@@ -1378,27 +2297,34 @@ var AdminApp = /** @class */ (function () {
1378
2297
  }); }));
1379
2298
  // DELETE /admin/scripts/tasks/:id — Cancel a running task
1380
2299
  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) {
2300
+ var user, _a, task, err_8, detail, cancelled;
2301
+ var _b;
2302
+ return __generator(this, function (_c) {
2303
+ switch (_c.label) {
1385
2304
  case 0:
1386
2305
  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;
2306
+ _a = !user;
2307
+ if (_a) return [3 /*break*/, 2];
2308
+ return [4 /*yield*/, this.hasScriptPermission(user, "runScripts")];
1391
2309
  case 1:
1392
- _b.trys.push([1, 3, , 4]);
1393
- return [4 /*yield*/, api_1.BackgroundTask.findById(req.params.id)];
2310
+ _a = !(_c.sent());
2311
+ _c.label = 2;
1394
2312
  case 2:
1395
- task = _b.sent();
1396
- return [3 /*break*/, 4];
2313
+ if (_a) {
2314
+ throw new api_1.APIError({ status: 403, title: "Only admins can cancel tasks" });
2315
+ }
2316
+ _c.label = 3;
1397
2317
  case 3:
1398
- err_8 = _b.sent();
2318
+ _c.trys.push([3, 5, , 6]);
2319
+ return [4 /*yield*/, api_1.BackgroundTask.findById(req.params.id)];
2320
+ case 4:
2321
+ task = _c.sent();
2322
+ return [3 /*break*/, 6];
2323
+ case 5:
2324
+ err_8 = _c.sent();
1399
2325
  detail = err_8 instanceof Error ? err_8.message : String(err_8);
1400
2326
  throw new api_1.APIError({ detail: detail, status: 400, title: "Invalid task ID" });
1401
- case 4:
2327
+ case 6:
1402
2328
  if (!task) {
1403
2329
  throw new api_1.APIError({ status: 404, title: "Task not found" });
1404
2330
  }
@@ -1412,7 +2338,7 @@ var AdminApp = /** @class */ (function () {
1412
2338
  $push: {
1413
2339
  logs: {
1414
2340
  level: "info",
1415
- message: "Task cancelled by ".concat((_a = user.name) !== null && _a !== void 0 ? _a : "admin"),
2341
+ message: "Task cancelled by ".concat((_b = user.name) !== null && _b !== void 0 ? _b : "admin"),
1416
2342
  timestamp: luxon_1.DateTime.now().toJSDate(),
1417
2343
  },
1418
2344
  },
@@ -1421,8 +2347,8 @@ var AdminApp = /** @class */ (function () {
1421
2347
  status: "cancelled",
1422
2348
  },
1423
2349
  }, { returnDocument: "after" })];
1424
- case 5:
1425
- cancelled = _b.sent();
2350
+ case 7:
2351
+ cancelled = _c.sent();
1426
2352
  if (!cancelled) {
1427
2353
  throw new api_1.APIError({
1428
2354
  status: 409,