@terreno/api 57.2.0 → 57.3.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.
- package/README.md +17 -7
- package/dist/actions.js +19 -7
- package/dist/api.d.ts +4 -0
- package/dist/api.js +12 -24
- package/dist/auth.d.ts +23 -10
- package/dist/auth.js +97 -32
- package/dist/authRecovery.d.ts +5 -0
- package/dist/authRecovery.js +350 -0
- package/dist/authTokens.d.ts +8 -0
- package/dist/authTokens.js +162 -0
- package/dist/betterAuth.d.ts +33 -0
- package/dist/betterAuthApp.d.ts +4 -0
- package/dist/betterAuthApp.js +26 -8
- package/dist/betterAuthSetup.d.ts +44 -2
- package/dist/betterAuthSetup.js +288 -18
- package/dist/collectionRegistry.d.ts +38 -0
- package/dist/collectionRegistry.js +72 -0
- package/dist/configurationApp.d.ts +11 -2
- package/dist/configurationApp.js +2 -4
- package/dist/docLoader.js +35 -6
- package/dist/expressServer.d.ts +26 -3
- package/dist/expressServer.js +79 -11
- package/dist/index.d.ts +16 -0
- package/dist/index.js +38 -2
- package/dist/mcp/auth.d.ts +1 -0
- package/dist/mcp/auth.js +47 -25
- package/dist/mcp/handlers.d.ts +1 -1
- package/dist/mcp/handlers.js +67 -233
- package/dist/mcp/query.d.ts +2 -2
- package/dist/mcp/registry.d.ts +1 -5
- package/dist/mcp/registry.js +31 -20
- package/dist/mcp/schemaGenerator.d.ts +2 -7
- package/dist/mcp/schemaGenerator.js +41 -116
- package/dist/mcp/server.d.ts +1 -0
- package/dist/mcp/server.js +1 -0
- package/dist/mcp/serviceTokens.d.ts +16 -0
- package/dist/mcp/serviceTokens.js +345 -0
- package/dist/mcp/types.d.ts +2 -2
- package/dist/models/mcpServiceToken.d.ts +3 -0
- package/dist/models/mcpServiceToken.js +208 -0
- package/dist/openApiBuilder.d.ts +5 -4
- package/dist/openApiBuilder.js +61 -8
- package/dist/openApiCompat.js +1 -1
- package/dist/openApiValidator.js +0 -2
- package/dist/plugins.d.ts +14 -1
- package/dist/plugins.js +17 -6
- package/dist/populate.d.ts +2 -2
- package/dist/populate.js +47 -42
- package/dist/rateLimit/applyTrustProxy.d.ts +3 -0
- package/dist/rateLimit/applyTrustProxy.js +17 -0
- package/dist/rateLimit/createStore.d.ts +2 -0
- package/dist/rateLimit/createStore.js +28 -0
- package/dist/rateLimit/memoryStore.d.ts +2 -0
- package/dist/rateLimit/memoryStore.js +108 -0
- package/dist/rateLimit/middleware.d.ts +11 -0
- package/dist/rateLimit/middleware.js +110 -0
- package/dist/rateLimit/mongoStore.d.ts +3 -0
- package/dist/rateLimit/mongoStore.js +122 -0
- package/dist/rateLimit/policies.d.ts +14 -0
- package/dist/rateLimit/policies.js +151 -0
- package/dist/rateLimit/redisStore.d.ts +3 -0
- package/dist/rateLimit/redisStore.js +155 -0
- package/dist/rateLimit/types.d.ts +54 -0
- package/dist/rateLimit/types.js +9 -0
- package/dist/rbac/access.js +5 -1
- package/dist/rbac/assertAllowed.d.ts +9 -0
- package/dist/rbac/assertAllowed.js +182 -0
- package/dist/rbac/modelRouterAccess.d.ts +1 -0
- package/dist/rbac/modelRouterAccess.js +8 -4
- package/dist/rbac/permissionUtils.js +3 -2
- package/dist/rbac/resolve.js +5 -4
- package/dist/rbac/routes.js +15 -6
- package/dist/realtime/deprecation.d.ts +12 -0
- package/dist/realtime/deprecation.js +32 -0
- package/dist/realtime/realtimeApp.d.ts +1 -1
- package/dist/realtime/realtimeApp.js +10 -11
- package/dist/realtime/registry.d.ts +0 -31
- package/dist/realtime/registry.js +44 -31
- package/dist/realtime/socketAuth.d.ts +5 -5
- package/dist/realtime/socketAuth.js +11 -1
- package/dist/realtime/socketUser.d.ts +5 -1
- package/dist/realtime/types.d.ts +14 -4
- package/dist/schemaMetadata.d.ts +56 -0
- package/dist/schemaMetadata.js +513 -0
- package/dist/seedRunner.d.ts +88 -0
- package/dist/seedRunner.js +627 -0
- package/dist/sync/executors.d.ts +12 -2
- package/dist/sync/executors.js +8 -10
- package/dist/sync/loadHarness.js +28 -19
- package/dist/sync/models.js +26 -24
- package/dist/sync/mutationHandler.d.ts +9 -0
- package/dist/sync/mutationHandler.js +11 -6
- package/dist/sync/registrationSideEffects.d.ts +35 -0
- package/dist/sync/registrationSideEffects.js +151 -0
- package/dist/sync/registry.d.ts +2 -52
- package/dist/sync/registry.js +38 -187
- package/dist/sync/routes.js +3 -2
- package/dist/sync/scripts/compactTombstones.js +0 -2
- package/dist/sync/syncApp.d.ts +3 -3
- package/dist/sync/syncApp.js +4 -4
- package/dist/sync/syncBatch.js +3 -2
- package/dist/sync/syncSeqPlugin.d.ts +1 -1
- package/dist/sync/syncSeqPlugin.js +20 -16
- package/dist/terrenoApp.d.ts +19 -5
- package/dist/terrenoApp.js +66 -18
- package/dist/tests/models.d.ts +2 -0
- package/dist/tests/models.js +6 -0
- package/dist/types/authToken.d.ts +33 -0
- package/dist/types/authToken.js +2 -0
- package/dist/types/mcpServiceToken.d.ts +41 -0
- package/dist/types/mcpServiceToken.js +2 -0
- package/dist/webhooks/headerValue.d.ts +2 -0
- package/dist/webhooks/headerValue.js +14 -0
- package/dist/webhooks/idempotency/memoryStore.d.ts +10 -0
- package/dist/webhooks/idempotency/memoryStore.js +65 -0
- package/dist/webhooks/idempotency/mongoStore.d.ts +4 -0
- package/dist/webhooks/idempotency/mongoStore.js +150 -0
- package/dist/webhooks/idempotency/webhookReceipt.d.ts +62 -0
- package/dist/webhooks/idempotency/webhookReceipt.js +39 -0
- package/dist/webhooks/rawBody.d.ts +14 -0
- package/dist/webhooks/rawBody.js +22 -0
- package/dist/webhooks/timingSafeEqual.d.ts +4 -0
- package/dist/webhooks/timingSafeEqual.js +17 -0
- package/dist/webhooks/verifiers/hmac.d.ts +15 -0
- package/dist/webhooks/verifiers/hmac.js +49 -0
- package/dist/webhooks/verifiers/sendgrid.d.ts +10 -0
- package/dist/webhooks/verifiers/sendgrid.js +56 -0
- package/dist/webhooks/verifiers/stripe.d.ts +9 -0
- package/dist/webhooks/verifiers/stripe.js +99 -0
- package/dist/webhooks/verifiers/twilio.d.ts +9 -0
- package/dist/webhooks/verifiers/twilio.js +112 -0
- package/dist/webhooks/webhooksApp.d.ts +33 -0
- package/dist/webhooks/webhooksApp.js +195 -0
- package/package.json +4 -5
- package/src/__snapshots__/openApi.test.ts.snap +270 -0
- package/src/__snapshots__/openApiBuilder.test.ts.snap +30 -12
- package/src/__snapshots__/schemaMetadata.test.ts.snap +197 -0
- package/src/actions.ts +20 -13
- package/src/adminModelRouter.test.ts +133 -0
- package/src/api.arrayOperations.test.ts +43 -31
- package/src/api.hooks.test.ts +38 -29
- package/src/api.query.test.ts +31 -31
- package/src/api.test.ts +95 -96
- package/src/api.ts +16 -27
- package/src/auth.test.ts +107 -51
- package/src/auth.ts +98 -29
- package/src/authRecovery.test.ts +281 -0
- package/src/authRecovery.ts +279 -0
- package/src/authTokens.test.ts +94 -0
- package/src/authTokens.ts +118 -0
- package/src/authVerification.test.ts +293 -0
- package/src/betterAuth.ts +24 -0
- package/src/betterAuthApp.test.ts +1 -0
- package/src/betterAuthApp.ts +27 -9
- package/src/betterAuthSetup.test.ts +568 -38
- package/src/betterAuthSetup.ts +260 -5
- package/src/collectionRegistry.test.ts +165 -0
- package/src/collectionRegistry.ts +115 -0
- package/src/configurationApp.ts +13 -7
- package/src/docLoader.test.ts +45 -1
- package/src/docLoader.ts +37 -6
- package/src/express.d.ts +1 -0
- package/src/expressServer.test.ts +130 -66
- package/src/expressServer.ts +75 -19
- package/src/githubAuth.test.ts +60 -55
- package/src/index.ts +58 -0
- package/src/mcp/auth.test.ts +47 -0
- package/src/mcp/auth.ts +32 -11
- package/src/mcp/handlers.ts +45 -172
- package/src/mcp/integration.test.ts +59 -9
- package/src/mcp/query.ts +2 -4
- package/src/mcp/registry.ts +29 -20
- package/src/mcp/schemaGenerator.test.ts +8 -0
- package/src/mcp/schemaGenerator.ts +49 -131
- package/src/mcp/server.ts +2 -0
- package/src/mcp/serviceTokens.test.ts +330 -0
- package/src/mcp/serviceTokens.ts +307 -0
- package/src/mcp/toolGenerator.test.ts +1 -1
- package/src/mcp/types.ts +2 -6
- package/src/models/mcpServiceToken.test.ts +129 -0
- package/src/models/mcpServiceToken.ts +158 -0
- package/src/openApi.test.ts +80 -64
- package/src/openApiBuilder.test.ts +95 -7
- package/src/openApiBuilder.ts +46 -9
- package/src/openApiCompat.ts +1 -1
- package/src/openApiValidator.test.ts +49 -54
- package/src/openApiValidator.ts +1 -3
- package/src/plugins.test.ts +14 -0
- package/src/plugins.ts +34 -9
- package/src/populate.test.ts +34 -0
- package/src/populate.ts +40 -29
- package/src/rateLimit/applyTrustProxy.ts +17 -0
- package/src/rateLimit/createStore.ts +25 -0
- package/src/rateLimit/memoryStore.ts +40 -0
- package/src/rateLimit/middleware.ts +79 -0
- package/src/rateLimit/mongoStore.test.ts +80 -0
- package/src/rateLimit/mongoStore.ts +76 -0
- package/src/rateLimit/policies.ts +130 -0
- package/src/rateLimit/rateLimit.test.ts +328 -0
- package/src/rateLimit/redisStore.ioredis.test.ts +29 -0
- package/src/rateLimit/redisStore.test.ts +114 -0
- package/src/rateLimit/redisStore.ts +85 -0
- package/src/rateLimit/types.ts +64 -0
- package/src/rbac/access.ts +5 -1
- package/src/rbac/assertAllowed.test.ts +325 -0
- package/src/rbac/assertAllowed.ts +157 -0
- package/src/rbac/backfillAdmins.test.ts +124 -0
- package/src/rbac/fieldViews.test.ts +89 -0
- package/src/rbac/modelRouterAccess.test.ts +126 -0
- package/src/rbac/modelRouterAccess.ts +5 -2
- package/src/rbac/permissionUtils.ts +3 -2
- package/src/rbac/realtimeAccess.test.ts +109 -1
- package/src/rbac/resolve.ts +5 -4
- package/src/rbac/roleManager.test.ts +169 -0
- package/src/rbac/routes.test.ts +233 -0
- package/src/rbac/routes.ts +16 -6
- package/src/realtime/deprecation.test.ts +60 -0
- package/src/realtime/deprecation.ts +32 -0
- package/src/realtime/realtime.test.ts +8 -4
- package/src/realtime/realtimeApp.ts +10 -11
- package/src/realtime/realtimeAppSetup.test.ts +32 -5
- package/src/realtime/registry.ts +48 -42
- package/src/realtime/sessionRevalidation.test.ts +57 -44
- package/src/realtime/socketAuth.test.ts +75 -23
- package/src/realtime/socketAuth.ts +17 -6
- package/src/realtime/socketUser.ts +5 -3
- package/src/realtime/types.ts +14 -4
- package/src/schemaMetadata.test.ts +405 -0
- package/src/schemaMetadata.ts +593 -0
- package/src/scrubAdminFields.test.ts +105 -0
- package/src/seedRunner.test.ts +591 -0
- package/src/seedRunner.ts +464 -0
- package/src/sync/docMatchesMutationData.test.ts +16 -0
- package/src/sync/ensureSyncIndexes.test.ts +54 -15
- package/src/sync/executors.test.ts +40 -0
- package/src/sync/executors.ts +24 -12
- package/src/sync/integration.test.ts +15 -7
- package/src/sync/loadHarness.ts +28 -19
- package/src/sync/models.ts +32 -18
- package/src/sync/mutationHandler.test.ts +16 -16
- package/src/sync/mutationHandler.ts +9 -7
- package/src/sync/registrationSideEffects.test.ts +126 -0
- package/src/sync/registrationSideEffects.ts +131 -0
- package/src/sync/registry.ts +45 -171
- package/src/sync/routes.ts +3 -2
- package/src/sync/scripts/compactTombstones.ts +0 -2
- package/src/sync/sessionRevalidationIntegration.test.ts +12 -11
- package/src/sync/sync.test.ts +25 -23
- package/src/sync/syncApp.ts +4 -4
- package/src/sync/syncBatch.ts +3 -2
- package/src/sync/syncFrontier.test.ts +17 -15
- package/src/sync/syncPhaseC.test.ts +54 -43
- package/src/sync/syncRoutes.test.ts +51 -36
- package/src/sync/syncSeqPlugin.ts +66 -44
- package/src/sync/syncSocket.test.ts +112 -81
- package/src/terrenoApp.mcpServiceTokens.test.ts +173 -0
- package/src/terrenoApp.ts +87 -15
- package/src/tests/models.ts +14 -1
- package/src/types/authToken.ts +43 -0
- package/src/types/mcpServiceToken.ts +54 -0
- package/src/webhooks/headerValue.test.ts +22 -0
- package/src/webhooks/headerValue.ts +12 -0
- package/src/webhooks/idempotency/memoryStore.ts +34 -0
- package/src/webhooks/idempotency/mongoStore.test.ts +274 -0
- package/src/webhooks/idempotency/mongoStore.ts +83 -0
- package/src/webhooks/idempotency/webhookReceipt.ts +70 -0
- package/src/webhooks/rawBody.test.ts +74 -0
- package/src/webhooks/rawBody.ts +23 -0
- package/src/webhooks/timingSafeEqual.ts +16 -0
- package/src/webhooks/verifiers/hmac.test.ts +110 -0
- package/src/webhooks/verifiers/hmac.ts +54 -0
- package/src/webhooks/verifiers/providerVerifiers.test.ts +388 -0
- package/src/webhooks/verifiers/sendgrid.ts +59 -0
- package/src/webhooks/verifiers/stripe.ts +67 -0
- package/src/webhooks/verifiers/twilio.ts +69 -0
- package/src/webhooks/webhooksApp.test.ts +221 -0
- package/src/webhooks/webhooksApp.ts +144 -0
package/dist/expressServer.d.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import express, { type Router } from "express";
|
|
2
2
|
import type jwt from "jsonwebtoken";
|
|
3
3
|
import type { ModelRouterOptions } from "./api";
|
|
4
|
+
import type { User } from "./auth";
|
|
4
5
|
import { type LoggingOptions } from "./logger";
|
|
6
|
+
export declare const redactSensitiveRequestUrl: (url: string | undefined) => string;
|
|
5
7
|
export declare const setupEnvironment: () => void;
|
|
6
8
|
export type AddRoutes = (router: Router, options?: Partial<ModelRouterOptions<unknown>>) => void;
|
|
7
9
|
interface LoggableRequest {
|
|
@@ -29,10 +31,31 @@ interface LoggableResponse {
|
|
|
29
31
|
export declare const logRequests: (req: LoggableRequest, res: LoggableResponse, next: express.NextFunction) => void;
|
|
30
32
|
export declare const createRouter: (rootPath: string, addRoutes: AddRoutes, middleware?: express.RequestHandler[]) => Array<string | express.RequestHandler | Router>;
|
|
31
33
|
export declare const createRouterWithAuth: (rootPath: string, addRoutes: (router: Router) => void, middleware?: express.RequestHandler[]) => Array<string | express.RequestHandler | Router>;
|
|
34
|
+
export interface AuthRecoveryMail {
|
|
35
|
+
html?: string;
|
|
36
|
+
subject: string;
|
|
37
|
+
text: string;
|
|
38
|
+
to: string;
|
|
39
|
+
}
|
|
32
40
|
export interface AuthOptions {
|
|
33
|
-
generateJWTPayload?: (user:
|
|
34
|
-
generateTokenExpiration?: (user:
|
|
35
|
-
generateRefreshTokenExpiration?: (user:
|
|
41
|
+
generateJWTPayload?: (user: User) => Record<string, unknown>;
|
|
42
|
+
generateTokenExpiration?: (user: User) => number | jwt.SignOptions["expiresIn"];
|
|
43
|
+
generateRefreshTokenExpiration?: (user: User) => number | jwt.SignOptions["expiresIn"];
|
|
44
|
+
/** Public web/app origin used in password-reset and verification links. */
|
|
45
|
+
publicAppUrl?: string;
|
|
46
|
+
/**
|
|
47
|
+
* Deliver recovery mail (forgot password / verify email). Wire to
|
|
48
|
+
* `getCommsService().sendMail` when `@terreno/comms` is registered.
|
|
49
|
+
*/
|
|
50
|
+
sendMail?: (message: AuthRecoveryMail) => Promise<void>;
|
|
51
|
+
/** When true, unverified users receive 403 `email-not-verified` on login. Default false. */
|
|
52
|
+
requireEmailVerification?: boolean;
|
|
53
|
+
/**
|
|
54
|
+
* After a successful JWT password reset, update the Better Auth credential hash
|
|
55
|
+
* and delete that user's Better Auth sessions. TerrenoApp wires this when
|
|
56
|
+
* BetterAuthApp is registered.
|
|
57
|
+
*/
|
|
58
|
+
syncPasswordResetToBetterAuth?: (user: User, password: string) => Promise<void>;
|
|
36
59
|
}
|
|
37
60
|
export declare const cronjob: (name: string, schedule: "hourly" | "minutely" | string, callback: () => void) => void;
|
|
38
61
|
export interface WrapScriptOptions {
|
package/dist/expressServer.js
CHANGED
|
@@ -68,6 +68,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
68
68
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
69
69
|
}
|
|
70
70
|
};
|
|
71
|
+
var __values = (this && this.__values) || function(o) {
|
|
72
|
+
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
73
|
+
if (m) return m.call(o);
|
|
74
|
+
if (o && typeof o.length === "number") return {
|
|
75
|
+
next: function () {
|
|
76
|
+
if (o && i >= o.length) o = void 0;
|
|
77
|
+
return { value: o && o[i++], done: !o };
|
|
78
|
+
}
|
|
79
|
+
};
|
|
80
|
+
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
81
|
+
};
|
|
71
82
|
var __read = (this && this.__read) || function (o, n) {
|
|
72
83
|
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
73
84
|
if (!m) return o;
|
|
@@ -97,7 +108,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
97
108
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
98
109
|
};
|
|
99
110
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
100
|
-
exports.wrapScript = exports.cronjob = exports.createRouterWithAuth = exports.createRouter = exports.logRequests = exports.setupEnvironment = void 0;
|
|
111
|
+
exports.wrapScript = exports.cronjob = exports.createRouterWithAuth = exports.createRouter = exports.logRequests = exports.setupEnvironment = exports.redactSensitiveRequestUrl = void 0;
|
|
101
112
|
var Sentry = __importStar(require("@sentry/bun"));
|
|
102
113
|
var cron_1 = __importDefault(require("cron"));
|
|
103
114
|
var express_1 = __importDefault(require("express"));
|
|
@@ -110,6 +121,67 @@ var slackNotifier_1 = require("./notifiers/slackNotifier");
|
|
|
110
121
|
var SLOW_READ_MAX = 200;
|
|
111
122
|
var SLOW_WRITE_MAX = 500;
|
|
112
123
|
var IS_JEST = process.env.JEST_WORKER_ID !== undefined;
|
|
124
|
+
var SENSITIVE_REQUEST_BODY_KEYS = [
|
|
125
|
+
"newPassword",
|
|
126
|
+
"oldPassword",
|
|
127
|
+
"password",
|
|
128
|
+
"refreshToken",
|
|
129
|
+
"token",
|
|
130
|
+
];
|
|
131
|
+
var redactSensitiveRequestBody = function (body) {
|
|
132
|
+
var e_1, _a;
|
|
133
|
+
var bodyCopy = (0, cloneDeep_1.default)(body);
|
|
134
|
+
try {
|
|
135
|
+
for (var SENSITIVE_REQUEST_BODY_KEYS_1 = __values(SENSITIVE_REQUEST_BODY_KEYS), SENSITIVE_REQUEST_BODY_KEYS_1_1 = SENSITIVE_REQUEST_BODY_KEYS_1.next(); !SENSITIVE_REQUEST_BODY_KEYS_1_1.done; SENSITIVE_REQUEST_BODY_KEYS_1_1 = SENSITIVE_REQUEST_BODY_KEYS_1.next()) {
|
|
136
|
+
var key = SENSITIVE_REQUEST_BODY_KEYS_1_1.value;
|
|
137
|
+
if (key in bodyCopy && bodyCopy[key] !== undefined) {
|
|
138
|
+
bodyCopy[key] = "<REDACTED>";
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
143
|
+
finally {
|
|
144
|
+
try {
|
|
145
|
+
if (SENSITIVE_REQUEST_BODY_KEYS_1_1 && !SENSITIVE_REQUEST_BODY_KEYS_1_1.done && (_a = SENSITIVE_REQUEST_BODY_KEYS_1.return)) _a.call(SENSITIVE_REQUEST_BODY_KEYS_1);
|
|
146
|
+
}
|
|
147
|
+
finally { if (e_1) throw e_1.error; }
|
|
148
|
+
}
|
|
149
|
+
return bodyCopy;
|
|
150
|
+
};
|
|
151
|
+
var sensitiveQueryKeySet = new Set(SENSITIVE_REQUEST_BODY_KEYS);
|
|
152
|
+
var redactSensitiveRequestUrl = function (url) {
|
|
153
|
+
var e_2, _a;
|
|
154
|
+
if (!url) {
|
|
155
|
+
return "";
|
|
156
|
+
}
|
|
157
|
+
var isAbsolute = /^[a-z][a-z0-9+.-]*:/i.test(url);
|
|
158
|
+
var parsed = new URL(url, "http://terreno.invalid");
|
|
159
|
+
var didRedact = false;
|
|
160
|
+
try {
|
|
161
|
+
for (var _b = __values(parsed.searchParams.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
162
|
+
var key = _c.value;
|
|
163
|
+
if (sensitiveQueryKeySet.has(key)) {
|
|
164
|
+
parsed.searchParams.set(key, "<REDACTED>");
|
|
165
|
+
didRedact = true;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
170
|
+
finally {
|
|
171
|
+
try {
|
|
172
|
+
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
173
|
+
}
|
|
174
|
+
finally { if (e_2) throw e_2.error; }
|
|
175
|
+
}
|
|
176
|
+
if (!didRedact) {
|
|
177
|
+
return url;
|
|
178
|
+
}
|
|
179
|
+
if (isAbsolute) {
|
|
180
|
+
return parsed.toString();
|
|
181
|
+
}
|
|
182
|
+
return "".concat(parsed.pathname).concat(parsed.search).concat(parsed.hash);
|
|
183
|
+
};
|
|
184
|
+
exports.redactSensitiveRequestUrl = redactSensitiveRequestUrl;
|
|
113
185
|
var setupEnvironment = function () {
|
|
114
186
|
if (!process.env.TOKEN_ISSUER) {
|
|
115
187
|
throw new errors_1.APIError({ status: 500, title: "TOKEN_ISSUER must be set in env." });
|
|
@@ -146,24 +218,24 @@ var logRequestsFinished = function (req, res, startTime) {
|
|
|
146
218
|
pathName = req.route.path;
|
|
147
219
|
}
|
|
148
220
|
else if (res.statusCode != null && res.statusCode < 400) {
|
|
149
|
-
logger_1.logger.warn("Request without route: ".concat(req.originalUrl));
|
|
221
|
+
logger_1.logger.warn("Request without route: ".concat((0, exports.redactSensitiveRequestUrl)(req.originalUrl)));
|
|
150
222
|
}
|
|
151
223
|
if (process.env.DISABLE_LOG_ALL_REQUESTS !== "true") {
|
|
152
|
-
logger_1.logger.debug("".concat(req.method, " -> ").concat(req.originalUrl, " ").concat(res.statusCode, " ").concat("".concat(diffInMs, "ms")));
|
|
224
|
+
logger_1.logger.debug("".concat(req.method, " -> ").concat((0, exports.redactSensitiveRequestUrl)(req.originalUrl), " ").concat(res.statusCode, " ").concat("".concat(diffInMs, "ms")));
|
|
153
225
|
}
|
|
154
226
|
if (options.logSlowRequests) {
|
|
155
227
|
if (diffInMs > slowReadMs && req.method === "GET") {
|
|
156
228
|
logger_1.logger.warn("Slow GET request, ".concat(JSON.stringify({
|
|
157
229
|
pathName: pathName,
|
|
158
230
|
requestTime: diffInMs,
|
|
159
|
-
url: req.originalUrl,
|
|
231
|
+
url: (0, exports.redactSensitiveRequestUrl)(req.originalUrl),
|
|
160
232
|
})));
|
|
161
233
|
}
|
|
162
234
|
else if (diffInMs > slowWriteMs) {
|
|
163
235
|
logger_1.logger.warn("Slow write request ".concat(JSON.stringify({
|
|
164
236
|
pathName: pathName,
|
|
165
237
|
requestTime: diffInMs,
|
|
166
|
-
url: req.originalUrl,
|
|
238
|
+
url: (0, exports.redactSensitiveRequestUrl)(req.originalUrl),
|
|
167
239
|
})));
|
|
168
240
|
}
|
|
169
241
|
}
|
|
@@ -187,14 +259,10 @@ var logRequests = function (req, res, next) {
|
|
|
187
259
|
}
|
|
188
260
|
var body = "";
|
|
189
261
|
if (req.body && Object.keys(req.body).length > 0) {
|
|
190
|
-
|
|
191
|
-
if (bodyCopy.password) {
|
|
192
|
-
bodyCopy.password = "<PASSWORD>";
|
|
193
|
-
}
|
|
194
|
-
body = " Body: ".concat(JSON.stringify(bodyCopy));
|
|
262
|
+
body = " Body: ".concat(JSON.stringify(redactSensitiveRequestBody(req.body)));
|
|
195
263
|
}
|
|
196
264
|
if (process.env.DISABLE_LOG_ALL_REQUESTS !== "true") {
|
|
197
|
-
logger_1.logger.debug("".concat(req.method, " <- ").concat(req.url).concat(userString).concat(body));
|
|
265
|
+
logger_1.logger.debug("".concat(req.method, " <- ").concat((0, exports.redactSensitiveRequestUrl)(req.url)).concat(userString).concat(body));
|
|
198
266
|
}
|
|
199
267
|
(0, on_finished_1.default)(res, function () { return logRequestsFinished(req, res, startTime); });
|
|
200
268
|
next();
|
package/dist/index.d.ts
CHANGED
|
@@ -2,6 +2,8 @@ export * from "./actions";
|
|
|
2
2
|
export * from "./adminTypes";
|
|
3
3
|
export * from "./api";
|
|
4
4
|
export * from "./auth";
|
|
5
|
+
export * from "./authRecovery";
|
|
6
|
+
export * from "./authTokens";
|
|
5
7
|
export * from "./betterAuth";
|
|
6
8
|
export * from "./betterAuthApp";
|
|
7
9
|
export * from "./betterAuthSetup";
|
|
@@ -20,11 +22,13 @@ export type { MCPCustomTool } from "./mcp/registry";
|
|
|
20
22
|
export { clearMCPRegistry, getMCPRegistry, registerMCPModel, registerMCPTool, updateMCPRegistryOptions, } from "./mcp/registry";
|
|
21
23
|
export { generateInputSchema, generateToolDescription } from "./mcp/schemaGenerator";
|
|
22
24
|
export { type MCPServerOptions, mountMCPServer } from "./mcp/server";
|
|
25
|
+
export { addMcpServiceTokenRoutes, MAX_ACTIVE_MCP_SERVICE_TOKENS, type McpServiceTokenRoutesOptions, type McpServiceTokensAppOption, resolveMcpServiceTokensOption, } from "./mcp/serviceTokens";
|
|
23
26
|
export { generateAllTools, generateToolsForEntry, getAllMCPTools, type MCPToolDefinition, } from "./mcp/toolGenerator";
|
|
24
27
|
export type { MCPConfig, MCPMethod, MCPRegistryEntry, MCPRequest, MCPToolArgs, MCPToolResult, } from "./mcp/types";
|
|
25
28
|
export * from "./middleware";
|
|
26
29
|
export * from "./models/consentForm";
|
|
27
30
|
export * from "./models/consentResponse";
|
|
31
|
+
export * from "./models/mcpServiceToken";
|
|
28
32
|
export * from "./models/versionConfig";
|
|
29
33
|
export * from "./notifiers/googleChatNotifier";
|
|
30
34
|
export * from "./notifiers/slackNotifier";
|
|
@@ -36,7 +40,10 @@ export * from "./openApiValidator";
|
|
|
36
40
|
export * from "./permissions";
|
|
37
41
|
export * from "./plugins";
|
|
38
42
|
export * from "./populate";
|
|
43
|
+
export type { RateLimitLimits, RateLimitOptions, RateLimitRedisClient, RateLimitStore, } from "./rateLimit/types";
|
|
44
|
+
export { DEFAULT_API_MAX, DEFAULT_AUTH_MAX, DEFAULT_WINDOW_MS, } from "./rateLimit/types";
|
|
39
45
|
export * from "./rbac/access";
|
|
46
|
+
export { assertAllowed } from "./rbac/assertAllowed";
|
|
40
47
|
export { createRbacAuditModel, type RbacAuditDocument, recordRbacAudit, } from "./rbac/auditModel";
|
|
41
48
|
export { type BackfillAdminsOptions, type BackfillAdminsResult, backfillAdmins, } from "./rbac/backfillAdmins";
|
|
42
49
|
export * from "./rbac/fieldViews";
|
|
@@ -58,9 +65,11 @@ export { type AuthenticatableSocket, type BetterAuthSocketOptions, createBetterA
|
|
|
58
65
|
export { type DecodedRealtimeToken, getSocketUser, type SocketDataBag, type SocketWithDecodedToken, } from "./realtime/socketUser";
|
|
59
66
|
export type { ChangeStreamConfig, DocumentSubscription, QuerySubscription, RealtimeAppOptions, RealtimeConfig, RealtimeEvent, } from "./realtime/types";
|
|
60
67
|
export * from "./requestContext";
|
|
68
|
+
export { type DescribeModelForRouterOptions, type DescribeModelOptions, describeModel, describeModelForRouter, type FieldDescription, type FieldKind, fieldDescriptionToAdminMeta, fieldDescriptionToOpenApiProperty, fieldDescriptionToZodType, type ModelDescription, modelDescriptionToAdminFields, modelDescriptionToOpenApiSpec, nestDottedFieldDescriptions, SYSTEM_FIELD_PATHS, } from "./schemaMetadata";
|
|
61
69
|
export * from "./scriptRunner";
|
|
62
70
|
export { adminBodyFieldsToStrip, scrubAdminFields, stripAdminBodyFields } from "./scrubAdminFields";
|
|
63
71
|
export * from "./secretProviders";
|
|
72
|
+
export * from "./seedRunner";
|
|
64
73
|
export * from "./sync/executors";
|
|
65
74
|
export * from "./sync/models";
|
|
66
75
|
export * from "./sync/mutationHandler";
|
|
@@ -82,4 +91,11 @@ export * from "./types/consentForm";
|
|
|
82
91
|
export * from "./types/consentResponse";
|
|
83
92
|
export * from "./utils";
|
|
84
93
|
export * from "./versionCheckPlugin";
|
|
94
|
+
export type { WebhookClaimArgs, WebhookClaimResult, WebhookIdempotencyStore, } from "./webhooks/idempotency/memoryStore";
|
|
95
|
+
export { createMemoryIdempotencyStore } from "./webhooks/idempotency/memoryStore";
|
|
96
|
+
export { type HmacSignatureOptions, hmacSignature } from "./webhooks/verifiers/hmac";
|
|
97
|
+
export { type SendgridEventSignatureOptions, sendgridEventSignature, } from "./webhooks/verifiers/sendgrid";
|
|
98
|
+
export { type StripeSignatureOptions, stripeSignature } from "./webhooks/verifiers/stripe";
|
|
99
|
+
export { type TwilioSignatureOptions, twilioSignature } from "./webhooks/verifiers/twilio";
|
|
100
|
+
export { type WebhookHandlerContext, type WebhookRouteOptions, WebhooksApp, type WebhooksAppOptions, } from "./webhooks/webhooksApp";
|
|
85
101
|
export { z } from "./zodOpenApi";
|
package/dist/index.js
CHANGED
|
@@ -14,12 +14,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.
|
|
18
|
-
exports.z = exports.stripAdminBodyFields = exports.scrubAdminFields = exports.adminBodyFieldsToStrip = exports.getSocketUser = exports.createSocketAuthMiddleware = void 0;
|
|
17
|
+
exports.DEFAULT_SESSION_REVALIDATION_INTERVAL_MS = exports.updateRealtimeRegistryOptions = exports.registerRealtime = exports.getRealtimeRegistry = exports.findRegistryEntryByRoutePath = exports.findRegistryEntryByCollection = exports.clearRealtimeRegistry = exports.RealtimeApp = exports.MAX_QUERY_SUBSCRIPTIONS = exports.MAX_MODEL_SUBSCRIPTIONS = exports.MAX_DOCUMENT_SUBSCRIPTIONS = exports.installRealtimeSocketHandlers = exports.removeQuerySubscription = exports.removeAllSocketQueries = exports.getQuerySubscriptionsForCollection = exports.computeQueryId = exports.clearQueryStore = exports.addQuerySubscription = exports.matchesQuery = exports.stopChangeStreamWatcher = exports.startChangeStreamWatcher = exports.emitSyncDeltaForChange = exports.emitPayloadToAuthorizedRoom = exports.rbacRouter = exports.terrenoDefaultRoles = exports.READ_ONLY_ROLE_PERMISSIONS = exports.expandRolePermissions = exports.createRbacRoleModel = exports.backfillAdmins = exports.recordRbacAudit = exports.createRbacAuditModel = exports.assertAllowed = exports.DEFAULT_WINDOW_MS = exports.DEFAULT_AUTH_MAX = exports.DEFAULT_API_MAX = exports.getAllMCPTools = exports.generateToolsForEntry = exports.generateAllTools = exports.resolveMcpServiceTokensOption = exports.MAX_ACTIVE_MCP_SERVICE_TOKENS = exports.addMcpServiceTokenRoutes = exports.mountMCPServer = exports.generateToolDescription = exports.generateInputSchema = exports.updateMCPRegistryOptions = exports.registerMCPTool = exports.registerMCPModel = exports.getMCPRegistry = exports.clearMCPRegistry = exports.extractUserFromHeaders = void 0;
|
|
18
|
+
exports.z = exports.WebhooksApp = exports.twilioSignature = exports.stripeSignature = exports.sendgridEventSignature = exports.hmacSignature = exports.createMemoryIdempotencyStore = exports.stripAdminBodyFields = exports.scrubAdminFields = exports.adminBodyFieldsToStrip = exports.SYSTEM_FIELD_PATHS = exports.nestDottedFieldDescriptions = exports.modelDescriptionToOpenApiSpec = exports.modelDescriptionToAdminFields = exports.fieldDescriptionToZodType = exports.fieldDescriptionToOpenApiProperty = exports.fieldDescriptionToAdminMeta = exports.describeModelForRouter = exports.describeModel = exports.getSocketUser = exports.createSocketAuthMiddleware = exports.createLegacyJwtValidator = exports.createBetterAuthValidator = exports.startSessionRevalidationSweep = exports.runSessionRevalidationSweep = exports.revalidateSocketSession = exports.reresolveSyncRoomsForSocket = exports.loadFullUserForSocket = void 0;
|
|
19
19
|
__exportStar(require("./actions"), exports);
|
|
20
20
|
__exportStar(require("./adminTypes"), exports);
|
|
21
21
|
__exportStar(require("./api"), exports);
|
|
22
22
|
__exportStar(require("./auth"), exports);
|
|
23
|
+
__exportStar(require("./authRecovery"), exports);
|
|
24
|
+
__exportStar(require("./authTokens"), exports);
|
|
23
25
|
__exportStar(require("./betterAuth"), exports);
|
|
24
26
|
__exportStar(require("./betterAuthApp"), exports);
|
|
25
27
|
__exportStar(require("./betterAuthSetup"), exports);
|
|
@@ -46,6 +48,10 @@ Object.defineProperty(exports, "generateInputSchema", { enumerable: true, get: f
|
|
|
46
48
|
Object.defineProperty(exports, "generateToolDescription", { enumerable: true, get: function () { return schemaGenerator_1.generateToolDescription; } });
|
|
47
49
|
var server_1 = require("./mcp/server");
|
|
48
50
|
Object.defineProperty(exports, "mountMCPServer", { enumerable: true, get: function () { return server_1.mountMCPServer; } });
|
|
51
|
+
var serviceTokens_1 = require("./mcp/serviceTokens");
|
|
52
|
+
Object.defineProperty(exports, "addMcpServiceTokenRoutes", { enumerable: true, get: function () { return serviceTokens_1.addMcpServiceTokenRoutes; } });
|
|
53
|
+
Object.defineProperty(exports, "MAX_ACTIVE_MCP_SERVICE_TOKENS", { enumerable: true, get: function () { return serviceTokens_1.MAX_ACTIVE_MCP_SERVICE_TOKENS; } });
|
|
54
|
+
Object.defineProperty(exports, "resolveMcpServiceTokensOption", { enumerable: true, get: function () { return serviceTokens_1.resolveMcpServiceTokensOption; } });
|
|
49
55
|
var toolGenerator_1 = require("./mcp/toolGenerator");
|
|
50
56
|
Object.defineProperty(exports, "generateAllTools", { enumerable: true, get: function () { return toolGenerator_1.generateAllTools; } });
|
|
51
57
|
Object.defineProperty(exports, "generateToolsForEntry", { enumerable: true, get: function () { return toolGenerator_1.generateToolsForEntry; } });
|
|
@@ -53,6 +59,7 @@ Object.defineProperty(exports, "getAllMCPTools", { enumerable: true, get: functi
|
|
|
53
59
|
__exportStar(require("./middleware"), exports);
|
|
54
60
|
__exportStar(require("./models/consentForm"), exports);
|
|
55
61
|
__exportStar(require("./models/consentResponse"), exports);
|
|
62
|
+
__exportStar(require("./models/mcpServiceToken"), exports);
|
|
56
63
|
__exportStar(require("./models/versionConfig"), exports);
|
|
57
64
|
__exportStar(require("./notifiers/googleChatNotifier"), exports);
|
|
58
65
|
__exportStar(require("./notifiers/slackNotifier"), exports);
|
|
@@ -64,7 +71,13 @@ __exportStar(require("./openApiValidator"), exports);
|
|
|
64
71
|
__exportStar(require("./permissions"), exports);
|
|
65
72
|
__exportStar(require("./plugins"), exports);
|
|
66
73
|
__exportStar(require("./populate"), exports);
|
|
74
|
+
var types_1 = require("./rateLimit/types");
|
|
75
|
+
Object.defineProperty(exports, "DEFAULT_API_MAX", { enumerable: true, get: function () { return types_1.DEFAULT_API_MAX; } });
|
|
76
|
+
Object.defineProperty(exports, "DEFAULT_AUTH_MAX", { enumerable: true, get: function () { return types_1.DEFAULT_AUTH_MAX; } });
|
|
77
|
+
Object.defineProperty(exports, "DEFAULT_WINDOW_MS", { enumerable: true, get: function () { return types_1.DEFAULT_WINDOW_MS; } });
|
|
67
78
|
__exportStar(require("./rbac/access"), exports);
|
|
79
|
+
var assertAllowed_1 = require("./rbac/assertAllowed");
|
|
80
|
+
Object.defineProperty(exports, "assertAllowed", { enumerable: true, get: function () { return assertAllowed_1.assertAllowed; } });
|
|
68
81
|
var auditModel_1 = require("./rbac/auditModel");
|
|
69
82
|
Object.defineProperty(exports, "createRbacAuditModel", { enumerable: true, get: function () { return auditModel_1.createRbacAuditModel; } });
|
|
70
83
|
Object.defineProperty(exports, "recordRbacAudit", { enumerable: true, get: function () { return auditModel_1.recordRbacAudit; } });
|
|
@@ -125,12 +138,23 @@ Object.defineProperty(exports, "createSocketAuthMiddleware", { enumerable: true,
|
|
|
125
138
|
var socketUser_1 = require("./realtime/socketUser");
|
|
126
139
|
Object.defineProperty(exports, "getSocketUser", { enumerable: true, get: function () { return socketUser_1.getSocketUser; } });
|
|
127
140
|
__exportStar(require("./requestContext"), exports);
|
|
141
|
+
var schemaMetadata_1 = require("./schemaMetadata");
|
|
142
|
+
Object.defineProperty(exports, "describeModel", { enumerable: true, get: function () { return schemaMetadata_1.describeModel; } });
|
|
143
|
+
Object.defineProperty(exports, "describeModelForRouter", { enumerable: true, get: function () { return schemaMetadata_1.describeModelForRouter; } });
|
|
144
|
+
Object.defineProperty(exports, "fieldDescriptionToAdminMeta", { enumerable: true, get: function () { return schemaMetadata_1.fieldDescriptionToAdminMeta; } });
|
|
145
|
+
Object.defineProperty(exports, "fieldDescriptionToOpenApiProperty", { enumerable: true, get: function () { return schemaMetadata_1.fieldDescriptionToOpenApiProperty; } });
|
|
146
|
+
Object.defineProperty(exports, "fieldDescriptionToZodType", { enumerable: true, get: function () { return schemaMetadata_1.fieldDescriptionToZodType; } });
|
|
147
|
+
Object.defineProperty(exports, "modelDescriptionToAdminFields", { enumerable: true, get: function () { return schemaMetadata_1.modelDescriptionToAdminFields; } });
|
|
148
|
+
Object.defineProperty(exports, "modelDescriptionToOpenApiSpec", { enumerable: true, get: function () { return schemaMetadata_1.modelDescriptionToOpenApiSpec; } });
|
|
149
|
+
Object.defineProperty(exports, "nestDottedFieldDescriptions", { enumerable: true, get: function () { return schemaMetadata_1.nestDottedFieldDescriptions; } });
|
|
150
|
+
Object.defineProperty(exports, "SYSTEM_FIELD_PATHS", { enumerable: true, get: function () { return schemaMetadata_1.SYSTEM_FIELD_PATHS; } });
|
|
128
151
|
__exportStar(require("./scriptRunner"), exports);
|
|
129
152
|
var scrubAdminFields_1 = require("./scrubAdminFields");
|
|
130
153
|
Object.defineProperty(exports, "adminBodyFieldsToStrip", { enumerable: true, get: function () { return scrubAdminFields_1.adminBodyFieldsToStrip; } });
|
|
131
154
|
Object.defineProperty(exports, "scrubAdminFields", { enumerable: true, get: function () { return scrubAdminFields_1.scrubAdminFields; } });
|
|
132
155
|
Object.defineProperty(exports, "stripAdminBodyFields", { enumerable: true, get: function () { return scrubAdminFields_1.stripAdminBodyFields; } });
|
|
133
156
|
__exportStar(require("./secretProviders"), exports);
|
|
157
|
+
__exportStar(require("./seedRunner"), exports);
|
|
134
158
|
__exportStar(require("./sync/executors"), exports);
|
|
135
159
|
__exportStar(require("./sync/models"), exports);
|
|
136
160
|
__exportStar(require("./sync/mutationHandler"), exports);
|
|
@@ -152,5 +176,17 @@ __exportStar(require("./types/consentForm"), exports);
|
|
|
152
176
|
__exportStar(require("./types/consentResponse"), exports);
|
|
153
177
|
__exportStar(require("./utils"), exports);
|
|
154
178
|
__exportStar(require("./versionCheckPlugin"), exports);
|
|
179
|
+
var memoryStore_1 = require("./webhooks/idempotency/memoryStore");
|
|
180
|
+
Object.defineProperty(exports, "createMemoryIdempotencyStore", { enumerable: true, get: function () { return memoryStore_1.createMemoryIdempotencyStore; } });
|
|
181
|
+
var hmac_1 = require("./webhooks/verifiers/hmac");
|
|
182
|
+
Object.defineProperty(exports, "hmacSignature", { enumerable: true, get: function () { return hmac_1.hmacSignature; } });
|
|
183
|
+
var sendgrid_1 = require("./webhooks/verifiers/sendgrid");
|
|
184
|
+
Object.defineProperty(exports, "sendgridEventSignature", { enumerable: true, get: function () { return sendgrid_1.sendgridEventSignature; } });
|
|
185
|
+
var stripe_1 = require("./webhooks/verifiers/stripe");
|
|
186
|
+
Object.defineProperty(exports, "stripeSignature", { enumerable: true, get: function () { return stripe_1.stripeSignature; } });
|
|
187
|
+
var twilio_1 = require("./webhooks/verifiers/twilio");
|
|
188
|
+
Object.defineProperty(exports, "twilioSignature", { enumerable: true, get: function () { return twilio_1.twilioSignature; } });
|
|
189
|
+
var webhooksApp_1 = require("./webhooks/webhooksApp");
|
|
190
|
+
Object.defineProperty(exports, "WebhooksApp", { enumerable: true, get: function () { return webhooksApp_1.WebhooksApp; } });
|
|
155
191
|
var zodOpenApi_1 = require("./zodOpenApi");
|
|
156
192
|
Object.defineProperty(exports, "z", { enumerable: true, get: function () { return zodOpenApi_1.z; } });
|
package/dist/mcp/auth.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import type { BetterAuthInstance } from "../betterAuthSetup";
|
|
|
3
3
|
export interface MCPAuthContext {
|
|
4
4
|
userModel: UserModel;
|
|
5
5
|
betterAuth?: BetterAuthInstance;
|
|
6
|
+
mcpServiceTokens?: boolean;
|
|
6
7
|
}
|
|
7
8
|
/**
|
|
8
9
|
* Extract user from raw headers using whichever auth provider is configured.
|
package/dist/mcp/auth.js
CHANGED
|
@@ -41,7 +41,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
41
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
42
|
exports.extractUserFromHeaders = void 0;
|
|
43
43
|
var jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
44
|
+
var luxon_1 = require("luxon");
|
|
44
45
|
var logger_1 = require("../logger");
|
|
46
|
+
var mcpServiceToken_1 = require("../models/mcpServiceToken");
|
|
45
47
|
var plugins_1 = require("../plugins");
|
|
46
48
|
/**
|
|
47
49
|
* Reject a disabled account the way the JWT middleware's 401 does. Without this an MCP
|
|
@@ -63,43 +65,63 @@ var rejectIfDisabled = function (user, source) {
|
|
|
63
65
|
* Works with both JWT and Better Auth, mirroring authenticateMiddleware behavior.
|
|
64
66
|
*/
|
|
65
67
|
var extractUserFromHeaders = function (headers, context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
66
|
-
var userModel, betterAuth,
|
|
68
|
+
var userModel, betterAuth, mcpServiceTokens, authorization, token, serviceToken, user, activeUser, session, appUser, error_1, tokenSecret, decoded, userId, user, error_2;
|
|
67
69
|
return __generator(this, function (_a) {
|
|
68
70
|
switch (_a.label) {
|
|
69
71
|
case 0:
|
|
70
|
-
userModel = context.userModel, betterAuth = context.betterAuth;
|
|
71
|
-
|
|
72
|
-
|
|
72
|
+
userModel = context.userModel, betterAuth = context.betterAuth, mcpServiceTokens = context.mcpServiceTokens;
|
|
73
|
+
authorization = typeof headers.authorization === "string"
|
|
74
|
+
? headers.authorization
|
|
75
|
+
: Array.isArray(headers.authorization)
|
|
76
|
+
? headers.authorization[0]
|
|
77
|
+
: undefined;
|
|
78
|
+
token = (authorization === null || authorization === void 0 ? void 0 : authorization.startsWith("Bearer ")) ? authorization.slice(7) : authorization;
|
|
79
|
+
if (!(mcpServiceTokens && (token === null || token === void 0 ? void 0 : token.startsWith("mcp_")))) return [3 /*break*/, 3];
|
|
80
|
+
return [4 /*yield*/, mcpServiceToken_1.McpServiceToken.verify(token)];
|
|
73
81
|
case 1:
|
|
74
|
-
_a.
|
|
82
|
+
serviceToken = _a.sent();
|
|
83
|
+
if (!serviceToken) {
|
|
84
|
+
return [2 /*return*/, undefined];
|
|
85
|
+
}
|
|
86
|
+
return [4 /*yield*/, userModel.findById(serviceToken.userId)];
|
|
87
|
+
case 2:
|
|
88
|
+
user = _a.sent();
|
|
89
|
+
activeUser = rejectIfDisabled(user, "MCP service token");
|
|
90
|
+
if (!activeUser) {
|
|
91
|
+
return [2 /*return*/, undefined];
|
|
92
|
+
}
|
|
93
|
+
void mcpServiceToken_1.McpServiceToken.updateOne({ _id: serviceToken._id }, { $set: { lastUsedAt: luxon_1.DateTime.now().toJSDate() } }).catch(function (error) {
|
|
94
|
+
logger_1.logger.debug("MCP service token last-used update failed: ".concat(error));
|
|
95
|
+
});
|
|
96
|
+
return [2 /*return*/, activeUser];
|
|
97
|
+
case 3:
|
|
98
|
+
if (!betterAuth) return [3 /*break*/, 9];
|
|
99
|
+
_a.label = 4;
|
|
100
|
+
case 4:
|
|
101
|
+
_a.trys.push([4, 8, , 9]);
|
|
75
102
|
return [4 /*yield*/, betterAuth.api.getSession({
|
|
76
103
|
headers: headers,
|
|
77
104
|
})];
|
|
78
|
-
case
|
|
105
|
+
case 5:
|
|
79
106
|
session = _a.sent();
|
|
80
|
-
if (!((session === null || session === void 0 ? void 0 : session.user) && (session === null || session === void 0 ? void 0 : session.session))) return [3 /*break*/,
|
|
107
|
+
if (!((session === null || session === void 0 ? void 0 : session.user) && (session === null || session === void 0 ? void 0 : session.session))) return [3 /*break*/, 7];
|
|
81
108
|
return [4 /*yield*/, (0, plugins_1.findOneOrNoneFor)(userModel, { betterAuthId: session.user.id })];
|
|
82
|
-
case
|
|
109
|
+
case 6:
|
|
83
110
|
appUser = _a.sent();
|
|
84
111
|
if (appUser) {
|
|
85
112
|
return [2 /*return*/, rejectIfDisabled(appUser, "Better Auth")];
|
|
86
113
|
}
|
|
87
|
-
_a.label =
|
|
88
|
-
case
|
|
89
|
-
case
|
|
114
|
+
_a.label = 7;
|
|
115
|
+
case 7: return [3 /*break*/, 9];
|
|
116
|
+
case 8:
|
|
90
117
|
error_1 = _a.sent();
|
|
91
118
|
logger_1.logger.debug("MCP Better Auth session extraction failed: ".concat(error_1));
|
|
92
|
-
return [3 /*break*/,
|
|
93
|
-
case
|
|
94
|
-
|
|
95
|
-
? headers.authorization
|
|
96
|
-
: Array.isArray(headers.authorization)
|
|
97
|
-
? headers.authorization[0]
|
|
98
|
-
: undefined;
|
|
119
|
+
return [3 /*break*/, 9];
|
|
120
|
+
case 9:
|
|
121
|
+
// Try JWT auth
|
|
99
122
|
if (!authorization) {
|
|
100
123
|
return [2 /*return*/, undefined];
|
|
101
124
|
}
|
|
102
|
-
token = authorization.startsWith("Bearer ") ? authorization.slice(7) : authorization;
|
|
103
125
|
if (!token) {
|
|
104
126
|
return [2 /*return*/, undefined];
|
|
105
127
|
}
|
|
@@ -108,9 +130,9 @@ var extractUserFromHeaders = function (headers, context) { return __awaiter(void
|
|
|
108
130
|
logger_1.logger.warn("TOKEN_SECRET not set, cannot verify JWT for MCP request");
|
|
109
131
|
return [2 /*return*/, undefined];
|
|
110
132
|
}
|
|
111
|
-
_a.label =
|
|
112
|
-
case
|
|
113
|
-
_a.trys.push([
|
|
133
|
+
_a.label = 10;
|
|
134
|
+
case 10:
|
|
135
|
+
_a.trys.push([10, 12, , 13]);
|
|
114
136
|
decoded = jsonwebtoken_1.default.verify(token, tokenSecret, {
|
|
115
137
|
issuer: process.env.TOKEN_ISSUER,
|
|
116
138
|
});
|
|
@@ -119,14 +141,14 @@ var extractUserFromHeaders = function (headers, context) { return __awaiter(void
|
|
|
119
141
|
return [2 /*return*/, undefined];
|
|
120
142
|
}
|
|
121
143
|
return [4 /*yield*/, userModel.findById(userId)];
|
|
122
|
-
case
|
|
144
|
+
case 11:
|
|
123
145
|
user = _a.sent();
|
|
124
146
|
return [2 /*return*/, rejectIfDisabled(user, "JWT")];
|
|
125
|
-
case
|
|
147
|
+
case 12:
|
|
126
148
|
error_2 = _a.sent();
|
|
127
149
|
logger_1.logger.debug("MCP JWT verification failed: ".concat(error_2));
|
|
128
150
|
return [2 /*return*/, undefined];
|
|
129
|
-
case
|
|
151
|
+
case 13: return [2 /*return*/];
|
|
130
152
|
}
|
|
131
153
|
});
|
|
132
154
|
}); };
|
package/dist/mcp/handlers.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { User } from "../auth";
|
|
2
2
|
import type { MCPRegistryEntry, MCPToolArgs, MCPToolResult } from "./types";
|
|
3
3
|
export declare const getMCPErrorCause: (result: MCPToolResult) => unknown;
|
|
4
4
|
export declare const handleList: (entry: MCPRegistryEntry, args: MCPToolArgs, user?: User) => Promise<MCPToolResult>;
|