@shivaedev/mcp 0.2.4 → 0.4.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/CHANGELOG.md +30 -0
- package/README.md +8 -7
- package/dist/adapters/betterAuth.d.ts +16 -7
- package/dist/adapters/betterAuth.d.ts.map +1 -1
- package/dist/adapters/betterAuth.js +13 -8
- package/dist/adapters/betterAuth.js.map +1 -1
- package/dist/adapters/oauthGrants.d.ts +9 -3
- package/dist/adapters/oauthGrants.d.ts.map +1 -1
- package/dist/adapters/oauthGrants.js +2 -2
- package/dist/adapters/oauthGrants.js.map +1 -1
- package/dist/requestServer.d.ts +1 -2
- package/dist/requestServer.d.ts.map +1 -1
- package/dist/requestServer.js.map +1 -1
- package/dist/routes.d.ts +2 -4
- package/dist/routes.d.ts.map +1 -1
- package/dist/routes.js +1 -1
- package/dist/routes.js.map +1 -1
- package/package.json +8 -8
- package/src/adapters/betterAuth.ts +16 -9
- package/src/adapters/oauthGrants.ts +2 -2
- package/src/requestServer.ts +1 -2
- package/src/routes.ts +4 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,35 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.4.0 - 2026-11-02
|
|
4
|
+
|
|
5
|
+
### Added
|
|
6
|
+
|
|
7
|
+
- Identity mounts expose `admitsUser(userId)` to check the current sign-in policy for authenticated users on other transports, without caching rule verdicts.
|
|
8
|
+
|
|
9
|
+
### Fixed
|
|
10
|
+
|
|
11
|
+
- Serve OAuth discovery at the configured issuer's discovery path, including custom and root issuers.
|
|
12
|
+
- Keep OAuth metadata rejections in the typed `AuthUnavailable` channel and retain the original cause of configuration, metadata and grant failures.
|
|
13
|
+
- Accept case-insensitive bearer authorization schemes.
|
|
14
|
+
- Identity checks with a zero recheck interval start an independent rule lookup even while another check for the same account is pending.
|
|
15
|
+
|
|
16
|
+
### Breaking
|
|
17
|
+
|
|
18
|
+
- MCP's `betterAuthMcp` requires `admitsUser`. Pass `admitsUser: mounted.admitsUser` from `betterAuthMount` alongside `auth: mounted.auth`. Each MCP request refuses users denied by the identity sign-in policy; existing tokens follow admission changes on the next request.
|
|
19
|
+
|
|
20
|
+
## 0.3.0 - 2026-11-01
|
|
21
|
+
|
|
22
|
+
### Changed
|
|
23
|
+
|
|
24
|
+
- Identity operation spans use the `Identity` prefix, including `Identity.resolveSession` and `Identity.betterAuthSession`. Adjust trace queries that used `Platform` or `PlatformRpc` names.
|
|
25
|
+
|
|
26
|
+
### Breaking
|
|
27
|
+
|
|
28
|
+
- Identity reads `SessionPolicy` from the Effect environment. Import the service from `@shivaedev/identity/server/SessionPolicy.ts` and construct one `Layer.succeed(SessionPolicy, { origin, provider, roles, streamRevalidationInterval })`, omitting optional fields as needed. Replace `SessionPolicy<TSession>` annotations with `SessionPolicy["Service"]`; provider-specific types remain on `SessionProvider<TSession>`. Remove policy arguments from session middleware constructors, `resolveSession`, `withSessionUser`, `permissionLayer`, `permissionRoute`, session lookup, rechecks and stream revalidation; provide the policy Layer to the composed readers. Profiles and provider accounts are decoded at their middleware boundaries from the shared provider.
|
|
29
|
+
- Server's `appHost` `sessions` option accepts that Layer and supplies it to middleware, application routes, sockets and change subscriptions. Wrap the previous policy object in `Layer.succeed(SessionPolicy, policy)`. Remove the session-shape generic from host option and factory types, and remove the policy argument from `hostChanges` and `bearerSocketRpc`.
|
|
30
|
+
- Admin uses identity's `SessionPolicy` directly. Replace `AdminSessions` imports and Layers with the identity service, and provide the policy once through the host instead of separately to admin handlers and documents.
|
|
31
|
+
- MCP's `mcpRoutes` reads `SessionPolicy` from the environment. Remove its `sessions` option and the session-shape generic from `McpOptions`; `betterAuthMcp` now returns `sessions` as a policy Layer, which can be passed to the host or supplied to MCP routes with `HttpRouter.provideRequest(oauth.sessions)` when the host also serves cookie-authenticated RPC.
|
|
32
|
+
|
|
3
33
|
## 0.2.4 - 2026-11-01
|
|
4
34
|
|
|
5
35
|
### Changed
|
package/README.md
CHANGED
|
@@ -11,7 +11,6 @@ const routes = mcpRoutes({
|
|
|
11
11
|
name: "My app",
|
|
12
12
|
version: "1",
|
|
13
13
|
path: "/mcp",
|
|
14
|
-
sessions: oauth.sessions,
|
|
15
14
|
resourceMetadataUrl: oauth.resourceMetadataUrl,
|
|
16
15
|
audiences: [{ tools: userTools }, { permission: ManageTools.any, tools: adminTools }],
|
|
17
16
|
});
|
|
@@ -72,8 +71,10 @@ The Better Auth adapter is an optional edge module. Add its provider to the auth
|
|
|
72
71
|
```ts
|
|
73
72
|
import { admin, jwt } from "better-auth/plugins";
|
|
74
73
|
import { Effect, Layer } from "effect";
|
|
74
|
+
import { HttpRouter } from "effect/http";
|
|
75
75
|
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/mount.ts";
|
|
76
76
|
import { trustedOrigins } from "@shivaedev/identity/server/origin.ts";
|
|
77
|
+
import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
|
|
77
78
|
import { betterAuthMcp, mcpProvider } from "@shivaedev/mcp/adapters/betterAuth.ts";
|
|
78
79
|
import { mcpRoutes } from "@shivaedev/mcp/routes.ts";
|
|
79
80
|
import { appHost } from "@shivaedev/server/appHost.ts";
|
|
@@ -98,11 +99,11 @@ const application = Effect.gen(function* () {
|
|
|
98
99
|
{ roles: Roles },
|
|
99
100
|
);
|
|
100
101
|
const origin = trustedOrigins({ allow: ["https://app.example.com"], missing: "allow" });
|
|
101
|
-
const oauth = yield* betterAuthMcp({ auth: mounted.auth, resource, origin, roles: Roles });
|
|
102
|
+
const oauth = yield* betterAuthMcp({ admitsUser: mounted.admitsUser, auth: mounted.auth, resource, origin, roles: Roles });
|
|
102
103
|
return appHost({
|
|
103
104
|
group: Api,
|
|
104
105
|
handlers: Handlers,
|
|
105
|
-
sessions: { ...mounted.sessions, origin },
|
|
106
|
+
sessions: Layer.succeed(SessionPolicy, { ...mounted.sessions, origin }),
|
|
106
107
|
routes: Layer.mergeAll(
|
|
107
108
|
mounted.routes,
|
|
108
109
|
oauth.routes,
|
|
@@ -110,10 +111,9 @@ const application = Effect.gen(function* () {
|
|
|
110
111
|
name: "My app",
|
|
111
112
|
version: "1",
|
|
112
113
|
path: "/mcp",
|
|
113
|
-
sessions: oauth.sessions,
|
|
114
114
|
resourceMetadataUrl: oauth.resourceMetadataUrl,
|
|
115
115
|
audiences: [{ tools: userTools }, { permission: ManageTools.any, tools: adminTools }],
|
|
116
|
-
}),
|
|
116
|
+
}).pipe(HttpRouter.provideRequest(oauth.sessions)),
|
|
117
117
|
),
|
|
118
118
|
});
|
|
119
119
|
});
|
|
@@ -121,7 +121,7 @@ const application = Effect.gen(function* () {
|
|
|
121
121
|
|
|
122
122
|
`authPool`, `Api` and `Handlers` are the application's existing auth database, RPC group and handlers. Run the Better Auth migrations with the OAuth and JWT plugins included. For existing role management, keep the application's existing role plugin and `RoleSet` in this configuration.
|
|
123
123
|
|
|
124
|
-
The edge adapter verifies access-token signatures, issuer, endpoint audience and `mcp` scope, then loads the current user and the token client's consent through Better Auth.
|
|
124
|
+
The edge adapter verifies access-token signatures, issuer, endpoint audience and `mcp` scope, then loads the current user and the token client's consent through Better Auth. Pass `mounted.admitsUser` so every MCP request checks the mount's current sign-in policy against the user's stored provider accounts. MCP evaluates the rule afresh on every request, without the browser session recheck cache; admission changes apply to the next request with the same token. A failed admission lookup answers `503` without an OAuth challenge. Denied or banned users and clients without consent receive the same unauthorized response as invalid tokens. Identity resolves the stored role on each request. An invalid token receives `401` with a `WWW-Authenticate` protected-resource metadata pointer. The metadata names the authorization server and its discovery endpoint, so a client can start OAuth. MCP bearer credentials are separate from browser session cookies. Provide the OAuth policy Layer to the MCP routes before merging them with a cookie-authenticated host; this makes the authentication scope explicit.
|
|
125
125
|
|
|
126
126
|
### Revoke client grants
|
|
127
127
|
|
|
@@ -142,6 +142,7 @@ By default verification fetches the authorization server's JWKS URL. Pass `jwks`
|
|
|
142
142
|
|
|
143
143
|
```ts
|
|
144
144
|
const oauth = yield* betterAuthMcp({
|
|
145
|
+
admitsUser: mounted.admitsUser,
|
|
145
146
|
auth: mounted.auth,
|
|
146
147
|
resource,
|
|
147
148
|
origin,
|
|
@@ -159,6 +160,6 @@ pnpm add @shivaedev/mcp effect
|
|
|
159
160
|
pnpm add better-auth @better-auth/oauth-provider
|
|
160
161
|
```
|
|
161
162
|
|
|
162
|
-
The OAuth dependencies are optional peers, imported only by `adapters/betterAuth.ts`. Core `routes.ts`
|
|
163
|
+
The OAuth dependencies are optional peers, imported only by `adapters/betterAuth.ts`. Core `routes.ts` reads identity's `SessionPolicy` from the Effect environment with the same identity and permission semantics. Provide the adapter's `sessions` Layer once through the host, or supply another `SessionPolicy` Layer.
|
|
163
164
|
|
|
164
165
|
The endpoint uses Effect's request-scoped Streamable HTTP transport and MCP `2026-07-28`. Clients must support that protocol; earlier session-based versions and subscription streams are outside this adapter. Endpoint requests do not share registries, identities or MCP sessions.
|
|
@@ -1,26 +1,35 @@
|
|
|
1
1
|
import { type OAuthOptions, oauthProvider, type Scope } from "@better-auth/oauth-provider";
|
|
2
|
-
import { Effect } from "effect";
|
|
2
|
+
import { Effect, Layer } from "effect";
|
|
3
3
|
import { HttpRouter } from "effect/http";
|
|
4
4
|
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
5
5
|
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
6
6
|
import type { OriginPolicy } from "@shivaedev/identity/server/origin.ts";
|
|
7
|
-
import
|
|
7
|
+
import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
|
|
8
8
|
import { type JwksSource } from "./bearer.ts";
|
|
9
9
|
import { type OauthAuth } from "./oauthGrants.ts";
|
|
10
10
|
export declare function mcpProvider({ resource, scopes, ...options }: Omit<OAuthOptions<Scope[]>, "resources" | "clientRegistrationDefaultResources"> & {
|
|
11
11
|
readonly resource: string;
|
|
12
12
|
}): ReturnType<typeof oauthProvider>;
|
|
13
13
|
export declare const betterAuthMcp: (options: {
|
|
14
|
+
readonly admitsUser: (userId: string) => Effect.Effect<boolean, AuthUnavailable>;
|
|
14
15
|
readonly auth: OauthAuth;
|
|
15
16
|
readonly resource: string;
|
|
16
17
|
readonly jwks?: JwksSource;
|
|
17
18
|
readonly origin: OriginPolicy;
|
|
18
19
|
readonly roles?: RoleSet;
|
|
19
20
|
}) => Effect.Effect<{
|
|
20
|
-
revokeAllClients: (userId: string) => Effect.Effect<void, AuthUnavailable
|
|
21
|
-
|
|
21
|
+
revokeAllClients: (userId: string) => Effect.Effect<void, AuthUnavailable & {
|
|
22
|
+
cause: unknown;
|
|
23
|
+
}, never>;
|
|
24
|
+
revokeClient: (userId: string, clientId: string) => Effect.Effect<void, AuthUnavailable & {
|
|
25
|
+
cause: unknown;
|
|
26
|
+
}, never>;
|
|
22
27
|
resourceMetadataUrl: string;
|
|
23
|
-
routes:
|
|
24
|
-
|
|
25
|
-
}
|
|
28
|
+
routes: Layer.Layer<never, never, HttpRouter.HttpRouter | HttpRouter.Request<"Error", import("effect/http/HttpServerError").InternalError> | HttpRouter.Request<"Error", import("effect/http/HttpServerError").RequestParseError> | HttpRouter.Request<"Error", import("effect/http/HttpServerError").RouteNotFound> | HttpRouter.Request<"Error", AuthUnavailable & {
|
|
29
|
+
cause: unknown;
|
|
30
|
+
}>>;
|
|
31
|
+
sessions: Layer.Layer<SessionPolicy, never, never>;
|
|
32
|
+
}, AuthUnavailable & {
|
|
33
|
+
cause: unknown;
|
|
34
|
+
}, never>;
|
|
26
35
|
//# sourceMappingURL=betterAuth.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"betterAuth.d.ts","sourceRoot":"","sources":["../../src/adapters/betterAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,aAAa,EAAmC,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC5H,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"betterAuth.d.ts","sourceRoot":"","sources":["../../src/adapters/betterAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,aAAa,EAAmC,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC5H,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAyC,MAAM,aAAa,CAAC;AAChF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAC5E,OAAO,EAAU,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAe,KAAK,SAAS,EAAe,MAAM,kBAAkB,CAAC;AAE5E,wBAAgB,WAAW,CAAC,EAC3B,QAAQ,EACR,MAAgB,EAChB,GAAG,OAAO,EACV,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,EAAE,WAAW,GAAG,oCAAoC,CAAC,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,UAAU,CAC9H,OAAO,aAAa,CACpB,CAEA;AAED,eAAO,MAAM,aAAa;yBACJ,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,CAAC;mBACjE,SAAS;uBACL,MAAM;oBACT,UAAU;qBACT,YAAY;qBACZ,OAAO;;;;;;;;;;;;;;;SAsDvB,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { oauthProvider, oauthProviderAuthServerMetadata } from "@better-auth/oauth-provider";
|
|
2
|
-
import { Effect, Option } from "effect";
|
|
2
|
+
import { Effect, Layer, Option } from "effect";
|
|
3
3
|
import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
4
4
|
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
5
|
+
import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
|
|
5
6
|
import { bearer } from "./bearer.js";
|
|
6
7
|
import { grantedUser, oauthGrants } from "./oauthGrants.js";
|
|
7
8
|
export function mcpProvider({ resource, scopes = ["mcp"], ...options }) {
|
|
@@ -9,42 +10,46 @@ export function mcpProvider({ resource, scopes = ["mcp"], ...options }) {
|
|
|
9
10
|
}
|
|
10
11
|
export const betterAuthMcp = Effect.fn("Mcp.betterAuthMcp")(function* (options) {
|
|
11
12
|
const config = yield* Effect.tryPromise({
|
|
12
|
-
catch: () => new AuthUnavailable({ message: "OAuth provider configuration failed" }),
|
|
13
|
+
catch: (cause) => Object.assign(new AuthUnavailable({ message: "OAuth provider configuration failed" }), { cause }),
|
|
13
14
|
try: () => options.auth.api.getOAuthServerConfig(),
|
|
14
15
|
});
|
|
15
16
|
const { auth, resource } = options;
|
|
16
17
|
const url = new URL(resource);
|
|
17
18
|
const metadataPath = `/.well-known/oauth-protected-resource${url.pathname}`;
|
|
18
19
|
const resourceMetadataUrl = new URL(metadataPath, url).href;
|
|
20
|
+
const authorizationMetadataPath = `/.well-known/oauth-authorization-server${new URL(config.issuer).pathname.replace(/\/$/u, "")}`;
|
|
19
21
|
const verify = bearer(options.jwks ?? config.jwks_uri ?? new URL("/api/auth/jwks", url).href, resource, config.issuer);
|
|
20
|
-
const sessions = {
|
|
22
|
+
const sessions = Layer.succeed(SessionPolicy, {
|
|
21
23
|
origin: options.origin,
|
|
22
24
|
...(options.roles === undefined ? {} : { roles: options.roles }),
|
|
23
25
|
provider: {
|
|
24
26
|
get: (headers) => Effect.gen(function* () {
|
|
25
27
|
const authorization = headers.authorization;
|
|
26
|
-
const token = authorization?.
|
|
28
|
+
const token = authorization?.match(/^Bearer (?<token>.+)$/iu)?.groups?.token;
|
|
27
29
|
const claims = yield* verify(token);
|
|
28
30
|
if (Option.isNone(claims) || typeof claims.value.sub !== "string" || typeof claims.value.client_id !== "string") {
|
|
29
31
|
return Option.none();
|
|
30
32
|
}
|
|
31
33
|
const user = yield* grantedUser(auth, claims.value.sub, claims.value.client_id);
|
|
32
|
-
if (user === null) {
|
|
34
|
+
if (user === null || !(yield* options.admitsUser(user.id))) {
|
|
33
35
|
return Option.none();
|
|
34
36
|
}
|
|
35
37
|
const role = Reflect.get(user, "role");
|
|
36
38
|
return Option.some({ user: { email: user.email, id: user.id, name: user.name, ...(typeof role === "string" ? { role } : {}) } });
|
|
37
39
|
}),
|
|
38
40
|
},
|
|
39
|
-
};
|
|
41
|
+
});
|
|
40
42
|
const metadata = oauthProviderAuthServerMetadata(auth);
|
|
41
43
|
const authorizationMetadata = Effect.fn("Mcp.authorizationMetadata")(function* (request) {
|
|
42
44
|
const web = yield* HttpServerRequest.toWeb(request);
|
|
43
|
-
return HttpServerResponse.fromWeb(yield* Effect.
|
|
45
|
+
return HttpServerResponse.fromWeb(yield* Effect.tryPromise({
|
|
46
|
+
catch: (cause) => Object.assign(new AuthUnavailable({ message: "OAuth server metadata failed" }), { cause }),
|
|
47
|
+
try: () => metadata(web),
|
|
48
|
+
}));
|
|
44
49
|
});
|
|
45
50
|
const routes = HttpRouter.use((router) => Effect.gen(function* () {
|
|
46
51
|
yield* router.add("GET", metadataPath, HttpServerResponse.jsonUnsafe({ "authorization_servers": [config.issuer], resource, "scopes_supported": ["mcp"] }));
|
|
47
|
-
yield* router.add("GET",
|
|
52
|
+
yield* router.add("GET", authorizationMetadataPath, authorizationMetadata);
|
|
48
53
|
}));
|
|
49
54
|
return { ...oauthGrants(auth), resourceMetadataUrl, routes, sessions };
|
|
50
55
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"betterAuth.js","sourceRoot":"","sources":["../../src/adapters/betterAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,aAAa,EAAE,+BAA+B,EAAc,MAAM,6BAA6B,CAAC;AAC5H,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"betterAuth.js","sourceRoot":"","sources":["../../src/adapters/betterAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,8 +17,12 @@ export interface OauthAuth {
|
|
|
17
17
|
readonly options: BetterAuthOptions;
|
|
18
18
|
}
|
|
19
19
|
export declare function oauthGrants(auth: OauthAuth): {
|
|
20
|
-
revokeAllClients: (userId: string) => Effect.Effect<void, AuthUnavailable
|
|
21
|
-
|
|
20
|
+
revokeAllClients: (userId: string) => Effect.Effect<void, AuthUnavailable & {
|
|
21
|
+
cause: unknown;
|
|
22
|
+
}, never>;
|
|
23
|
+
revokeClient: (userId: string, clientId: string) => Effect.Effect<void, AuthUnavailable & {
|
|
24
|
+
cause: unknown;
|
|
25
|
+
}, never>;
|
|
22
26
|
};
|
|
23
27
|
export declare const grantedUser: (auth: OauthAuth, userId: string, clientId: string) => Effect.Effect<{
|
|
24
28
|
id: string;
|
|
@@ -28,5 +32,7 @@ export declare const grantedUser: (auth: OauthAuth, userId: string, clientId: st
|
|
|
28
32
|
emailVerified: boolean;
|
|
29
33
|
name: string;
|
|
30
34
|
image?: string | null | undefined;
|
|
31
|
-
} | null, AuthUnavailable
|
|
35
|
+
} | null, AuthUnavailable & {
|
|
36
|
+
cause: unknown;
|
|
37
|
+
}, never>;
|
|
32
38
|
//# sourceMappingURL=oauthGrants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthGrants.d.ts","sourceRoot":"","sources":["../../src/adapters/oauthGrants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,GAAG;YAC3D,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;SAClH,CAAC;QACF,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,cAAc,CAAC,CAAC;KAC/E,CAAC,CAAC;IACH,QAAQ,CAAC,GAAG,EAAE;QAAE,QAAQ,CAAC,sBAAsB,EAAE,MAAM,OAAO,CAAC;YAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC;IAC5H,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;CACpC;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,SAAS;IAgBzC,gBAAgB,WAAW,MAAM
|
|
1
|
+
{"version":3,"file":"oauthGrants.d.ts","sourceRoot":"","sources":["../../src/adapters/oauthGrants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,GAAG;YAC3D,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;SAClH,CAAC;QACF,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,cAAc,CAAC,CAAC;KAC/E,CAAC,CAAC;IACH,QAAQ,CAAC,GAAG,EAAE;QAAE,QAAQ,CAAC,sBAAsB,EAAE,MAAM,OAAO,CAAC;YAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC;IAC5H,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;CACpC;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,SAAS;IAgBzC,gBAAgB,WAAW,MAAM;;;IACjC,YAAY,WAAW,MAAM,YAAY,MAAM;;;EAEhD;AAED,eAAO,MAAM,WAAW;;;;;;;;;;SAmBtB,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
|
3
3
|
export function oauthGrants(auth) {
|
|
4
4
|
const revoke = Effect.fn("Mcp.revoke")(function* (userId, clientId) {
|
|
5
5
|
yield* Effect.tryPromise({
|
|
6
|
-
catch: () => new AuthUnavailable({ message: "OAuth grant revocation failed" }),
|
|
6
|
+
catch: (cause) => Object.assign(new AuthUnavailable({ message: "OAuth grant revocation failed" }), { cause }),
|
|
7
7
|
try: async () => {
|
|
8
8
|
const { adapter } = await auth.$context;
|
|
9
9
|
const where = [{ field: "userId", value: userId }, ...(clientId === undefined ? [] : [{ field: "clientId", value: clientId }])];
|
|
@@ -22,7 +22,7 @@ export function oauthGrants(auth) {
|
|
|
22
22
|
}
|
|
23
23
|
export const grantedUser = Effect.fn("Mcp.grantedUser")(function* (auth, userId, clientId) {
|
|
24
24
|
return yield* Effect.tryPromise({
|
|
25
|
-
catch: () => new AuthUnavailable({ message: "OAuth grant lookup failed" }),
|
|
25
|
+
catch: (cause) => Object.assign(new AuthUnavailable({ message: "OAuth grant lookup failed" }), { cause }),
|
|
26
26
|
try: async () => {
|
|
27
27
|
const { adapter, internalAdapter } = await auth.$context;
|
|
28
28
|
const user = await internalAdapter.findUserById(userId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthGrants.js","sourceRoot":"","sources":["../../src/adapters/oauthGrants.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAahE,MAAM,UAAU,WAAW,CAAC,IAAe;IAC1C,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAc,EAAE,QAAiB;QAClF,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;YACxB,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"oauthGrants.js","sourceRoot":"","sources":["../../src/adapters/oauthGrants.ts"],"names":[],"mappings":"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"}
|
package/dist/requestServer.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import { HttpRouter } from "effect/http";
|
|
3
3
|
import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
4
|
-
import type { UserSessionShape } from "@shivaedev/identity/server/session.ts";
|
|
5
4
|
import type { McpOptions } from "./routes.ts";
|
|
6
|
-
export declare const requestServer: <
|
|
5
|
+
export declare const requestServer: <E, R>(options: McpOptions<E, R>) => Effect.Effect<import("effect/http/HttpServerResponse").HttpServerResponse, unknown, import("effect/http/HttpServerRequest").HttpServerRequest | import("effect/Scope").Scope | SessionUser | Exclude<R, HttpRouter.HttpRouter>>;
|
|
7
6
|
//# sourceMappingURL=requestServer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requestServer.d.ts","sourceRoot":"","sources":["../src/requestServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAS,MAAM,QAAQ,CAAC;AAEvC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"requestServer.d.ts","sourceRoot":"","sources":["../src/requestServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAS,MAAM,QAAQ,CAAC;AAEvC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,eAAO,MAAM,aAAa,GAA6C,CAAC,EAAE,CAAC,+PASzE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requestServer.js","sourceRoot":"","sources":["../src/requestServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"requestServer.js","sourceRoot":"","sources":["../src/requestServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAGlE,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,EAAQ,OAAyB;IACrG,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC;IAChC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;IACrC,MAAM,SAAS,GAAG,SAAS,CAAC,sBAAsB,CAAC,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACzG,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS;SAC7B,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,KAAK,SAAS,IAAI,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;SACvF,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;IAClH,OAAO,KAAK,CAAC,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;AACpC,CAAC,CAAC,CAAC"}
|
package/dist/routes.d.ts
CHANGED
|
@@ -2,19 +2,17 @@ import { type Layer } from "effect";
|
|
|
2
2
|
import { HttpRouter } from "effect/http";
|
|
3
3
|
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
4
4
|
import type { Identity, SessionUser } from "@shivaedev/identity/identity.ts";
|
|
5
|
-
import { type SessionPolicy, type UserSessionShape } from "@shivaedev/identity/server/session.ts";
|
|
6
5
|
export interface Audience<E = never, R = never> {
|
|
7
6
|
readonly permission?: Permission;
|
|
8
7
|
readonly tools: Layer.Layer<never, E, R>;
|
|
9
8
|
}
|
|
10
|
-
export interface McpOptions<
|
|
9
|
+
export interface McpOptions<E, R> {
|
|
11
10
|
readonly allowedOrigins?: readonly string[];
|
|
12
11
|
readonly audiences: readonly Audience<E, R>[];
|
|
13
12
|
readonly name: string;
|
|
14
13
|
readonly path: HttpRouter.PathInput;
|
|
15
14
|
readonly resourceMetadataUrl: string;
|
|
16
|
-
readonly sessions: SessionPolicy<TSession>;
|
|
17
15
|
readonly version: string;
|
|
18
16
|
}
|
|
19
|
-
export declare function mcpRoutes<
|
|
17
|
+
export declare function mcpRoutes<E, R>(options: McpOptions<E, R>): Layer.Layer<never, never, HttpRouter.HttpRouter | HttpRouter.Request<"Error", unknown> | HttpRouter.Request<"Requires", import("@shivaedev/identity/server/SessionPolicy.ts").SessionPolicy> | Exclude<HttpRouter.Request.From<"Requires", Exclude<Exclude<Exclude<R, HttpRouter.HttpRouter>, Identity | SessionUser>, HttpRouter.Provided>>, import("effect/Scope").Scope>>;
|
|
20
18
|
//# sourceMappingURL=routes.d.ts.map
|
package/dist/routes.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAsB,MAAM,aAAa,CAAC;AAE7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAsB,MAAM,aAAa,CAAC;AAE7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAI7E,MAAM,WAAW,QAAQ,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK;IAC7C,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,UAAU,CAAC,CAAC,EAAE,CAAC;IAC/B,QAAQ,CAAC,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,QAAQ,CAAC,SAAS,EAAE,SAAS,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC;IACpC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CACzB;AAaD,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,gXAaxD"}
|
package/dist/routes.js
CHANGED
|
@@ -15,7 +15,7 @@ function rejection(error, metadataUrl) {
|
|
|
15
15
|
}
|
|
16
16
|
export function mcpRoutes(options) {
|
|
17
17
|
const server = requestServer(options);
|
|
18
|
-
return HttpRouter.use((router) => router.add("*", options.path, (request) => Effect.context().pipe(withSessionUser(
|
|
18
|
+
return HttpRouter.use((router) => router.add("*", options.path, (request) => Effect.context().pipe(withSessionUser(request.headers, request.url), Effect.matchEffect({
|
|
19
19
|
onFailure: (error) => Effect.succeed(rejection(error, options.resourceMetadataUrl)),
|
|
20
20
|
onSuccess: (context) => Effect.provideContext(server, context),
|
|
21
21
|
}))));
|
package/dist/routes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAc,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AAIrD,OAAO,
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAc,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AAIrD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAgBnD,SAAS,SAAS,CAAC,KAAiD,EAAE,WAAmB;IACxF,OAAO,kBAAkB,CAAC,KAAK,CAAC;QAC/B,OAAO,EAAE,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,UAAU,EAAE,kBAAkB,EAAE,6BAA6B,WAAW,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE;QAC9I,MAAM,EAAE;YACP,eAAe,EAAE,UAAU,CAAC,WAAW,CAAC,oBAAoB,CAAC;YAC7D,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,WAAW,CAAC;YAC9C,YAAY,EAAE,UAAU,CAAC,WAAW,CAAC,cAAc,CAAC;SACpD,CAAC,KAAK,CAAC,IAAI,CAAC;KACb,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,SAAS,CAAO,OAAyB;IACxD,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACtC,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAChC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CACzC,MAAM,CAAC,OAAO,EAA0B,CAAC,IAAI,CAC5C,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EAC7C,MAAM,CAAC,WAAW,CAAC;QAClB,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;QACnF,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC;KAC9D,CAAC,CACF,CACD,CACD,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/mcp",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "Identity-aware Effect MCP tools mounted on the application host",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -43,18 +43,18 @@
|
|
|
43
43
|
"README.md"
|
|
44
44
|
],
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"@shivaedev/access": "0.3.
|
|
47
|
-
"@shivaedev/errors": "0.
|
|
48
|
-
"@shivaedev/identity": "0.
|
|
46
|
+
"@shivaedev/access": "0.3.6",
|
|
47
|
+
"@shivaedev/errors": "0.5.0",
|
|
48
|
+
"@shivaedev/identity": "0.18.0"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@better-auth/oauth-provider": "1.7.12",
|
|
52
52
|
"@effect/platform-node": "4.0.6",
|
|
53
53
|
"@effect/sql-pg": "4.0.6",
|
|
54
|
-
"@shivaedev/quality": "0.
|
|
55
|
-
"@shivaedev/server": "0.
|
|
56
|
-
"@shivaedev/test-sql": "0.
|
|
57
|
-
"@shivaedev/test-story": "0.
|
|
54
|
+
"@shivaedev/quality": "0.55.0",
|
|
55
|
+
"@shivaedev/server": "0.18.0",
|
|
56
|
+
"@shivaedev/test-sql": "0.16.1",
|
|
57
|
+
"@shivaedev/test-story": "0.33.0",
|
|
58
58
|
"@types/node": "24.19.2",
|
|
59
59
|
"better-auth": "1.7.12",
|
|
60
60
|
"effect": "4.0.6",
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { type OAuthOptions, oauthProvider, oauthProviderAuthServerMetadata, type Scope } from "@better-auth/oauth-provider";
|
|
2
|
-
import { Effect, Option } from "effect";
|
|
2
|
+
import { Effect, Layer, Option } from "effect";
|
|
3
3
|
import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
4
4
|
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
5
5
|
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
6
6
|
import type { OriginPolicy } from "@shivaedev/identity/server/origin.ts";
|
|
7
|
-
import
|
|
7
|
+
import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
|
|
8
8
|
import { bearer, type JwksSource } from "./bearer.ts";
|
|
9
9
|
import { grantedUser, type OauthAuth, oauthGrants } from "./oauthGrants.ts";
|
|
10
10
|
|
|
@@ -19,6 +19,7 @@ export function mcpProvider({
|
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
export const betterAuthMcp = Effect.fn("Mcp.betterAuthMcp")(function* (options: {
|
|
22
|
+
readonly admitsUser: (userId: string) => Effect.Effect<boolean, AuthUnavailable>;
|
|
22
23
|
readonly auth: OauthAuth;
|
|
23
24
|
readonly resource: string;
|
|
24
25
|
readonly jwks?: JwksSource;
|
|
@@ -26,39 +27,45 @@ export const betterAuthMcp = Effect.fn("Mcp.betterAuthMcp")(function* (options:
|
|
|
26
27
|
readonly roles?: RoleSet;
|
|
27
28
|
}) {
|
|
28
29
|
const config = yield* Effect.tryPromise({
|
|
29
|
-
catch: () => new AuthUnavailable({ message: "OAuth provider configuration failed" }),
|
|
30
|
+
catch: (cause) => Object.assign(new AuthUnavailable({ message: "OAuth provider configuration failed" }), { cause }),
|
|
30
31
|
try: () => options.auth.api.getOAuthServerConfig(),
|
|
31
32
|
});
|
|
32
33
|
const { auth, resource } = options;
|
|
33
34
|
const url = new URL(resource);
|
|
34
35
|
const metadataPath = `/.well-known/oauth-protected-resource${url.pathname}` as const;
|
|
35
36
|
const resourceMetadataUrl = new URL(metadataPath, url).href;
|
|
37
|
+
const authorizationMetadataPath = `/.well-known/oauth-authorization-server${new URL(config.issuer).pathname.replace(/\/$/u, "")}` as const;
|
|
36
38
|
const verify = bearer(options.jwks ?? config.jwks_uri ?? new URL("/api/auth/jwks", url).href, resource, config.issuer);
|
|
37
|
-
const sessions
|
|
39
|
+
const sessions = Layer.succeed(SessionPolicy, {
|
|
38
40
|
origin: options.origin,
|
|
39
41
|
...(options.roles === undefined ? {} : { roles: options.roles }),
|
|
40
42
|
provider: {
|
|
41
43
|
get: (headers) =>
|
|
42
44
|
Effect.gen(function* () {
|
|
43
45
|
const authorization = headers.authorization;
|
|
44
|
-
const token = authorization?.
|
|
46
|
+
const token = authorization?.match(/^Bearer (?<token>.+)$/iu)?.groups?.token;
|
|
45
47
|
const claims = yield* verify(token);
|
|
46
48
|
if (Option.isNone(claims) || typeof claims.value.sub !== "string" || typeof claims.value.client_id !== "string") {
|
|
47
49
|
return Option.none();
|
|
48
50
|
}
|
|
49
51
|
const user = yield* grantedUser(auth, claims.value.sub, claims.value.client_id);
|
|
50
|
-
if (user === null) {
|
|
52
|
+
if (user === null || !(yield* options.admitsUser(user.id))) {
|
|
51
53
|
return Option.none();
|
|
52
54
|
}
|
|
53
55
|
const role: unknown = Reflect.get(user, "role");
|
|
54
56
|
return Option.some({ user: { email: user.email, id: user.id, name: user.name, ...(typeof role === "string" ? { role } : {}) } });
|
|
55
57
|
}),
|
|
56
58
|
},
|
|
57
|
-
};
|
|
59
|
+
});
|
|
58
60
|
const metadata = oauthProviderAuthServerMetadata(auth);
|
|
59
61
|
const authorizationMetadata = Effect.fn("Mcp.authorizationMetadata")(function* (request: HttpServerRequest.HttpServerRequest) {
|
|
60
62
|
const web = yield* HttpServerRequest.toWeb(request);
|
|
61
|
-
return HttpServerResponse.fromWeb(
|
|
63
|
+
return HttpServerResponse.fromWeb(
|
|
64
|
+
yield* Effect.tryPromise({
|
|
65
|
+
catch: (cause) => Object.assign(new AuthUnavailable({ message: "OAuth server metadata failed" }), { cause }),
|
|
66
|
+
try: () => metadata(web),
|
|
67
|
+
}),
|
|
68
|
+
);
|
|
62
69
|
});
|
|
63
70
|
const routes = HttpRouter.use((router) =>
|
|
64
71
|
Effect.gen(function* () {
|
|
@@ -67,7 +74,7 @@ export const betterAuthMcp = Effect.fn("Mcp.betterAuthMcp")(function* (options:
|
|
|
67
74
|
metadataPath,
|
|
68
75
|
HttpServerResponse.jsonUnsafe({ "authorization_servers": [config.issuer], resource, "scopes_supported": ["mcp"] }),
|
|
69
76
|
);
|
|
70
|
-
yield* router.add("GET",
|
|
77
|
+
yield* router.add("GET", authorizationMetadataPath, authorizationMetadata);
|
|
71
78
|
}),
|
|
72
79
|
);
|
|
73
80
|
return { ...oauthGrants(auth), resourceMetadataUrl, routes, sessions };
|
|
@@ -16,7 +16,7 @@ export interface OauthAuth {
|
|
|
16
16
|
export function oauthGrants(auth: OauthAuth) {
|
|
17
17
|
const revoke = Effect.fn("Mcp.revoke")(function* (userId: string, clientId?: string) {
|
|
18
18
|
yield* Effect.tryPromise({
|
|
19
|
-
catch: () => new AuthUnavailable({ message: "OAuth grant revocation failed" }),
|
|
19
|
+
catch: (cause) => Object.assign(new AuthUnavailable({ message: "OAuth grant revocation failed" }), { cause }),
|
|
20
20
|
try: async () => {
|
|
21
21
|
const { adapter } = await auth.$context;
|
|
22
22
|
const where = [{ field: "userId", value: userId }, ...(clientId === undefined ? [] : [{ field: "clientId", value: clientId }])];
|
|
@@ -36,7 +36,7 @@ export function oauthGrants(auth: OauthAuth) {
|
|
|
36
36
|
|
|
37
37
|
export const grantedUser = Effect.fn("Mcp.grantedUser")(function* (auth: OauthAuth, userId: string, clientId: string) {
|
|
38
38
|
return yield* Effect.tryPromise({
|
|
39
|
-
catch: () => new AuthUnavailable({ message: "OAuth grant lookup failed" }),
|
|
39
|
+
catch: (cause) => Object.assign(new AuthUnavailable({ message: "OAuth grant lookup failed" }), { cause }),
|
|
40
40
|
try: async () => {
|
|
41
41
|
const { adapter, internalAdapter } = await auth.$context;
|
|
42
42
|
const user = await internalAdapter.findUserById(userId);
|
package/src/requestServer.ts
CHANGED
|
@@ -3,10 +3,9 @@ import { McpProtocol, McpServer } from "effect/ai";
|
|
|
3
3
|
import { HttpRouter } from "effect/http";
|
|
4
4
|
import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
5
5
|
import { hasPermission } from "@shivaedev/identity/permission.ts";
|
|
6
|
-
import type { UserSessionShape } from "@shivaedev/identity/server/session.ts";
|
|
7
6
|
import type { McpOptions } from "./routes.ts";
|
|
8
7
|
|
|
9
|
-
export const requestServer = Effect.fn("Mcp.requestServer")(function* <
|
|
8
|
+
export const requestServer = Effect.fn("Mcp.requestServer")(function* <E, R>(options: McpOptions<E, R>) {
|
|
10
9
|
const user = yield* SessionUser;
|
|
11
10
|
const inner = yield* HttpRouter.make;
|
|
12
11
|
const transport = McpServer.layerHttpRequestScoped({ ...options, protocols: [McpProtocol.v2026_07_28] });
|
package/src/routes.ts
CHANGED
|
@@ -4,7 +4,7 @@ import * as HttpStatus from "effect/http/HttpStatus";
|
|
|
4
4
|
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
5
5
|
import type { AuthUnavailable, Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
6
6
|
import type { Identity, SessionUser } from "@shivaedev/identity/identity.ts";
|
|
7
|
-
import {
|
|
7
|
+
import { withSessionUser } from "@shivaedev/identity/server/session.ts";
|
|
8
8
|
import { requestServer } from "./requestServer.ts";
|
|
9
9
|
|
|
10
10
|
export interface Audience<E = never, R = never> {
|
|
@@ -12,13 +12,12 @@ export interface Audience<E = never, R = never> {
|
|
|
12
12
|
readonly tools: Layer.Layer<never, E, R>;
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
export interface McpOptions<
|
|
15
|
+
export interface McpOptions<E, R> {
|
|
16
16
|
readonly allowedOrigins?: readonly string[];
|
|
17
17
|
readonly audiences: readonly Audience<E, R>[];
|
|
18
18
|
readonly name: string;
|
|
19
19
|
readonly path: HttpRouter.PathInput;
|
|
20
20
|
readonly resourceMetadataUrl: string;
|
|
21
|
-
readonly sessions: SessionPolicy<TSession>;
|
|
22
21
|
readonly version: string;
|
|
23
22
|
}
|
|
24
23
|
|
|
@@ -33,12 +32,12 @@ function rejection(error: AuthUnavailable | Forbidden | Unauthorized, metadataUr
|
|
|
33
32
|
});
|
|
34
33
|
}
|
|
35
34
|
|
|
36
|
-
export function mcpRoutes<
|
|
35
|
+
export function mcpRoutes<E, R>(options: McpOptions<E, R>) {
|
|
37
36
|
const server = requestServer(options);
|
|
38
37
|
return HttpRouter.use((router) =>
|
|
39
38
|
router.add("*", options.path, (request) =>
|
|
40
39
|
Effect.context<Identity | SessionUser>().pipe(
|
|
41
|
-
withSessionUser(
|
|
40
|
+
withSessionUser(request.headers, request.url),
|
|
42
41
|
Effect.matchEffect({
|
|
43
42
|
onFailure: (error) => Effect.succeed(rejection(error, options.resourceMetadataUrl)),
|
|
44
43
|
onSuccess: (context) => Effect.provideContext(server, context),
|