@forumone/throughline 2.3.0-pr-315-e1a501e → 2.3.0-pr-315-0f51f40
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/CHANGELOG.md +2 -2
- package/dist/mcp/payload-mcp.d.ts +2 -0
- package/dist/mcp/payload-mcp.d.ts.map +1 -1
- package/dist/mcp/payload-mcp.js +9 -3
- package/dist/mcp/payload-mcp.js.map +1 -1
- package/dist/mcp-oauth/auth.d.ts.map +1 -1
- package/dist/mcp-oauth/auth.js +6 -1
- package/dist/mcp-oauth/auth.js.map +1 -1
- package/dist/mcp-oauth/collections.d.ts +2 -1
- package/dist/mcp-oauth/collections.d.ts.map +1 -1
- package/dist/mcp-oauth/collections.js +19 -0
- package/dist/mcp-oauth/collections.js.map +1 -1
- package/dist/mcp-oauth/plugin.d.ts.map +1 -1
- package/dist/mcp-oauth/plugin.js +10 -2
- package/dist/mcp-oauth/plugin.js.map +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# @forumone/throughline
|
|
2
2
|
|
|
3
|
-
## 2.3.0-pr-315-
|
|
3
|
+
## 2.3.0-pr-315-0f51f40
|
|
4
4
|
|
|
5
5
|
### Minor Changes
|
|
6
6
|
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
|
|
15
15
|
### Patch Changes
|
|
16
16
|
|
|
17
|
-
- @forumone/throughline-design-system@2.3.0-pr-315-
|
|
17
|
+
- @forumone/throughline-design-system@2.3.0-pr-315-0f51f40
|
|
18
18
|
|
|
19
19
|
## 2.2.0
|
|
20
20
|
|
|
@@ -30,6 +30,8 @@ export interface PayloadMcpRequest {
|
|
|
30
30
|
name?: unknown;
|
|
31
31
|
roles?: unknown;
|
|
32
32
|
groups?: unknown;
|
|
33
|
+
/** The app a signed-in connection belongs to, set by `mcp-oauth`'s `overrideAuth`. */
|
|
34
|
+
_mcpClient?: unknown;
|
|
33
35
|
} | null;
|
|
34
36
|
payloadAPI?: string;
|
|
35
37
|
payload?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payload-mcp.d.ts","sourceRoot":"","sources":["../../src/mcp/payload-mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,MAAM,EAAkB,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AA0BrD,wEAAwE;AACxE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,CAAC,CAAC,WAAW,CAAA;IACzB,OAAO,EAAE,CACP,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,OAAO,KACX,OAAO,CAAC;QAAE,OAAO,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;CACpF;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"payload-mcp.d.ts","sourceRoot":"","sources":["../../src/mcp/payload-mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,MAAM,EAAkB,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AA0BrD,wEAAwE;AACxE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,CAAC,CAAC,WAAW,CAAA;IACzB,OAAO,EAAE,CACP,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,OAAO,KACX,OAAO,CAAC;QAAE,OAAO,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;CACpF;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE;QACL,EAAE,CAAC,EAAE,OAAO,CAAA;QACZ,KAAK,CAAC,EAAE,OAAO,CAAA;QACf,IAAI,CAAC,EAAE,OAAO,CAAA;QACd,KAAK,CAAC,EAAE,OAAO,CAAA;QACf,MAAM,CAAC,EAAE,OAAO,CAAA;QAChB,sFAAsF;QACtF,UAAU,CAAC,EAAE,OAAO,CAAA;KACrB,GAAG,IAAI,CAAA;IACR,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAC9B;AAED,MAAM,WAAW,uBAAuB;IACtC;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,WAAW,CAAA;IACnB;;;;OAIG;IACH,WAAW,CAAC,EAAE,cAAc,CAAA;CAC7B;AAqDD,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,iBAAiB,EACvB,OAAO,GAAE,uBAA4B,GACpC,cAAc,CAqBhB;AA0ED,2CAA2C;AAC3C,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,iBAAiB,EAAE,EAC1B,OAAO,GAAE,uBAA4B,GACpC,cAAc,EAAE,CAElB"}
|
package/dist/mcp/payload-mcp.js
CHANGED
|
@@ -141,7 +141,7 @@ async function recordToolFailure(toolName, error, args, context, options) {
|
|
|
141
141
|
}
|
|
142
142
|
/** Every tool in a server, in one call. */
|
|
143
143
|
export function toPayloadMcpTools(tools, options = {}) {
|
|
144
|
-
return tools.map(tool => toPayloadMcpTool(tool, options));
|
|
144
|
+
return tools.map((tool) => toPayloadMcpTool(tool, options));
|
|
145
145
|
}
|
|
146
146
|
function shapeOf(tool) {
|
|
147
147
|
const schema = tool.inputSchema;
|
|
@@ -166,9 +166,15 @@ function contextFrom(req, options) {
|
|
|
166
166
|
The strategy name is the honest fallback. `plugin-mcp` resolves a key to its
|
|
167
167
|
linked user and does not carry the key document forward, so "which key" is
|
|
168
168
|
not a question the request can answer — and an audit row saying
|
|
169
|
-
`mcp-api-key` is better than one asserting a name nothing checked.
|
|
169
|
+
`mcp-api-key` is better than one asserting a name nothing checked. A
|
|
170
|
+
signed-in connection does know: `mcp-oauth` puts its app on the user.
|
|
170
171
|
*/
|
|
171
|
-
apiKeyName: options.apiKeyName ??
|
|
172
|
+
apiKeyName: options.apiKeyName ??
|
|
173
|
+
(typeof req.user?._mcpClient === 'string' && req.user._mcpClient
|
|
174
|
+
? `${req.user._mcpClient} (OAuth)`
|
|
175
|
+
: req.payloadAPI === 'MCP'
|
|
176
|
+
? 'mcp-api-key'
|
|
177
|
+
: ''),
|
|
172
178
|
logger: options.logger ?? req.payload?.logger ?? defaultLogger,
|
|
173
179
|
};
|
|
174
180
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payload-mcp.js","sourceRoot":"","sources":["../../src/mcp/payload-mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"payload-mcp.js","sourceRoot":"","sources":["../../src/mcp/payload-mcp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/mcp-oauth/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,SAAS,CAAA;AAGhE,OAAO,EAKL,KAAK,eAAe,EACrB,MAAM,cAAc,CAAA;AA0BrB,wGAAwG;AACxG,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5C,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,MAAM,MAAM,YAAY,GAAG,CACzB,GAAG,EAAE,cAAc,EACnB,2BAA2B,EAAE,CAAC,cAAc,CAAC,EAAE,IAAI,GAAG,MAAM,KAAK,OAAO,CAAC,iBAAiB,CAAC,KACxF,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAyB/B,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,eAAe,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/mcp-oauth/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,SAAS,CAAA;AAGhE,OAAO,EAKL,KAAK,eAAe,EACrB,MAAM,cAAc,CAAA;AA0BrB,wGAAwG;AACxG,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5C,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,MAAM,MAAM,YAAY,GAAG,CACzB,GAAG,EAAE,cAAc,EACnB,2BAA2B,EAAE,CAAC,cAAc,CAAC,EAAE,IAAI,GAAG,MAAM,KAAK,OAAO,CAAC,iBAAiB,CAAC,KACxF,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAyB/B,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,eAAe,GAAG,YAAY,CAsCzE"}
|
package/dist/mcp-oauth/auth.js
CHANGED
|
@@ -33,7 +33,12 @@ export function createOverrideAuth(runtime) {
|
|
|
33
33
|
challenge(req, runtime, 'invalid_token', result.reason);
|
|
34
34
|
const tools = toolsFor(result.user, policy, runtime);
|
|
35
35
|
return {
|
|
36
|
-
user: {
|
|
36
|
+
user: {
|
|
37
|
+
...result.user,
|
|
38
|
+
collection: runtime.users,
|
|
39
|
+
_strategy: MCP_OAUTH_STRATEGY,
|
|
40
|
+
_mcpClient: String(result.grant['clientName'] ?? ''),
|
|
41
|
+
},
|
|
37
42
|
'payload-mcp-tool': Object.fromEntries(tools.map((name) => [toCamelCase(name), true])),
|
|
38
43
|
'payload-mcp-prompt': Object.fromEntries(runtime.prompts.map((prompt) => [toCamelCase(prompt.name), true])),
|
|
39
44
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/mcp-oauth/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAuB,MAAM,SAAS,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,WAAW,EACX,QAAQ,GAET,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAA;AAsCpD,SAAS,SAAS,CAChB,GAAmB,EACnB,OAAwB,EACxB,KAAc,EACd,WAAoB;IAEpB,MAAM,KAAK,GAAG;QACZ,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtC,8EAA8E;QAC9E,GAAG,CAAC,WAAW;YACb,CAAC,CAAC;gBACE,sBAAsB,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,EAAE,CAAC,GAAG;aAC9F;YACH,CAAC,CAAC,EAAE,CAAC;QACP,sBAAsB,4BAA4B,CAAC,OAAO,CAAC,GAAG;QAC9D,aAAa;KACd,CAAA;IACD,MAAM,OAAO,GAAG,GAAG,CAAC,eAAe,IAAI,IAAI,OAAO,EAAE,CAAA;IACpD,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,UAAU,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC7D,GAAG,CAAC,eAAe,GAAG,OAAO,CAAA;IAC7B,MAAM,IAAI,iBAAiB,EAAE,CAAA;AAC/B,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAwB;IACzD,OAAO,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE;QAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;QACrD,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACxF,IAAI,CAAC,MAAM;YAAE,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QAEpC,IAAI,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3C,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACrD,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;YAClF,IAAI,QAAQ,IAAI,MAAM;gBAAE,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;YAE/E,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YACpD,OAAO;gBACL,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/mcp-oauth/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import type { CollectionConfig, GlobalConfig, PayloadRequest } from 'payload';
|
|
1
|
+
import type { CollectionBeforeDeleteHook, CollectionConfig, GlobalConfig, PayloadRequest } from 'payload';
|
|
2
2
|
import { type McpOAuthRuntime } from './runtime.js';
|
|
3
3
|
type UserDoc = Record<string, unknown>;
|
|
4
4
|
/** The person signed in to the admin, or nobody if the request came through MCP. */
|
|
5
5
|
export declare function signedInPerson(req: PayloadRequest): UserDoc | undefined;
|
|
6
|
+
export declare function deleteGrantsOf(field: 'user' | 'client'): CollectionBeforeDeleteHook;
|
|
6
7
|
export declare function clientsCollection(runtime: McpOAuthRuntime, group: string): CollectionConfig;
|
|
7
8
|
export declare function grantsCollection(runtime: McpOAuthRuntime, group: string): CollectionConfig;
|
|
8
9
|
export declare function accessGlobal(runtime: McpOAuthRuntime, group: string): GlobalConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collections.d.ts","sourceRoot":"","sources":["../../src/mcp-oauth/collections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"collections.d.ts","sourceRoot":"","sources":["../../src/mcp-oauth/collections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,0BAA0B,EAC1B,gBAAgB,EAEhB,YAAY,EACZ,cAAc,EACf,MAAM,SAAS,CAAA;AAGhB,OAAO,EAKL,KAAK,eAAe,EACrB,MAAM,cAAc,CAAA;AAuBrB,KAAK,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAEtC,oFAAoF;AACpF,wBAAgB,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,GAAG,SAAS,CAMvE;AAgCD,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,0BAA0B,CASnF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAiD3F;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG,gBAAgB,CA4E1F;AAQD,wBAAgB,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CA+ElF"}
|
|
@@ -32,6 +32,22 @@ const kindOptions = MCP_CLIENT_KINDS.map((kind) => ({
|
|
|
32
32
|
label: MCP_CLIENT_RULES[kind].label,
|
|
33
33
|
value: kind,
|
|
34
34
|
}));
|
|
35
|
+
/*
|
|
36
|
+
A grant's person and app are required, so the database's `ON DELETE SET NULL`
|
|
37
|
+
cannot apply and the delete would fail. Deleting either deletes its
|
|
38
|
+
connections first, which is also what deleting them should mean: nothing is
|
|
39
|
+
left that could sign in as somebody who is gone.
|
|
40
|
+
*/
|
|
41
|
+
export function deleteGrantsOf(field) {
|
|
42
|
+
return async ({ req, id }) => {
|
|
43
|
+
await req.payload.delete({
|
|
44
|
+
collection: MCP_OAUTH_GRANTS_SLUG,
|
|
45
|
+
where: { [field]: { equals: id } },
|
|
46
|
+
overrideAccess: true,
|
|
47
|
+
req,
|
|
48
|
+
});
|
|
49
|
+
};
|
|
50
|
+
}
|
|
35
51
|
export function clientsCollection(runtime, group) {
|
|
36
52
|
return {
|
|
37
53
|
slug: MCP_OAUTH_CLIENTS_SLUG,
|
|
@@ -43,6 +59,7 @@ export function clientsCollection(runtime, group) {
|
|
|
43
59
|
description: 'Apps that have registered to connect over MCP. Recognised by where they send people back to, not by the name they give.',
|
|
44
60
|
},
|
|
45
61
|
access: { read: adminOnly(runtime), create: never, update: never, delete: adminOnly(runtime) },
|
|
62
|
+
hooks: { beforeDelete: [deleteGrantsOf('client')] },
|
|
46
63
|
fields: [
|
|
47
64
|
{
|
|
48
65
|
name: 'clientId',
|
|
@@ -90,6 +107,8 @@ export function grantsCollection(runtime, group) {
|
|
|
90
107
|
useAsTitle: 'clientName',
|
|
91
108
|
defaultColumns: ['clientName', 'user', 'status', 'lastUsedAt', 'connectedAt'],
|
|
92
109
|
description: 'Every app somebody has connected over MCP, as them. Revoking one signs that app out at once.',
|
|
110
|
+
// Everybody else sees their own on Connect MCP, which is where they look.
|
|
111
|
+
hidden: ({ user }) => !(user && runtime.isAdmin(user)),
|
|
93
112
|
},
|
|
94
113
|
access: {
|
|
95
114
|
read: ownOrAdmin(runtime),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collections.js","sourceRoot":"","sources":["../../src/mcp-oauth/collections.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"collections.js","sourceRoot":"","sources":["../../src/mcp-oauth/collections.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/mcp-oauth/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAU,MAAM,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,WAAW,CAAA;AAEjE,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAA;AACrE,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,eAAe,EACrB,MAAM,cAAc,CAAA;AAErB,eAAO,MAAM,qBAAqB,6CAA6C,CAAA;AAC/E,eAAO,MAAM,uBAAuB,+CAA+C,CAAA;AAEnF,MAAM,WAAW,QAAQ;IACvB,gFAAgF;IAChF,MAAM,EAAE,MAAM,CAAA;IACd,yCAAyC;IACzC,YAAY,EAAE,YAAY,CAAA;IAC1B,OAAO,EAAE,eAAe,CAAA;CACzB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,QAAQ,CACtB,OAAO,EAAE,eAAe,EACxB,eAAe,GAAE,eAAoB,GACpC,QAAQ,
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/mcp-oauth/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAU,MAAM,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,WAAW,CAAA;AAEjE,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAA;AACrE,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,eAAe,EACrB,MAAM,cAAc,CAAA;AAErB,eAAO,MAAM,qBAAqB,6CAA6C,CAAA;AAC/E,eAAO,MAAM,uBAAuB,+CAA+C,CAAA;AAEnF,MAAM,WAAW,QAAQ;IACvB,gFAAgF;IAChF,MAAM,EAAE,MAAM,CAAA;IACd,yCAAyC;IACzC,YAAY,EAAE,YAAY,CAAA;IAC1B,OAAO,EAAE,eAAe,CAAA;CACzB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,QAAQ,CACtB,OAAO,EAAE,eAAe,EACxB,eAAe,GAAE,eAAoB,GACpC,QAAQ,CA2EV"}
|
package/dist/mcp-oauth/plugin.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { REPORTS_NAV_PATH } from '../editorial/plugin.js';
|
|
2
2
|
import { createOverrideAuth } from './auth.js';
|
|
3
|
-
import { accessGlobal, clientsCollection, grantsCollection } from './collections.js';
|
|
3
|
+
import { accessGlobal, clientsCollection, deleteGrantsOf, grantsCollection } from './collections.js';
|
|
4
4
|
import { oauthEndpoints } from './endpoints.js';
|
|
5
5
|
import { createRuntime, MCP_OAUTH_CUSTOM_KEY, } from './runtime.js';
|
|
6
6
|
export const CONNECT_MCP_VIEW_PATH = '@forumone/throughline/rsc#ConnectMcpView';
|
|
@@ -45,7 +45,15 @@ export function mcpOAuth(options, endpointOptions = {}) {
|
|
|
45
45
|
return {
|
|
46
46
|
...incoming,
|
|
47
47
|
collections: [
|
|
48
|
-
...(incoming.collections ?? [])
|
|
48
|
+
...(incoming.collections ?? []).map((collection) => collection.slug === runtime.users
|
|
49
|
+
? {
|
|
50
|
+
...collection,
|
|
51
|
+
hooks: {
|
|
52
|
+
...collection.hooks,
|
|
53
|
+
beforeDelete: [...(collection.hooks?.beforeDelete ?? []), deleteGrantsOf('user')],
|
|
54
|
+
},
|
|
55
|
+
}
|
|
56
|
+
: collection),
|
|
49
57
|
clientsCollection(runtime, group),
|
|
50
58
|
grantsCollection(runtime, group),
|
|
51
59
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/mcp-oauth/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAqB,MAAM,WAAW,CAAA;AACjE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/mcp-oauth/plugin.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forumone/throughline",
|
|
3
|
-
"version": "2.3.0-pr-315-
|
|
3
|
+
"version": "2.3.0-pr-315-0f51f40",
|
|
4
4
|
"description": "Throughline: an editorial platform for Payload CMS. Publishing, approvals, audit, integrations, email and jobs, with every feature reachable over MCP.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -174,7 +174,7 @@
|
|
|
174
174
|
"dependencies": {
|
|
175
175
|
"zod": "^3.23.0",
|
|
176
176
|
"zod-to-json-schema": "^3.25.2",
|
|
177
|
-
"@forumone/throughline-design-system": "2.3.0-pr-315-
|
|
177
|
+
"@forumone/throughline-design-system": "2.3.0-pr-315-0f51f40"
|
|
178
178
|
},
|
|
179
179
|
"devDependencies": {
|
|
180
180
|
"@payloadcms/db-sqlite": "^3.83.0",
|
|
@@ -198,7 +198,7 @@
|
|
|
198
198
|
"typescript": "^5.6.0",
|
|
199
199
|
"vitest": "^4.1.10",
|
|
200
200
|
"@forumone/throughline-eslint-config": "0.0.1",
|
|
201
|
-
"@forumone/throughline-reference-ds": "0.3.23-pr-315-
|
|
201
|
+
"@forumone/throughline-reference-ds": "0.3.23-pr-315-0f51f40",
|
|
202
202
|
"@forumone/throughline-tsconfig": "0.0.1"
|
|
203
203
|
},
|
|
204
204
|
"scripts": {
|