@thoughtspot/mcp-auth 2.0.0 → 2.0.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.
- package/dist/bearer.d.ts.map +1 -1
- package/dist/bearer.js +8 -4
- package/dist/bearer.js.map +1 -1
- package/package.json +1 -1
package/dist/bearer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bearer.d.ts","sourceRoot":"","sources":["../src/bearer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAGjC,OAAO,KAAK,EACX,SAAS,EACT,SAAS,EAET,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,eAAe;IAE/B,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG;QAAE,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;KAAE,CAAC;IAEvG,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG;QAAE,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;KAAE,CAAC;CAC1G;AAED,MAAM,WAAW,wBAAwB,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS;IACxE,KAAK,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IACrB;;;OAGG;IACH,QAAQ,CAAC,EAAE;QACV,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IACF;;OAEG;IACH,WAAW,CAAC,EAAE;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;KACb,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"bearer.d.ts","sourceRoot":"","sources":["../src/bearer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAGjC,OAAO,KAAK,EACX,SAAS,EACT,SAAS,EAET,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,eAAe;IAE/B,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG;QAAE,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;KAAE,CAAC;IAEvG,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG;QAAE,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;KAAE,CAAC;CAC1G;AAED,MAAM,WAAW,wBAAwB,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS;IACxE,KAAK,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IACrB;;;OAGG;IACH,QAAQ,CAAC,EAAE;QACV,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IACF;;OAEG;IACH,WAAW,CAAC,EAAE;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;KACb,CAAC;CACF;AA0HD,wBAAgB,iBAAiB,CAChC,CAAC,SAAS,SAAS,GAAG,SAAS,EAE/B,OAAO,SAAS;IAAE,QAAQ,EAAE,GAAG,CAAA;CAAE,GAAG;IAAE,QAAQ,EAAE,GAAG,CAAA;CAAE,EAErD,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,EAClB,SAAS,EAAE,eAAe,EAC1B,OAAO,GAAE,wBAAwB,CAAC,CAAC,CAAM,GACvC,IAAI,CAAC,OAAO,CAAC,CAiCf"}
|
package/dist/bearer.js
CHANGED
|
@@ -63,10 +63,14 @@ async function handleTokenAuth(req, env, ctx, MCPServer, authRouteFamily, hooks,
|
|
|
63
63
|
let response;
|
|
64
64
|
const pathname = url.pathname;
|
|
65
65
|
if (pathname.endsWith(mcpPath)) {
|
|
66
|
-
|
|
66
|
+
const rewritten = new URL(req.url);
|
|
67
|
+
rewritten.pathname = mcpPath;
|
|
68
|
+
response = await MCPServer.serve(mcpPath).fetch(new Request(rewritten, req), env, ctx);
|
|
67
69
|
}
|
|
68
70
|
else if (pathname.endsWith(ssePath)) {
|
|
69
|
-
|
|
71
|
+
const rewritten = new URL(req.url);
|
|
72
|
+
rewritten.pathname = ssePath;
|
|
73
|
+
response = await MCPServer.serveSSE(ssePath).fetch(new Request(rewritten, req), env, ctx);
|
|
70
74
|
}
|
|
71
75
|
else {
|
|
72
76
|
response = new Response("Not found", { status: 404 });
|
|
@@ -84,8 +88,8 @@ export function withBearerHandler(app, MCPServer, options = {}) {
|
|
|
84
88
|
const tokenPrefix = options.prefixes?.token ?? PUBLIC_ROUTE_PREFIXES.token;
|
|
85
89
|
const mcpPath = options.innerRoutes?.mcp ?? PUBLIC_ROUTES.mcp;
|
|
86
90
|
const ssePath = options.innerRoutes?.sse ?? PUBLIC_ROUTES.sse;
|
|
87
|
-
app.
|
|
88
|
-
app.
|
|
91
|
+
app.all(`${bearerPrefix}/*`, (c) => handleTokenAuth(c.req.raw, c.env, c.executionCtx, MCPServer, "bearer", options.hooks, mcpPath, ssePath));
|
|
92
|
+
app.all(`${tokenPrefix}/*`, (c) => handleTokenAuth(c.req.raw, c.env, c.executionCtx, MCPServer, "token", options.hooks, mcpPath, ssePath));
|
|
89
93
|
return app;
|
|
90
94
|
}
|
|
91
95
|
//# sourceMappingURL=bearer.js.map
|
package/dist/bearer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bearer.js","sourceRoot":"","sources":["../src/bearer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAmChE,SAAS,uBAAuB,CAC/B,QAAgB,EAChB,eAAgC,EAChC,OAAe;IAEf,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAChC,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC;IAClE,CAAC;IACD,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC;AAClE,CAAC;AAED,SAAS,kBAAkB,CAC1B,KAA+B,EAC/B,MAAc,EACd,GAAqB,EACrB,GAAY,EACZ,KAA2B;IAE3B,IAAI,CAAC,KAAK,EAAE,cAAc;QAAE,OAAO;IACnC,IAAI,CAAC;QACJ,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;IACnD,CAAC;AACF,CAAC;AAED,KAAK,UAAU,eAAe,CAC7B,GAAY,EACZ,GAAY,EACZ,GAAqB,EACrB,SAA0B,EAC1B,eAAgC,EAChC,KAA+B,EAC/B,OAAe,EACf,OAAe;IAEf,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,oBAAoB,GAAG,uBAAuB,CACnD,GAAG,CAAC,QAAQ,EACZ,eAAe,EACf,OAAO,CACP,CAAC;IAEF,IAAI,CAAC;QACJ,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QACpD,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,0BAA0B,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YAC3E,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,oBAAoB,CAAC,CAAC;YAC3E,OAAO,QAAQ,CAAC;QACjB,CAAC;QAED,IAAI,WAAW,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,MAAqB,CAAC;QAE1B,IAAI,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,CAAC,WAAW,EAAE,MAAM,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACP,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,0BAA0B,EAAE;gBACzD,MAAM,EAAE,GAAG;aACX,CAAC,CAAC;YACH,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,oBAAoB,CAAC,CAAC;YAC3E,OAAO,QAAQ,CAAC;QACjB,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAC5B,gHAAgH,EAChH,EAAE,MAAM,EAAE,GAAG,EAAE,CACf,CAAC;YACF,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,oBAAoB,CAAC,CAAC;YAC3E,OAAO,QAAQ,CAAC;QACjB,CAAC;QAED,MAAM,UAAU,GACf,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,qBAAqB,CAAC;QAE9D,MAAM,SAAS,GAAc;YAC5B,WAAW,EAAE,WAAW;YACxB,WAAW,EAAE,sBAAsB,CAAC,MAAM,CAAC;YAC3C,UAAU,EAAE;gBACX,QAAQ,EAAE,UAAU;gBACpB,UAAU;gBACV,gBAAgB,EAAE,IAAI,CAAC,GAAG,EAAE;aAC5B;SACD,CAAC;QAEF,MAAM,KAAK,GAAG,KAAK,EAAE,WAAW;YAC/B,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,SAAS,CAAC;YACnC,CAAC,CAAE,SAAe,CAAC;QAEnB,GAA+B,CAAC,KAAK,GAAG,KAAK,CAAC;QAE/C,IAAI,QAAkB,CAAC;QACvB,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC9B,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,QAAQ,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"bearer.js","sourceRoot":"","sources":["../src/bearer.ts"],"names":[],"mappings":"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"}
|