@terreno/api 57.4.0 → 57.6.1

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 (210) hide show
  1. package/README.md +5 -5
  2. package/bunfig.toml +1 -1
  3. package/dist/actions.js +197 -368
  4. package/dist/adminModelRouter.js +88 -173
  5. package/dist/api.js +617 -852
  6. package/dist/audit/auditApp.js +48 -89
  7. package/dist/audit/auditEventModel.js +15 -16
  8. package/dist/audit/cloudTasksEnqueue.js +56 -149
  9. package/dist/audit/diff.js +70 -160
  10. package/dist/audit/processQueue.js +25 -70
  11. package/dist/audit/rbacSink.js +25 -66
  12. package/dist/audit/record.js +129 -251
  13. package/dist/auth.js +432 -681
  14. package/dist/authRecovery.js +155 -269
  15. package/dist/authTokens.js +43 -118
  16. package/dist/betterAuthApp.js +25 -26
  17. package/dist/betterAuthSetup.js +258 -413
  18. package/dist/browserLogsRoute.d.ts +6 -0
  19. package/dist/browserLogsRoute.js +97 -0
  20. package/dist/collectionRegistry.js +32 -47
  21. package/dist/config.js +53 -122
  22. package/dist/configurationApp.js +180 -361
  23. package/dist/configurationPlugin.js +130 -302
  24. package/dist/consentApp.js +276 -421
  25. package/dist/docLoader.js +78 -126
  26. package/dist/envConfigurationPlugin.js +25 -147
  27. package/dist/errors.js +151 -247
  28. package/dist/example.js +28 -34
  29. package/dist/expressServer.d.ts +10 -0
  30. package/dist/expressServer.js +109 -255
  31. package/dist/frameworkModelNames.d.ts +24 -0
  32. package/dist/frameworkModelNames.js +31 -0
  33. package/dist/githubAuth.js +152 -216
  34. package/dist/httpClient.js +176 -264
  35. package/dist/index.d.ts +2 -0
  36. package/dist/index.js +7 -2
  37. package/dist/logger.js +145 -278
  38. package/dist/mcp/auth.js +76 -128
  39. package/dist/mcp/createMCPRequest.js +4 -5
  40. package/dist/mcp/handlers.js +268 -480
  41. package/dist/mcp/query.js +56 -150
  42. package/dist/mcp/registry.js +17 -30
  43. package/dist/mcp/schemaGenerator.js +95 -181
  44. package/dist/mcp/server.js +28 -100
  45. package/dist/mcp/serviceTokens.js +102 -191
  46. package/dist/mcp/toolGenerator.js +78 -191
  47. package/dist/middleware.js +15 -27
  48. package/dist/migrations/fixtures/all-down/20260910120000-one.js +2 -42
  49. package/dist/migrations/fixtures/all-down/20260910120001-two.js +2 -42
  50. package/dist/migrations/fixtures/bad-id/20260910120000-mismatch.js +1 -39
  51. package/dist/migrations/fixtures/bad-name/not-a-migration.js +1 -39
  52. package/dist/migrations/fixtures/valid/20260910120000-alpha.js +1 -39
  53. package/dist/migrations/fixtures/valid/20260910120001-beta.js +2 -42
  54. package/dist/migrations/generate.js +107 -229
  55. package/dist/migrations/load.js +75 -201
  56. package/dist/migrations/lock.js +54 -126
  57. package/dist/migrations/runner.js +192 -446
  58. package/dist/migrations/schemaCatalog.js +122 -263
  59. package/dist/models/consentForm.js +6 -6
  60. package/dist/models/consentResponse.js +5 -5
  61. package/dist/models/mcpServiceToken.js +66 -156
  62. package/dist/models/notification.js +6 -6
  63. package/dist/models/notificationPreference.js +6 -6
  64. package/dist/models/versionConfig.js +5 -5
  65. package/dist/notifications/notificationService.js +133 -273
  66. package/dist/notifications/notificationsApp.js +85 -179
  67. package/dist/notifications/notificationsBeforeSend.js +19 -64
  68. package/dist/notifiers/googleChatNotifier.js +36 -117
  69. package/dist/notifiers/slackNotifier.d.ts +31 -2
  70. package/dist/notifiers/slackNotifier.js +170 -119
  71. package/dist/notifiers/zoomNotifier.js +60 -111
  72. package/dist/openApi.js +107 -122
  73. package/dist/openApiBuilder.js +117 -159
  74. package/dist/openApiCompat.js +81 -148
  75. package/dist/openApiEtag.js +7 -7
  76. package/dist/openApiValidator.js +177 -286
  77. package/dist/orgs/orgContext.js +87 -157
  78. package/dist/orgs/orgPermissions.js +29 -68
  79. package/dist/orgs/orgPlugin.js +9 -27
  80. package/dist/orgs/organizationModel.js +65 -166
  81. package/dist/orgs/organizationSettings.js +29 -36
  82. package/dist/orgs/orgsApp.js +346 -608
  83. package/dist/permissions.js +88 -181
  84. package/dist/plugins.js +125 -218
  85. package/dist/populate.js +130 -240
  86. package/dist/rateLimit/applyTrustProxy.js +1 -1
  87. package/dist/rateLimit/createStore.js +7 -8
  88. package/dist/rateLimit/memoryStore.js +22 -100
  89. package/dist/rateLimit/middleware.js +48 -99
  90. package/dist/rateLimit/mongoStore.js +54 -112
  91. package/dist/rateLimit/policies.js +41 -75
  92. package/dist/rateLimit/redisStore.js +39 -133
  93. package/dist/rbac/access.js +119 -267
  94. package/dist/rbac/assertAllowed.js +95 -171
  95. package/dist/rbac/auditModel.js +14 -58
  96. package/dist/rbac/backfillAdmins.js +24 -130
  97. package/dist/rbac/fieldViews.js +46 -141
  98. package/dist/rbac/membershipOrgAdminSource.js +28 -99
  99. package/dist/rbac/middleware.js +30 -96
  100. package/dist/rbac/modelRouterAccess.js +130 -307
  101. package/dist/rbac/permissionUtils.js +40 -179
  102. package/dist/rbac/realtimeAccess.js +81 -147
  103. package/dist/rbac/resolve.d.ts +1 -1
  104. package/dist/rbac/resolve.js +148 -342
  105. package/dist/rbac/roleManager.js +318 -700
  106. package/dist/rbac/roleModel.js +44 -171
  107. package/dist/rbac/routes.js +93 -196
  108. package/dist/rbac/scopes.js +39 -133
  109. package/dist/rbac/statements.js +23 -91
  110. package/dist/rbac/userPlugin.js +3 -29
  111. package/dist/realtime/changeStreamWatcher.js +489 -800
  112. package/dist/realtime/deprecation.js +8 -10
  113. package/dist/realtime/queryMatcher.js +110 -191
  114. package/dist/realtime/queryStore.js +35 -118
  115. package/dist/realtime/realtimeApp.js +247 -401
  116. package/dist/realtime/registry.js +19 -30
  117. package/dist/realtime/sessionRevalidation.js +132 -358
  118. package/dist/realtime/socketAuth.js +89 -208
  119. package/dist/realtime/socketUser.js +10 -56
  120. package/dist/requestContext.js +93 -139
  121. package/dist/schemaMetadata.js +179 -274
  122. package/dist/scriptRunner.js +96 -266
  123. package/dist/scrubAdminFields.js +36 -108
  124. package/dist/secretProviders.js +130 -299
  125. package/dist/seedRunner.js +221 -514
  126. package/dist/sync/adminBroadcastScope.js +58 -170
  127. package/dist/sync/adminWindowAccess.js +15 -86
  128. package/dist/sync/adminWindowMutation.js +110 -181
  129. package/dist/sync/executors.js +425 -629
  130. package/dist/sync/loadHarness.js +392 -689
  131. package/dist/sync/models.js +181 -341
  132. package/dist/sync/mutationHandler.js +533 -801
  133. package/dist/sync/registrationSideEffects.js +41 -95
  134. package/dist/sync/registry.js +29 -49
  135. package/dist/sync/routes.js +484 -817
  136. package/dist/sync/scripts/compactTombstones.js +83 -228
  137. package/dist/sync/serialize.js +18 -58
  138. package/dist/sync/socketHandlers.js +253 -478
  139. package/dist/sync/streams.js +49 -117
  140. package/dist/sync/syncApp.js +12 -15
  141. package/dist/sync/syncBatch.js +63 -168
  142. package/dist/sync/syncSeqPlugin.js +430 -702
  143. package/dist/syncConsents.js +113 -253
  144. package/dist/terrenoApp.js +166 -276
  145. package/dist/tests/createTestData.js +146 -256
  146. package/dist/tests/models.js +14 -54
  147. package/dist/tests/mongoTestSetup.js +42 -103
  148. package/dist/tests/testHelper.js +31 -93
  149. package/dist/tests.js +12 -51
  150. package/dist/transformers.js +61 -164
  151. package/dist/utils.js +31 -93
  152. package/dist/vendor/wesleytodd-openapi/index.js +37 -51
  153. package/dist/vendor/wesleytodd-openapi/lib/generate-doc.js +32 -40
  154. package/dist/vendor/wesleytodd-openapi/lib/layer-schema.js +3 -3
  155. package/dist/vendor/wesleytodd-openapi/lib/ui.js +50 -19
  156. package/dist/vendor/wesleytodd-openapi/lib/validate.js +19 -47
  157. package/dist/versionCheckPlugin.js +52 -100
  158. package/dist/webhooks/headerValue.js +2 -2
  159. package/dist/webhooks/idempotency/memoryStore.js +16 -59
  160. package/dist/webhooks/idempotency/mongoStore.js +55 -130
  161. package/dist/webhooks/idempotency/webhookReceipt.js +9 -9
  162. package/dist/webhooks/rawBody.js +1 -1
  163. package/dist/webhooks/timingSafeEqual.js +4 -5
  164. package/dist/webhooks/verifiers/hmac.js +17 -18
  165. package/dist/webhooks/verifiers/sendgrid.js +20 -22
  166. package/dist/webhooks/verifiers/stripe.js +31 -65
  167. package/dist/webhooks/verifiers/twilio.js +23 -73
  168. package/dist/webhooks/webhooksApp.js +78 -177
  169. package/dist/zodOpenApi.js +2 -2
  170. package/package.json +6 -6
  171. package/src/__tests__/browserLogsRoute.test.ts +165 -0
  172. package/src/api.arrayOperations.test.ts +44 -0
  173. package/src/api.ts +64 -39
  174. package/src/audit/auditApp.test.ts +5 -5
  175. package/src/audit/auditEventModel.ts +7 -3
  176. package/src/audit/auditRouter.test.ts +5 -5
  177. package/src/audit/rbacSink.test.ts +2 -2
  178. package/src/audit/record.test.ts +2 -2
  179. package/src/audit/record.ts +3 -2
  180. package/src/auth.ts +1 -1
  181. package/src/authRecovery.test.ts +43 -0
  182. package/src/authRecovery.ts +16 -10
  183. package/src/authTokens.ts +6 -2
  184. package/src/authVerification.test.ts +22 -0
  185. package/src/browserLogsRoute.ts +110 -0
  186. package/src/configurationPlugin.test.ts +1 -11
  187. package/src/expressServer.ts +10 -0
  188. package/src/frameworkModelNames.test.ts +62 -0
  189. package/src/frameworkModelNames.ts +33 -0
  190. package/src/index.ts +7 -0
  191. package/src/isolated/migrateCliConnect.isolated.ts +51 -0
  192. package/src/mcp/auth.test.ts +34 -1
  193. package/src/migrations/cli.test.ts +0 -23
  194. package/src/models/mcpServiceToken.ts +4 -3
  195. package/src/models/notification.ts +3 -2
  196. package/src/models/notificationPreference.ts +1 -1
  197. package/src/notifications/notificationsApp.test.ts +24 -1
  198. package/src/notifiers/slackNotifier.test.ts +186 -1
  199. package/src/notifiers/slackNotifier.ts +167 -8
  200. package/src/orgs/orgPlugin.ts +1 -1
  201. package/src/orgs/organizationModel.ts +11 -6
  202. package/src/plugins.test.ts +5 -0
  203. package/src/plugins.ts +3 -0
  204. package/src/realtime/realtimeApp.ts +1 -1
  205. package/src/sync/integration.test.ts +2 -2
  206. package/src/terrenoApp.ts +3 -0
  207. package/src/types.d.ts +1 -0
  208. package/src/webhooks/idempotency/webhookReceipt.ts +4 -3
  209. package/tsconfig.json +13 -54
  210. package/tsconfig.typedoc.json +2 -0
@@ -1,81 +1,20 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
- var __generator = (this && this.__generator) || function (thisArg, body) {
12
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
13
- return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
- function verb(n) { return function (v) { return step([n, v]); }; }
15
- function step(op) {
16
- if (f) throw new TypeError("Generator is already executing.");
17
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
18
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
19
- if (y = 0, t) op = [op[0] & 2, t.value];
20
- switch (op[0]) {
21
- case 0: case 1: t = op; break;
22
- case 4: _.label++; return { value: op[1], done: false };
23
- case 5: _.label++; y = op[1]; op = [0]; continue;
24
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
25
- default:
26
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
27
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
28
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
29
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
30
- if (t[2]) _.ops.pop();
31
- _.trys.pop(); continue;
32
- }
33
- op = body.call(thisArg, _);
34
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
35
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
- }
37
- };
38
- var __read = (this && this.__read) || function (o, n) {
39
- var m = typeof Symbol === "function" && o[Symbol.iterator];
40
- if (!m) return o;
41
- var i = m.call(o), r, ar = [], e;
42
- try {
43
- while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
44
- }
45
- catch (error) { e = { error: error }; }
46
- finally {
47
- try {
48
- if (r && !r.done && (m = i["return"])) m.call(i);
49
- }
50
- finally { if (e) throw e.error; }
51
- }
52
- return ar;
53
- };
54
- var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
55
- if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
56
- if (ar || !(i in from)) {
57
- if (!ar) ar = Array.prototype.slice.call(from, 0, i);
58
- ar[i] = from[i];
59
- }
60
- }
61
- return to.concat(ar || Array.prototype.slice.call(from));
62
- };
63
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
64
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
65
4
  };
66
5
  Object.defineProperty(exports, "__esModule", { value: true });
67
6
  exports.addMcpServiceTokenRoutes = exports.resolveMcpServiceTokensOption = exports.MAX_ACTIVE_MCP_SERVICE_TOKENS = void 0;
68
- var luxon_1 = require("luxon");
69
- var mongoose_1 = __importDefault(require("mongoose"));
70
- var api_1 = require("../api");
71
- var auth_1 = require("../auth");
72
- var errors_1 = require("../errors");
73
- var mcpServiceToken_1 = require("../models/mcpServiceToken");
74
- var openApiBuilder_1 = require("../openApiBuilder");
7
+ const luxon_1 = require("luxon");
8
+ const mongoose_1 = __importDefault(require("mongoose"));
9
+ const api_1 = require("../api");
10
+ const auth_1 = require("../auth");
11
+ const errors_1 = require("../errors");
12
+ const mcpServiceToken_1 = require("../models/mcpServiceToken");
13
+ const openApiBuilder_1 = require("../openApiBuilder");
75
14
  exports.MAX_ACTIVE_MCP_SERVICE_TOKENS = 10;
76
- var DEFAULT_LIST_LIMIT = 100;
77
- var MAX_LIST_LIMIT = 100;
78
- var resolveMcpServiceTokensOption = function (option) {
15
+ const DEFAULT_LIST_LIMIT = 100;
16
+ const MAX_LIST_LIMIT = 100;
17
+ const resolveMcpServiceTokensOption = (option) => {
79
18
  if (option === true) {
80
19
  return { enabled: true };
81
20
  }
@@ -85,8 +24,8 @@ var resolveMcpServiceTokensOption = function (option) {
85
24
  return { enabled: false };
86
25
  };
87
26
  exports.resolveMcpServiceTokensOption = resolveMcpServiceTokensOption;
88
- var bearerFromRequest = function (req) {
89
- var authorization = req.headers.authorization;
27
+ const bearerFromRequest = (req) => {
28
+ const authorization = req.headers.authorization;
90
29
  if (typeof authorization !== "string") {
91
30
  return undefined;
92
31
  }
@@ -95,39 +34,39 @@ var bearerFromRequest = function (req) {
95
34
  }
96
35
  return authorization;
97
36
  };
98
- var rejectMcpServiceTokenBearer = function (req, _res, next) {
99
- var token = bearerFromRequest(req);
100
- if (token === null || token === void 0 ? void 0 : token.startsWith("mcp_")) {
37
+ const rejectMcpServiceTokenBearer = (req, _res, next) => {
38
+ const token = bearerFromRequest(req);
39
+ if (token?.startsWith("mcp_")) {
101
40
  next(new errors_1.UnauthorizedError("MCP service tokens cannot manage service tokens"));
102
41
  return;
103
42
  }
104
43
  next();
105
44
  };
106
- var requireAuthenticatedUser = function (req) {
107
- var user = req.user;
108
- if (!(user === null || user === void 0 ? void 0 : user._id)) {
45
+ const requireAuthenticatedUser = (req) => {
46
+ const user = req.user;
47
+ if (!user?._id) {
109
48
  throw new errors_1.UnauthorizedError("Unauthorized");
110
49
  }
111
50
  return user;
112
51
  };
113
- var parseName = function (value) {
52
+ const parseName = (value) => {
114
53
  if (typeof value !== "string") {
115
54
  throw new errors_1.BadRequestError({ title: "name is required" });
116
55
  }
117
- var name = value.trim();
56
+ const name = value.trim();
118
57
  if (!name) {
119
58
  throw new errors_1.BadRequestError({ title: "name is required" });
120
59
  }
121
60
  return name;
122
61
  };
123
- var parseExpiresAt = function (value) {
62
+ const parseExpiresAt = (value) => {
124
63
  if (value === undefined || value === null || value === "") {
125
64
  return undefined;
126
65
  }
127
66
  if (typeof value !== "string") {
128
67
  throw new errors_1.BadRequestError({ title: "expiresAt must be an ISO-8601 datetime string" });
129
68
  }
130
- var parsed = luxon_1.DateTime.fromISO(value, { setZone: true });
69
+ const parsed = luxon_1.DateTime.fromISO(value, { setZone: true });
131
70
  if (!parsed.isValid) {
132
71
  throw new errors_1.BadRequestError({ title: "expiresAt must be an ISO-8601 datetime string" });
133
72
  }
@@ -136,40 +75,39 @@ var parseExpiresAt = function (value) {
136
75
  }
137
76
  return parsed.toUTC().toJSDate();
138
77
  };
139
- var parsePage = function (value) {
78
+ const parsePage = (value) => {
140
79
  if (value === undefined) {
141
80
  return 1;
142
81
  }
143
- var page = Number(value);
82
+ const page = Number(value);
144
83
  if (!Number.isInteger(page) || page < 1) {
145
84
  throw new errors_1.BadRequestError({ code: "invalid-page", title: "Invalid page" });
146
85
  }
147
86
  return page;
148
87
  };
149
- var parseLimit = function (value) {
88
+ const parseLimit = (value) => {
150
89
  if (value === undefined) {
151
90
  return DEFAULT_LIST_LIMIT;
152
91
  }
153
- var limit = Number(value);
92
+ const limit = Number(value);
154
93
  if (!Number.isInteger(limit) || limit < 1) {
155
94
  throw new errors_1.BadRequestError({ title: "Invalid limit" });
156
95
  }
157
96
  return Math.min(limit, MAX_LIST_LIMIT);
158
97
  };
159
- var resolveMcpUrl = function (req, publicMcpUrl) {
160
- var _a;
161
- var configured = publicMcpUrl !== null && publicMcpUrl !== void 0 ? publicMcpUrl : process.env.BETTER_AUTH_URL;
98
+ const resolveMcpUrl = (req, publicMcpUrl) => {
99
+ const configured = publicMcpUrl ?? process.env.BETTER_AUTH_URL;
162
100
  if (configured) {
163
- var base = configured.replace(/\/$/, "");
101
+ const base = configured.replace(/\/$/, "");
164
102
  if (base.endsWith("/mcp")) {
165
103
  return base;
166
104
  }
167
- return "".concat(base, "/mcp");
105
+ return `${base}/mcp`;
168
106
  }
169
- var host = (_a = req.get("host")) !== null && _a !== void 0 ? _a : "localhost";
170
- return "".concat(req.protocol, "://").concat(host, "/mcp");
107
+ const host = req.get("host") ?? "localhost";
108
+ return `${req.protocol}://${host}/mcp`;
171
109
  };
172
- var toListItem = function (doc) {
110
+ const toListItem = (doc) => {
173
111
  return {
174
112
  created: doc.created.toISOString(),
175
113
  expiresAt: doc.expiresAt ? doc.expiresAt.toISOString() : null,
@@ -180,8 +118,8 @@ var toListItem = function (doc) {
180
118
  tokenPrefix: doc.tokenPrefix,
181
119
  };
182
120
  };
183
- var serviceTokenGuards = [rejectMcpServiceTokenBearer, (0, auth_1.authenticateMiddleware)()];
184
- var createdTokenFields = {
121
+ const serviceTokenGuards = [rejectMcpServiceTokenBearer, (0, auth_1.authenticateMiddleware)()];
122
+ const createdTokenFields = {
185
123
  created: { type: "string" },
186
124
  expiresAt: { type: "string" },
187
125
  id: { type: "string" },
@@ -190,10 +128,10 @@ var createdTokenFields = {
190
128
  token: { type: "string" },
191
129
  tokenPrefix: { type: "string" },
192
130
  };
193
- var addMcpServiceTokenRoutes = function (app, options) {
194
- if (options === void 0) { options = {}; }
195
- var openApiOptions = { openApi: options.openApi };
196
- app.post("/mcp/service-tokens", __spreadArray(__spreadArray([], __read(serviceTokenGuards), false), [
131
+ const addMcpServiceTokenRoutes = (app, options = {}) => {
132
+ const openApiOptions = { openApi: options.openApi };
133
+ app.post("/mcp/service-tokens", [
134
+ ...serviceTokenGuards,
197
135
  (0, openApiBuilder_1.createOpenApiBuilder)(openApiOptions)
198
136
  .withTags(["mcp"])
199
137
  .withOperationId("createMcpServiceToken")
@@ -217,43 +155,33 @@ var addMcpServiceTokenRoutes = function (app, options) {
217
155
  },
218
156
  })
219
157
  .build(),
220
- ], false), (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
221
- var user, name, expiresAt, activeCount, issued;
222
- var _a, _b;
223
- return __generator(this, function (_c) {
224
- switch (_c.label) {
225
- case 0:
226
- user = requireAuthenticatedUser(req);
227
- name = parseName((_a = req.body) === null || _a === void 0 ? void 0 : _a.name);
228
- expiresAt = parseExpiresAt((_b = req.body) === null || _b === void 0 ? void 0 : _b.expiresAt);
229
- return [4 /*yield*/, mcpServiceToken_1.McpServiceToken.countActiveForUser(new mongoose_1.default.Types.ObjectId(String(user._id)))];
230
- case 1:
231
- activeCount = _c.sent();
232
- if (activeCount >= exports.MAX_ACTIVE_MCP_SERVICE_TOKENS) {
233
- throw new errors_1.BadRequestError({
234
- title: "Maximum of ".concat(exports.MAX_ACTIVE_MCP_SERVICE_TOKENS, " active MCP service tokens"),
235
- });
236
- }
237
- return [4 /*yield*/, mcpServiceToken_1.McpServiceToken.issueFor({ _id: user._id }, { expiresAt: expiresAt, name: name })];
238
- case 2:
239
- issued = _c.sent();
240
- return [2 /*return*/, res.json({
241
- data: {
242
- created: issued.mcpServiceToken.created.toISOString(),
243
- expiresAt: issued.mcpServiceToken.expiresAt
244
- ? issued.mcpServiceToken.expiresAt.toISOString()
245
- : null,
246
- id: String(issued.mcpServiceToken._id),
247
- mcpUrl: resolveMcpUrl(req, options.publicMcpUrl),
248
- name: issued.mcpServiceToken.name,
249
- token: issued.token,
250
- tokenPrefix: issued.mcpServiceToken.tokenPrefix,
251
- },
252
- })];
253
- }
158
+ ], (0, api_1.asyncHandler)(async (req, res) => {
159
+ const user = requireAuthenticatedUser(req);
160
+ const name = parseName(req.body?.name);
161
+ const expiresAt = parseExpiresAt(req.body?.expiresAt);
162
+ const activeCount = await mcpServiceToken_1.McpServiceToken.countActiveForUser(new mongoose_1.default.Types.ObjectId(String(user._id)));
163
+ if (activeCount >= exports.MAX_ACTIVE_MCP_SERVICE_TOKENS) {
164
+ throw new errors_1.BadRequestError({
165
+ title: `Maximum of ${exports.MAX_ACTIVE_MCP_SERVICE_TOKENS} active MCP service tokens`,
166
+ });
167
+ }
168
+ const issued = await mcpServiceToken_1.McpServiceToken.issueFor({ _id: user._id }, { expiresAt, name });
169
+ return res.json({
170
+ data: {
171
+ created: issued.mcpServiceToken.created.toISOString(),
172
+ expiresAt: issued.mcpServiceToken.expiresAt
173
+ ? issued.mcpServiceToken.expiresAt.toISOString()
174
+ : null,
175
+ id: String(issued.mcpServiceToken._id),
176
+ mcpUrl: resolveMcpUrl(req, options.publicMcpUrl),
177
+ name: issued.mcpServiceToken.name,
178
+ token: issued.token,
179
+ tokenPrefix: issued.mcpServiceToken.tokenPrefix,
180
+ },
254
181
  });
255
- }); }));
256
- app.get("/mcp/service-tokens", __spreadArray(__spreadArray([], __read(serviceTokenGuards), false), [
182
+ }));
183
+ app.get("/mcp/service-tokens", [
184
+ ...serviceTokenGuards,
257
185
  (0, openApiBuilder_1.createOpenApiBuilder)(openApiOptions)
258
186
  .withTags(["mcp"])
259
187
  .withOperationId("listMcpServiceTokens")
@@ -269,37 +197,28 @@ var addMcpServiceTokenRoutes = function (app, options) {
269
197
  total: { type: "number" },
270
198
  })
271
199
  .build(),
272
- ], false), (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
273
- var user, page, limit, filter, total, docs, more, pageDocs;
274
- return __generator(this, function (_a) {
275
- switch (_a.label) {
276
- case 0:
277
- user = requireAuthenticatedUser(req);
278
- page = parsePage(req.query.page);
279
- limit = parseLimit(req.query.limit);
280
- filter = { userId: new mongoose_1.default.Types.ObjectId(String(user._id)) };
281
- return [4 /*yield*/, mcpServiceToken_1.McpServiceToken.countDocuments(filter)];
282
- case 1:
283
- total = _a.sent();
284
- return [4 /*yield*/, mcpServiceToken_1.McpServiceToken.find(filter)
285
- .sort("-created")
286
- .skip((page - 1) * limit)
287
- .limit(limit + 1)];
288
- case 2:
289
- docs = _a.sent();
290
- more = docs.length > limit;
291
- pageDocs = more ? docs.slice(0, limit) : docs;
292
- return [2 /*return*/, res.json({
293
- data: pageDocs.map(toListItem),
294
- limit: limit,
295
- more: more,
296
- page: page,
297
- total: total,
298
- })];
299
- }
200
+ ], (0, api_1.asyncHandler)(async (req, res) => {
201
+ const user = requireAuthenticatedUser(req);
202
+ const page = parsePage(req.query.page);
203
+ const limit = parseLimit(req.query.limit);
204
+ const filter = { userId: new mongoose_1.default.Types.ObjectId(String(user._id)) };
205
+ const total = await mcpServiceToken_1.McpServiceToken.countDocuments(filter);
206
+ const docs = await mcpServiceToken_1.McpServiceToken.find(filter)
207
+ .sort("-created")
208
+ .skip((page - 1) * limit)
209
+ .limit(limit + 1);
210
+ const more = docs.length > limit;
211
+ const pageDocs = more ? docs.slice(0, limit) : docs;
212
+ return res.json({
213
+ data: pageDocs.map(toListItem),
214
+ limit,
215
+ more,
216
+ page,
217
+ total,
300
218
  });
301
- }); }));
302
- app.delete("/mcp/service-tokens/:id", __spreadArray(__spreadArray([], __read(serviceTokenGuards), false), [
219
+ }));
220
+ app.delete("/mcp/service-tokens/:id", [
221
+ ...serviceTokenGuards,
303
222
  (0, openApiBuilder_1.createOpenApiBuilder)(openApiOptions)
304
223
  .withTags(["mcp"])
305
224
  .withOperationId("revokeMcpServiceToken")
@@ -316,30 +235,22 @@ var addMcpServiceTokenRoutes = function (app, options) {
316
235
  },
317
236
  })
318
237
  .build(),
319
- ], false), (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
320
- var user, tokenId, revoked;
321
- return __generator(this, function (_a) {
322
- switch (_a.label) {
323
- case 0:
324
- user = requireAuthenticatedUser(req);
325
- tokenId = req.params.id;
326
- if (!mongoose_1.default.Types.ObjectId.isValid(tokenId)) {
327
- throw new errors_1.NotFoundError("MCP service token not found");
328
- }
329
- return [4 /*yield*/, mcpServiceToken_1.McpServiceToken.revokeForUser({ _id: user._id }, new mongoose_1.default.Types.ObjectId(tokenId))];
330
- case 1:
331
- revoked = _a.sent();
332
- if (!revoked) {
333
- throw new errors_1.NotFoundError("MCP service token not found");
334
- }
335
- return [2 /*return*/, res.json({
336
- data: {
337
- id: String(revoked._id),
338
- revokedAt: revoked.revokedAt ? revoked.revokedAt.toISOString() : null,
339
- },
340
- })];
341
- }
238
+ ], (0, api_1.asyncHandler)(async (req, res) => {
239
+ const user = requireAuthenticatedUser(req);
240
+ const tokenId = req.params.id;
241
+ if (!mongoose_1.default.Types.ObjectId.isValid(tokenId)) {
242
+ throw new errors_1.NotFoundError("MCP service token not found");
243
+ }
244
+ const revoked = await mcpServiceToken_1.McpServiceToken.revokeForUser({ _id: user._id }, new mongoose_1.default.Types.ObjectId(tokenId));
245
+ if (!revoked) {
246
+ throw new errors_1.NotFoundError("MCP service token not found");
247
+ }
248
+ return res.json({
249
+ data: {
250
+ id: String(revoked._id),
251
+ revokedAt: revoked.revokedAt ? revoked.revokedAt.toISOString() : null,
252
+ },
342
253
  });
343
- }); }));
254
+ }));
344
255
  };
345
256
  exports.addMcpServiceTokenRoutes = addMcpServiceTokenRoutes;