@terreno/api 57.16.2 → 57.18.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/dist/actions.d.ts +26 -3
- package/dist/actions.js +102 -16
- package/dist/api.d.ts +7 -0
- package/dist/api.js +59 -3
- package/dist/auth.d.ts +28 -4
- package/dist/auth.js +140 -15
- package/dist/authRecovery.d.ts +31 -0
- package/dist/authRecovery.js +86 -6
- package/dist/betterAuth.d.ts +86 -0
- package/dist/betterAuthApp.d.ts +17 -0
- package/dist/betterAuthApp.js +12 -1
- package/dist/betterAuthOAuthHandoff.d.ts +24 -0
- package/dist/betterAuthOAuthHandoff.js +305 -0
- package/dist/betterAuthSetup.d.ts +37 -2
- package/dist/betterAuthSetup.js +304 -24
- package/dist/expressServer.d.ts +16 -0
- package/dist/expressServer.js +61 -14
- package/dist/githubAuth.d.ts +9 -0
- package/dist/githubAuth.js +230 -31
- package/dist/index.d.ts +9 -1
- package/dist/index.js +27 -3
- package/dist/mcp/actionTools.d.ts +4 -0
- package/dist/mcp/actionTools.js +158 -0
- package/dist/mcp/auth.d.ts +30 -0
- package/dist/mcp/auth.js +83 -28
- package/dist/mcp/createMCPRequest.d.ts +5 -1
- package/dist/mcp/createMCPRequest.js +3 -3
- package/dist/mcp/handlers.d.ts +3 -0
- package/dist/mcp/handlers.js +43 -27
- package/dist/mcp/oauth.d.ts +14 -0
- package/dist/mcp/oauth.js +618 -0
- package/dist/mcp/oauthMetadata.d.ts +89 -0
- package/dist/mcp/oauthMetadata.js +137 -0
- package/dist/mcp/registry.d.ts +5 -0
- package/dist/mcp/registry.js +9 -1
- package/dist/mcp/server.d.ts +6 -0
- package/dist/mcp/server.js +44 -7
- package/dist/mcp/serviceTokens.js +12 -2
- package/dist/mcp/toolExecution.d.ts +12 -0
- package/dist/mcp/toolExecution.js +60 -0
- package/dist/mcp/toolGenerator.d.ts +4 -1
- package/dist/mcp/toolGenerator.js +26 -60
- package/dist/mcp/types.d.ts +4 -4
- package/dist/models/mcpOAuthAuthorization.d.ts +2 -0
- package/dist/models/mcpOAuthAuthorization.js +86 -0
- package/dist/models/mcpOAuthClient.d.ts +2 -0
- package/dist/models/mcpOAuthClient.js +42 -0
- package/dist/models/mcpOAuthRevokedFamily.d.ts +2 -0
- package/dist/models/mcpOAuthRevokedFamily.js +36 -0
- package/dist/models/mcpOAuthToken.d.ts +12 -0
- package/dist/models/mcpOAuthToken.js +159 -0
- package/dist/models/mcpServiceToken.d.ts +1 -0
- package/dist/models/mcpServiceToken.js +21 -4
- package/dist/permissions.d.ts +7 -0
- package/dist/permissions.js +18 -1
- package/dist/rateLimit/policies.d.ts +4 -0
- package/dist/rateLimit/policies.js +46 -7
- package/dist/rbac/access.js +1 -0
- package/dist/rbac/membershipOrgAdminSource.d.ts +4 -0
- package/dist/rbac/membershipOrgAdminSource.js +5 -0
- package/dist/rbac/modelRouterAccess.d.ts +7 -1
- package/dist/rbac/modelRouterAccess.js +37 -24
- package/dist/rbac/realtimeAccess.js +17 -3
- package/dist/rbac/resolve.js +66 -9
- package/dist/rbac/roleManager.js +60 -5
- package/dist/rbac/roleModel.js +1 -1
- package/dist/rbac/statements.d.ts +1 -1
- package/dist/rbac/statements.js +13 -1
- package/dist/rbac/types.d.ts +12 -0
- package/dist/rbac/userWriteGuards.d.ts +50 -0
- package/dist/rbac/userWriteGuards.js +156 -0
- package/dist/realtime/changeStreamWatcher.d.ts +4 -1
- package/dist/realtime/changeStreamWatcher.js +157 -73
- package/dist/realtime/queryMatcher.d.ts +3 -0
- package/dist/realtime/queryMatcher.js +25 -10
- package/dist/realtime/realtimeApp.d.ts +16 -1
- package/dist/realtime/realtimeApp.js +76 -8
- package/dist/realtime/socketAuth.d.ts +17 -6
- package/dist/realtime/socketAuth.js +77 -16
- package/dist/realtime/types.d.ts +8 -5
- package/dist/requestContext.d.ts +22 -0
- package/dist/requestContext.js +22 -1
- package/dist/seedRunner.js +3 -1
- package/dist/sortFields.d.ts +33 -0
- package/dist/sortFields.js +55 -0
- package/dist/sync/executors.js +140 -2
- package/dist/sync/models.d.ts +2 -0
- package/dist/sync/models.js +5 -0
- package/dist/sync/mutationHandler.js +70 -7
- package/dist/sync/routes.js +4 -2
- package/dist/sync/syncSeqPlugin.js +6 -5
- package/dist/terrenoApp.d.ts +14 -0
- package/dist/terrenoApp.js +21 -6
- package/dist/types/mcpOAuth.d.ts +101 -0
- package/dist/types/mcpOAuth.js +2 -0
- package/dist/types/mcpServiceToken.d.ts +8 -0
- package/package.json +3 -3
- package/src/actions.test.ts +118 -0
- package/src/actions.ts +139 -17
- package/src/api.arrayOperations.test.ts +78 -0
- package/src/api.test.ts +36 -0
- package/src/api.ts +76 -4
- package/src/auth.test.ts +521 -3
- package/src/auth.ts +171 -17
- package/src/authRecovery.test.ts +99 -0
- package/src/authRecovery.ts +117 -5
- package/src/authVerification.test.ts +3 -3
- package/src/betterAuth.ts +104 -1
- package/src/betterAuthApp.test.ts +634 -1
- package/src/betterAuthApp.ts +28 -0
- package/src/betterAuthOAuthHandoff.test.ts +946 -0
- package/src/betterAuthOAuthHandoff.ts +375 -0
- package/src/betterAuthSetup.test.ts +393 -4
- package/src/betterAuthSetup.ts +402 -29
- package/src/expressServer.test.ts +93 -0
- package/src/expressServer.ts +81 -14
- package/src/githubAuth.test.ts +448 -6
- package/src/githubAuth.ts +276 -34
- package/src/index.ts +35 -1
- package/src/mcp/actionTools.test.ts +498 -0
- package/src/mcp/actionTools.ts +220 -0
- package/src/mcp/auth.test.ts +114 -1
- package/src/mcp/auth.ts +122 -35
- package/src/mcp/createMCPRequest.ts +8 -2
- package/src/mcp/handlers.test.ts +27 -0
- package/src/mcp/handlers.ts +21 -6
- package/src/mcp/oauth.test.ts +1026 -0
- package/src/mcp/oauth.ts +798 -0
- package/src/mcp/oauthMetadata.ts +234 -0
- package/src/mcp/registry.ts +11 -0
- package/src/mcp/server.ts +54 -14
- package/src/mcp/serviceTokens.ts +16 -3
- package/src/mcp/toolExecution.ts +67 -0
- package/src/mcp/toolGenerator.ts +27 -83
- package/src/mcp/types.ts +4 -4
- package/src/models/mcpOAuthAuthorization.ts +97 -0
- package/src/models/mcpOAuthClient.ts +49 -0
- package/src/models/mcpOAuthRevokedFamily.ts +47 -0
- package/src/models/mcpOAuthToken.test.ts +82 -0
- package/src/models/mcpOAuthToken.ts +195 -0
- package/src/models/mcpServiceToken.ts +26 -2
- package/src/permissions.ts +17 -0
- package/src/rateLimit/policies.ts +54 -10
- package/src/rateLimit/rateLimit.test.ts +41 -0
- package/src/rbac/access.ts +1 -0
- package/src/rbac/membershipOrgAdminSource.ts +5 -0
- package/src/rbac/modelRouterAccess.ts +40 -23
- package/src/rbac/realtimeAccess.test.ts +43 -0
- package/src/rbac/realtimeAccess.ts +23 -3
- package/src/rbac/resolve.test.ts +179 -1
- package/src/rbac/resolve.ts +78 -9
- package/src/rbac/roleManager.test.ts +132 -0
- package/src/rbac/roleManager.ts +69 -5
- package/src/rbac/roleModel.ts +1 -1
- package/src/rbac/statements.ts +14 -1
- package/src/rbac/types.ts +12 -0
- package/src/rbac/userWriteGuards.test.ts +407 -0
- package/src/rbac/userWriteGuards.ts +185 -0
- package/src/realtime/changeStreamWatcher.ts +203 -75
- package/src/realtime/queryMatcher.ts +30 -13
- package/src/realtime/realtime.test.ts +132 -0
- package/src/realtime/realtimeApp.ts +94 -10
- package/src/realtime/realtimeAppSetup.test.ts +282 -1
- package/src/realtime/socketAuth.test.ts +140 -8
- package/src/realtime/socketAuth.ts +90 -19
- package/src/realtime/types.ts +8 -5
- package/src/requestContext.ts +52 -1
- package/src/requestCredential.test.ts +89 -0
- package/src/seedRunner.test.ts +21 -0
- package/src/seedRunner.ts +3 -1
- package/src/sortFields.ts +69 -0
- package/src/sync/executors.test.ts +382 -3
- package/src/sync/executors.ts +179 -4
- package/src/sync/models.ts +8 -0
- package/src/sync/mutationHandler.test.ts +166 -2
- package/src/sync/mutationHandler.ts +97 -5
- package/src/sync/routes.ts +4 -2
- package/src/sync/syncFrontier.test.ts +11 -0
- package/src/sync/syncPhaseC.test.ts +18 -0
- package/src/sync/syncSeqPlugin.ts +6 -5
- package/src/sync/syncSocket.test.ts +92 -0
- package/src/terrenoApp.ts +36 -21
- package/src/types/mcpOAuth.ts +129 -0
- package/src/types/mcpServiceToken.ts +6 -1
package/src/terrenoApp.ts
CHANGED
|
@@ -8,10 +8,11 @@ import qs from "qs";
|
|
|
8
8
|
import type {AdminChangeEvent, TerrenoAppAdminEvent} from "./adminTypes";
|
|
9
9
|
import type {ModelRouterRegistration} from "./api";
|
|
10
10
|
import {addAuthRoutes, addMeRoutes, setupAuth, type UserModel as UserMongooseModel} from "./auth";
|
|
11
|
+
import {findBetterAuthProvider, getProvidedBetterAuth} from "./betterAuthApp";
|
|
11
12
|
import {
|
|
12
13
|
applyJwtPasswordResetToBetterAuth,
|
|
13
|
-
type BetterAuthInstance,
|
|
14
14
|
createBetterAuthSessionMiddleware,
|
|
15
|
+
verifyBetterAuthCredentialPassword,
|
|
15
16
|
} from "./betterAuthSetup";
|
|
16
17
|
import {addTerrenoDevBrowserLogsRoute} from "./browserLogsRoute";
|
|
17
18
|
import {
|
|
@@ -28,6 +29,8 @@ import {
|
|
|
28
29
|
import {type AddRoutes, type AuthOptions, logRequests} from "./expressServer";
|
|
29
30
|
import {addGitHubAuthRoutes, type GitHubAuthOptions, setupGitHubAuth} from "./githubAuth";
|
|
30
31
|
import {type LoggingOptions, logger, setupLogging} from "./logger";
|
|
32
|
+
import {addMcpOAuthRoutes} from "./mcp/oauth";
|
|
33
|
+
import {type McpOAuthAppOption, resolveMcpOAuthOption} from "./mcp/oauthMetadata";
|
|
31
34
|
import {mountMCPServer} from "./mcp/server";
|
|
32
35
|
import {
|
|
33
36
|
addMcpServiceTokenRoutes,
|
|
@@ -55,14 +58,6 @@ import type {TerrenoPlugin} from "./terrenoPlugin";
|
|
|
55
58
|
import openapi from "./vendor/wesleytodd-openapi/index";
|
|
56
59
|
import {jsonBodyParserOptions, urlencodedBodyParserOptions} from "./webhooks/rawBody";
|
|
57
60
|
|
|
58
|
-
/** A registered plugin that exposes a Better Auth instance, e.g. BetterAuthApp. */
|
|
59
|
-
interface BetterAuthProvider {
|
|
60
|
-
getAuth: () => BetterAuthInstance | undefined;
|
|
61
|
-
ensureAuth?: () => BetterAuthInstance;
|
|
62
|
-
markSessionMiddlewareMounted?: () => void;
|
|
63
|
-
getBetterAuthBasePath?: () => string;
|
|
64
|
-
}
|
|
65
|
-
|
|
66
61
|
type CorsOrigin =
|
|
67
62
|
| string
|
|
68
63
|
| boolean
|
|
@@ -143,6 +138,15 @@ export interface TerrenoAppOptions {
|
|
|
143
138
|
* mounts `/mcp/service-tokens` and accepts `Authorization: Bearer mcp_…` on `/mcp`.
|
|
144
139
|
*/
|
|
145
140
|
mcpServiceTokens?: McpServiceTokensAppOption;
|
|
141
|
+
/**
|
|
142
|
+
* Opt-in OAuth 2.1 authorization server for `/mcp`, so remote MCP clients (Claude.ai
|
|
143
|
+
* connectors, ChatGPT apps) can connect to a JWT-auth app. Off unless `enabled: true`. Mounts
|
|
144
|
+
* RFC 9728 / RFC 8414 discovery, authorize + consent, token, and revocation endpoints, and makes
|
|
145
|
+
* `/mcp` answer credential-less requests with a 401 challenge. Dynamic client registration is a
|
|
146
|
+
* second opt-in (`dynamicClientRegistration: true`). See
|
|
147
|
+
* [Enable MCP OAuth](../how-to/enable-mcp-oauth.md).
|
|
148
|
+
*/
|
|
149
|
+
mcpOAuth?: McpOAuthAppOption;
|
|
146
150
|
/**
|
|
147
151
|
* Versioned MongoDB migrations. `runOnStart` defaults to false. When true, wet `up`
|
|
148
152
|
* runs after listen and `ensureSyncIndexes`. Production still requires
|
|
@@ -263,6 +267,13 @@ export class TerrenoApp {
|
|
|
263
267
|
return this.registrations;
|
|
264
268
|
}
|
|
265
269
|
|
|
270
|
+
/**
|
|
271
|
+
* The application user model this app authenticates against.
|
|
272
|
+
*/
|
|
273
|
+
getUserModel(): TerrenoAppOptions["userModel"] {
|
|
274
|
+
return this.options.userModel;
|
|
275
|
+
}
|
|
276
|
+
|
|
266
277
|
/**
|
|
267
278
|
* Returns only TerrenoPlugin registrations (excludes model routers).
|
|
268
279
|
*/
|
|
@@ -365,6 +376,8 @@ export class TerrenoApp {
|
|
|
365
376
|
|
|
366
377
|
const app = express();
|
|
367
378
|
const options = this.options;
|
|
379
|
+
// Resolve first so a misconfigured issuer or consent URL fails at boot.
|
|
380
|
+
const mcpOAuth = resolveMcpOAuthOption(options.mcpOAuth);
|
|
368
381
|
|
|
369
382
|
// Record mount paths on layers for Express 5 → OpenAPI compat
|
|
370
383
|
patchAppUse(app);
|
|
@@ -403,11 +416,7 @@ export class TerrenoApp {
|
|
|
403
416
|
next();
|
|
404
417
|
});
|
|
405
418
|
|
|
406
|
-
const betterAuthForLimiter = this.registrations
|
|
407
|
-
(registration) =>
|
|
408
|
-
"getAuth" in registration &&
|
|
409
|
-
typeof (registration as Partial<BetterAuthProvider>).getAuth === "function"
|
|
410
|
-
) as BetterAuthProvider | undefined;
|
|
419
|
+
const betterAuthForLimiter = findBetterAuthProvider(this.registrations);
|
|
411
420
|
if (betterAuthForLimiter?.ensureAuth) {
|
|
412
421
|
const auth = betterAuthForLimiter.ensureAuth();
|
|
413
422
|
app.use(createBetterAuthSessionMiddleware(auth, options.userModel));
|
|
@@ -434,7 +443,7 @@ export class TerrenoApp {
|
|
|
434
443
|
const authOptions = options.authOptions;
|
|
435
444
|
addAuthRoutes(app, options.userModel, authOptions);
|
|
436
445
|
|
|
437
|
-
if (options.logRequests !== false) {
|
|
446
|
+
if (options.logRequests !== false && options.loggingOptions?.logRequests !== false) {
|
|
438
447
|
app.use(logRequests);
|
|
439
448
|
}
|
|
440
449
|
|
|
@@ -509,16 +518,18 @@ export class TerrenoApp {
|
|
|
509
518
|
}
|
|
510
519
|
|
|
511
520
|
// Mount MCP at POST /mcp when any model opted in or a custom tool was registered.
|
|
512
|
-
const
|
|
513
|
-
(registration) =>
|
|
514
|
-
"getAuth" in registration &&
|
|
515
|
-
typeof (registration as Partial<BetterAuthProvider>).getAuth === "function"
|
|
516
|
-
) as BetterAuthProvider | undefined;
|
|
517
|
-
const betterAuth = betterAuthPlugin?.ensureAuth?.() ?? betterAuthPlugin?.getAuth();
|
|
521
|
+
const betterAuth = getProvidedBetterAuth(findBetterAuthProvider(this.registrations));
|
|
518
522
|
if (betterAuth) {
|
|
519
523
|
authOptions.syncPasswordResetToBetterAuth = async (user, password): Promise<void> => {
|
|
520
524
|
await applyJwtPasswordResetToBetterAuth(betterAuth, user, password);
|
|
521
525
|
};
|
|
526
|
+
authOptions.verifyBetterAuthPassword = async (user, password) => {
|
|
527
|
+
return verifyBetterAuthCredentialPassword(
|
|
528
|
+
betterAuth,
|
|
529
|
+
user as {betterAuthId?: string},
|
|
530
|
+
password
|
|
531
|
+
);
|
|
532
|
+
};
|
|
522
533
|
}
|
|
523
534
|
const mcpServiceTokens = resolveMcpServiceTokensOption(options.mcpServiceTokens);
|
|
524
535
|
if (mcpServiceTokens.enabled) {
|
|
@@ -527,8 +538,12 @@ export class TerrenoApp {
|
|
|
527
538
|
publicMcpUrl: mcpServiceTokens.publicMcpUrl,
|
|
528
539
|
});
|
|
529
540
|
}
|
|
541
|
+
if (mcpOAuth) {
|
|
542
|
+
addMcpOAuthRoutes(app, {oauth: mcpOAuth, openApi: oapi, userModel: options.userModel});
|
|
543
|
+
}
|
|
530
544
|
mountMCPServer(app, {
|
|
531
545
|
betterAuth,
|
|
546
|
+
mcpOAuth,
|
|
532
547
|
mcpServiceTokens: mcpServiceTokens.enabled,
|
|
533
548
|
userModel: options.userModel,
|
|
534
549
|
});
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
import type mongoose from "mongoose";
|
|
2
|
+
import type {FindExactlyOnePlugin, FindOneOrNonePlugin} from "../plugins";
|
|
3
|
+
|
|
4
|
+
/** A client registered through dynamic client registration (RFC 7591). Public clients only. */
|
|
5
|
+
export interface McpOAuthClientDocument extends mongoose.Document {
|
|
6
|
+
_id: mongoose.Types.ObjectId;
|
|
7
|
+
clientId: string;
|
|
8
|
+
clientName?: string;
|
|
9
|
+
created: Date;
|
|
10
|
+
grantTypes: string[];
|
|
11
|
+
redirectUris: string[];
|
|
12
|
+
responseTypes: string[];
|
|
13
|
+
scope?: string;
|
|
14
|
+
updated: Date;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
interface McpOAuthClientStatics
|
|
18
|
+
extends FindExactlyOnePlugin<McpOAuthClientDocument>,
|
|
19
|
+
FindOneOrNonePlugin<McpOAuthClientDocument> {}
|
|
20
|
+
|
|
21
|
+
export interface McpOAuthClientModel
|
|
22
|
+
extends mongoose.Model<McpOAuthClientDocument>,
|
|
23
|
+
McpOAuthClientStatics {}
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* Lifecycle of one authorization request: `pending` until the signed-in user decides, then
|
|
27
|
+
* `approved` (a code is outstanding) or `denied`, then `used` once the code is exchanged.
|
|
28
|
+
*/
|
|
29
|
+
export type McpOAuthAuthorizationStatus = "pending" | "approved" | "denied" | "used";
|
|
30
|
+
|
|
31
|
+
export interface McpOAuthAuthorizationDocument extends mongoose.Document {
|
|
32
|
+
_id: mongoose.Types.ObjectId;
|
|
33
|
+
clientId: string;
|
|
34
|
+
codeChallenge: string;
|
|
35
|
+
codeExpiresAt?: Date;
|
|
36
|
+
codeHash?: string;
|
|
37
|
+
created: Date;
|
|
38
|
+
expiresAt: Date;
|
|
39
|
+
familyId?: string;
|
|
40
|
+
redirectUri: string;
|
|
41
|
+
requestId: string;
|
|
42
|
+
resource?: string;
|
|
43
|
+
scope?: string;
|
|
44
|
+
state?: string;
|
|
45
|
+
status: McpOAuthAuthorizationStatus;
|
|
46
|
+
tokenEpoch?: number;
|
|
47
|
+
updated: Date;
|
|
48
|
+
usedAt?: Date;
|
|
49
|
+
userId?: mongoose.Types.ObjectId;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
interface McpOAuthAuthorizationStatics
|
|
53
|
+
extends FindExactlyOnePlugin<McpOAuthAuthorizationDocument>,
|
|
54
|
+
FindOneOrNonePlugin<McpOAuthAuthorizationDocument> {}
|
|
55
|
+
|
|
56
|
+
export interface McpOAuthAuthorizationModel
|
|
57
|
+
extends mongoose.Model<McpOAuthAuthorizationDocument>,
|
|
58
|
+
McpOAuthAuthorizationStatics {}
|
|
59
|
+
|
|
60
|
+
/** Tombstone written when a token family is revoked; blocks any later issue into it. */
|
|
61
|
+
export interface McpOAuthRevokedFamilyDocument extends mongoose.Document {
|
|
62
|
+
_id: mongoose.Types.ObjectId;
|
|
63
|
+
created: Date;
|
|
64
|
+
expiresAt: Date;
|
|
65
|
+
familyId: string;
|
|
66
|
+
revokedAt: Date;
|
|
67
|
+
updated: Date;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
interface McpOAuthRevokedFamilyStatics
|
|
71
|
+
extends FindExactlyOnePlugin<McpOAuthRevokedFamilyDocument>,
|
|
72
|
+
FindOneOrNonePlugin<McpOAuthRevokedFamilyDocument> {}
|
|
73
|
+
|
|
74
|
+
export interface McpOAuthRevokedFamilyModel
|
|
75
|
+
extends mongoose.Model<McpOAuthRevokedFamilyDocument>,
|
|
76
|
+
McpOAuthRevokedFamilyStatics {}
|
|
77
|
+
|
|
78
|
+
/** One issued access/refresh token pair. Rotation chains pairs together by `familyId`. */
|
|
79
|
+
export interface McpOAuthTokenDocument extends mongoose.Document {
|
|
80
|
+
_id: mongoose.Types.ObjectId;
|
|
81
|
+
accessExpiresAt: Date;
|
|
82
|
+
accessTokenHash: string;
|
|
83
|
+
clientId: string;
|
|
84
|
+
created: Date;
|
|
85
|
+
familyId: string;
|
|
86
|
+
refreshExpiresAt: Date;
|
|
87
|
+
refreshTokenHash: string;
|
|
88
|
+
resource?: string;
|
|
89
|
+
revokedAt?: Date;
|
|
90
|
+
rotatedAt?: Date;
|
|
91
|
+
scope?: string;
|
|
92
|
+
tokenEpoch?: number;
|
|
93
|
+
updated: Date;
|
|
94
|
+
userId: mongoose.Types.ObjectId;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
export interface McpOAuthTokenIssueOptions {
|
|
98
|
+
accessTokenTtlSeconds: number;
|
|
99
|
+
clientId: string;
|
|
100
|
+
familyId?: string;
|
|
101
|
+
refreshTokenTtlSeconds: number;
|
|
102
|
+
resource?: string;
|
|
103
|
+
scope?: string;
|
|
104
|
+
/** The user's tokenEpoch when the grant was approved (default 0); a later bump ends the family. */
|
|
105
|
+
tokenEpoch?: number;
|
|
106
|
+
userId: mongoose.Types.ObjectId;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
interface McpOAuthTokenStatics
|
|
110
|
+
extends FindExactlyOnePlugin<McpOAuthTokenDocument>,
|
|
111
|
+
FindOneOrNonePlugin<McpOAuthTokenDocument> {
|
|
112
|
+
issue: (
|
|
113
|
+
this: McpOAuthTokenModel,
|
|
114
|
+
options: McpOAuthTokenIssueOptions
|
|
115
|
+
) => Promise<{
|
|
116
|
+
accessToken: string;
|
|
117
|
+
mcpOAuthToken: McpOAuthTokenDocument;
|
|
118
|
+
refreshToken: string;
|
|
119
|
+
}>;
|
|
120
|
+
revokeFamily: (this: McpOAuthTokenModel, familyId: string) => Promise<void>;
|
|
121
|
+
verifyAccessToken: (
|
|
122
|
+
this: McpOAuthTokenModel,
|
|
123
|
+
token: string
|
|
124
|
+
) => Promise<McpOAuthTokenDocument | null>;
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
export interface McpOAuthTokenModel
|
|
128
|
+
extends mongoose.Model<McpOAuthTokenDocument>,
|
|
129
|
+
McpOAuthTokenStatics {}
|
|
@@ -19,9 +19,13 @@ export interface McpServiceTokenStatics
|
|
|
19
19
|
) => Promise<number>;
|
|
20
20
|
issueFor: (
|
|
21
21
|
this: McpServiceTokenModel,
|
|
22
|
-
user: {_id: {toString(): string}},
|
|
22
|
+
user: {_id: {toString(): string}; tokenEpoch?: number},
|
|
23
23
|
options: McpServiceTokenIssueOptions
|
|
24
24
|
) => Promise<{mcpServiceToken: McpServiceTokenDocument; token: string}>;
|
|
25
|
+
revokeOutdatedForUser: (
|
|
26
|
+
this: McpServiceTokenModel,
|
|
27
|
+
user: {_id: {toString(): string}; tokenEpoch?: number}
|
|
28
|
+
) => Promise<void>;
|
|
25
29
|
revokeForUser: (
|
|
26
30
|
this: McpServiceTokenModel,
|
|
27
31
|
user: {_id: {toString(): string}},
|
|
@@ -41,6 +45,7 @@ export interface McpServiceTokenDocument extends mongoose.Document {
|
|
|
41
45
|
lastUsedAt?: Date;
|
|
42
46
|
name: string;
|
|
43
47
|
revokedAt?: Date;
|
|
48
|
+
tokenEpoch?: number;
|
|
44
49
|
tokenHash: string;
|
|
45
50
|
tokenPrefix: string;
|
|
46
51
|
updated: Date;
|