@shivaedev/mcp 0.5.0 → 0.6.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 CHANGED
@@ -1,5 +1,22 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.6.0 - 2026-11-03
4
+
5
+ ### Added
6
+
7
+ - Expose `authenticate` from `betterAuthMcp` so applications can distinguish an `InvalidTokenClaim` failure, with its claim name, from a refused OAuth grant. Missing or malformed required claims produce a claim diagnostic; MCP HTTP requests keep their unauthorized resource challenge.
8
+
9
+ ### Fixed
10
+
11
+ - Admit a member's MCP client once their temporary ban expires, including before they sign in on the web again.
12
+ - Revoked MCP tokens stay refused after new consent. Removing `mcp` from a live grant’s scopes refuses its tokens on the next request.
13
+
14
+ ### Breaking
15
+
16
+ - The MCP OAuth session policy refuses requests carrying a Cookie header, including those with a valid bearer token. Send MCP bearer credentials without cookies; keep browser cookies on cookie-authenticated RPC routes.
17
+ - The exported `bearer` verifier now fails with `InvalidTokenClaim` for missing or invalid claims instead of returning `Option.none()`. Consumers of this verifier must handle the typed failure and can read its `claim` field. The session Layer continues to answer these tokens with the unauthorized resource challenge.
18
+ - MCP tokens now carry a `grant_id` that references the exact Better Auth `oauthConsent` row. Tokens issued before this change lack that reference and are refused; clients must authorize again to obtain new access tokens. Existing refresh tokens can obtain grant-bound access tokens while their consent remains live.
19
+
3
20
  ## 0.5.0 - 2026-11-02
4
21
 
5
22
  ### Breaking
package/README.md CHANGED
@@ -123,7 +123,13 @@ const application = Effect.gen(function* () {
123
123
 
124
124
  `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.
125
125
 
126
- The edge adapter verifies access-token signatures, issuer, endpoint audience and `mcp` scope, then asks identity's `OauthGrants` service to resolve the subject. The identity Better Auth Layer loads the current user and consent and checks `mounted.admitsUser` afresh on every request. 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.
126
+ The edge adapter verifies access-token signatures, issuer, endpoint audience, `mcp` scope and the `grant_id` reference, then asks identity’s `OauthGrants` service to resolve that exact grant. The identity Better Auth Layer loads the current user and referenced consent, requires `mcp` in the consent’s current scopes and checks `mounted.admitsUser` afresh on every request. 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 the referenced 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. The OAuth session policy refuses requests carrying a Cookie header, including requests that also carry a valid bearer token. Provide the OAuth policy Layer to the MCP routes before merging them with a cookie-authenticated host.
127
+
128
+ ### Diagnose token refusals
129
+
130
+ `betterAuthMcp` returns `authenticate(token)` alongside its route and session Layers. It verifies the token and resolves its current OAuth grant. A successful authentication returns `Option.some({ user })`; a refused grant returns `Option.none()`. Missing or malformed `iss`, `aud`, `sub`, `client_id` or `scope` claims fail with `InvalidTokenClaim` from `@shivaedev/mcp/adapters/InvalidTokenClaim.ts`. The failure names `claim`, and the adapter logs a warning with that name. Claims and token values stay out of this diagnostic. Blank subjects and client identifiers are invalid too.
131
+
132
+ Use `authenticate` in application stories to distinguish invalid claims from refused grants. HTTP sessions translate `InvalidTokenClaim` into the ordinary `401` resource challenge. A token with an invalid signature still receives that challenge; verification infrastructure failures remain `AuthUnavailable` and answer `503`.
127
133
 
128
134
  ### Manage client grants
129
135
 
@@ -154,6 +160,6 @@ pnpm add @shivaedev/mcp effect
154
160
  pnpm add better-auth @better-auth/oauth-provider
155
161
  ```
156
162
 
157
- Better Auth is an optional peer of MCP. Identity owns the optional `@better-auth/oauth-provider` peer and its edge exports; MCP's Better Auth adapter uses those exports for provider configuration and discovery. 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
+ Better Auth is an optional peer of MCP. Identity owns the optional `@better-auth/oauth-provider` peer and its edge exports; MCP's Better Auth adapter uses those exports for provider configuration and discovery. Core `routes.ts` reads identity's `SessionPolicy` from the Effect environment with the same identity and permission semantics; it runs without either OAuth peer installed. Provide the adapter's `sessions` Layer once through the host, or supply another `SessionPolicy` Layer.
158
164
 
159
- 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.
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. For browser clients, both the session policy's `origin` and the route's `allowedOrigins` must accept the Origin; non-browser clients can omit Origin when the session policy allows it.
@@ -0,0 +1,10 @@
1
+ declare const InvalidTokenClaim_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
2
+ readonly _tag: "InvalidTokenClaim";
3
+ } & Readonly<A>;
4
+ export declare class InvalidTokenClaim extends InvalidTokenClaim_base<{
5
+ readonly claim: string;
6
+ }> {
7
+ get message(): string;
8
+ }
9
+ export {};
10
+ //# sourceMappingURL=InvalidTokenClaim.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"InvalidTokenClaim.d.ts","sourceRoot":"","sources":["../../src/adapters/InvalidTokenClaim.ts"],"names":[],"mappings":";;;AAEA,qBAAa,iBAAkB,SAAQ,uBAAsC;IAC5E,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB,CAAC;IACD,IAAa,OAAO,WAEnB;CACD"}
@@ -0,0 +1,7 @@
1
+ import { Data } from "effect";
2
+ export class InvalidTokenClaim extends Data.TaggedError("InvalidTokenClaim") {
3
+ get message() {
4
+ return `MCP access token has a missing or invalid ${this.claim} claim`;
5
+ }
6
+ }
7
+ //# sourceMappingURL=InvalidTokenClaim.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"InvalidTokenClaim.js","sourceRoot":"","sources":["../../src/adapters/InvalidTokenClaim.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,MAAM,OAAO,iBAAkB,SAAQ,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAEzE;IACD,IAAa,OAAO;QACnB,OAAO,6CAA6C,IAAI,CAAC,KAAK,QAAQ,CAAC;IACxE,CAAC;CACD"}
@@ -1,6 +1,17 @@
1
1
  import { verifyJwsAccessToken } from "better-auth/oauth2";
2
2
  import { Effect, Option } from "effect";
3
3
  import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
4
+ import { InvalidTokenClaim } from "./InvalidTokenClaim.ts";
4
5
  export type JwksSource = Parameters<typeof verifyJwsAccessToken>[1]["jwksFetch"];
5
- export declare function bearer(jwks: JwksSource, audience: string, issuer: string): (token: string | undefined) => Effect.Effect<Option.Option<never> | Option.Option<import("better-auth").JWTPayload>, AuthUnavailable, never>;
6
+ export declare function bearer(jwks: JwksSource, audience: string, issuer: string): (token: string | undefined) => Effect.Effect<Option.Option<never> | Option.Option<{
7
+ iss?: string;
8
+ aud?: string | string[];
9
+ jti?: string;
10
+ nbf?: number;
11
+ exp?: number;
12
+ iat?: number;
13
+ client_id: string;
14
+ grant_id: string;
15
+ sub: string;
16
+ }>, AuthUnavailable | InvalidTokenClaim, never>;
6
17
  //# sourceMappingURL=bearer.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"bearer.d.ts","sourceRoot":"","sources":["../../src/adapters/bearer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;AAyBjF,wBAAgB,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,WACzD,MAAM,GAAG,SAAS,mHAejC"}
1
+ {"version":3,"file":"bearer.d.ts","sourceRoot":"","sources":["../../src/adapters/bearer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;AA0CjF,wBAAgB,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,WACzD,MAAM,GAAG,SAAS;;;;;;;;;;gDAqBjC"}
@@ -1,8 +1,9 @@
1
- import { APIError, isAPIError } from "better-auth/api";
1
+ import { isAPIError } from "better-auth/api";
2
2
  import { verifyJwsAccessToken } from "better-auth/oauth2";
3
3
  import { Effect, Option } from "effect";
4
4
  import { redact } from "@shivaedev/errors/redact.ts";
5
5
  import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
6
+ import { InvalidTokenClaim } from "./InvalidTokenClaim.js";
6
7
  const INVALID_TOKEN_ERRORS = new Set([
7
8
  "ERR_JWT_EXPIRED",
8
9
  "ERR_JWT_CLAIM_VALIDATION_FAILED",
@@ -14,12 +15,26 @@ const INVALID_TOKEN_ERRORS = new Set([
14
15
  "ERR_JOSE_NOT_SUPPORTED",
15
16
  ]);
16
17
  function bearerFailure(cause) {
18
+ const claim = cause instanceof Error ? Reflect.get(cause, "claim") : undefined;
19
+ if (cause instanceof InvalidTokenClaim
20
+ || (cause instanceof Error
21
+ && ["ERR_JWT_CLAIM_VALIDATION_FAILED", "ERR_JWT_EXPIRED"].includes(String(Reflect.get(cause, "code")))
22
+ && typeof claim === "string")) {
23
+ const failure = cause instanceof InvalidTokenClaim ? cause : new InvalidTokenClaim({ claim });
24
+ return Effect.logWarning(failure.message).pipe(Effect.andThen(Effect.fail(failure)));
25
+ }
17
26
  if ((isAPIError(cause) && (cause.status === "UNAUTHORIZED" || cause.status === "FORBIDDEN"))
18
27
  || (cause instanceof Error && INVALID_TOKEN_ERRORS.has(String(Reflect.get(cause, "code"))))) {
19
28
  return Effect.succeed(Option.none());
20
29
  }
21
30
  return Effect.logError("MCP authentication verification failed", redact(cause)).pipe(Effect.andThen(Effect.fail(new AuthUnavailable({ message: "Authentication is temporarily unavailable" }))));
22
31
  }
32
+ function requiredClaim(value, claim) {
33
+ if (typeof value !== "string" || value.trim() === "") {
34
+ throw new InvalidTokenClaim({ claim });
35
+ }
36
+ return value;
37
+ }
23
38
  export function bearer(jwks, audience, issuer) {
24
39
  return (token) => {
25
40
  if (!token) {
@@ -27,10 +42,16 @@ export function bearer(jwks, audience, issuer) {
27
42
  }
28
43
  return Effect.tryPromise(async () => {
29
44
  const claims = await verifyJwsAccessToken(token, { jwksFetch: jwks, verifyOptions: { audience, issuer } });
30
- if (typeof claims.scope !== "string" || !claims.scope.split(" ").includes("mcp") || claims.cnf !== undefined) {
31
- throw new APIError("UNAUTHORIZED");
45
+ const sub = requiredClaim(claims.sub, "sub");
46
+ const clientId = requiredClaim(claims.client_id, "client_id");
47
+ const grantId = requiredClaim(claims.grant_id, "grant_id");
48
+ if (typeof claims.scope !== "string" || !claims.scope.split(" ").includes("mcp")) {
49
+ throw new InvalidTokenClaim({ claim: "scope" });
50
+ }
51
+ if (claims.cnf !== undefined) {
52
+ throw new InvalidTokenClaim({ claim: "cnf" });
32
53
  }
33
- return claims;
54
+ return { ...claims, "client_id": clientId, "grant_id": grantId, sub };
34
55
  }).pipe(Effect.map(Option.some), Effect.catch(({ cause }) => bearerFailure(cause)));
35
56
  };
36
57
  }
@@ -1 +1 @@
1
- {"version":3,"file":"bearer.js","sourceRoot":"","sources":["../../src/adapters/bearer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAIhE,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC;IACpC,iBAAiB;IACjB,iCAAiC;IACjC,iBAAiB;IACjB,iBAAiB;IACjB,uCAAuC;IACvC,0BAA0B;IAC1B,0BAA0B;IAC1B,wBAAwB;CACxB,CAAC,CAAC;AAEH,SAAS,aAAa,CAAC,KAAc;IACpC,IACC,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,cAAc,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC;WACrF,CAAC,KAAK,YAAY,KAAK,IAAI,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAC1F,CAAC;QACF,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,MAAM,CAAC,QAAQ,CAAC,wCAAwC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CACnF,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,2CAA2C,EAAE,CAAC,CAAC,CAAC,CAC1G,CAAC;AACH,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,IAAgB,EAAE,QAAgB,EAAE,MAAc;IACxE,OAAO,CAAC,KAAyB,EAAE,EAAE;QACpC,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,IAAI,EAAE;YACnC,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YAC3G,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;gBAC9G,MAAM,IAAI,QAAQ,CAAC,cAAc,CAAC,CAAC;YACpC,CAAC;YACD,OAAO,MAAM,CAAC;QACf,CAAC,CAAC,CAAC,IAAI,CACN,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EACvB,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CACjD,CAAC;IACH,CAAC,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"bearer.js","sourceRoot":"","sources":["../../src/adapters/bearer.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { Effect, Layer } from "effect";
1
+ import { Effect, Layer, Option } from "effect";
2
2
  import { HttpRouter } from "effect/http";
3
3
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
4
4
  import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
@@ -22,6 +22,29 @@ export declare const betterAuthMcp: (options: {
22
22
  readonly origin: OriginPolicy;
23
23
  readonly roles?: RoleSet;
24
24
  }) => Effect.Effect<{
25
+ authenticate: (token: string | undefined) => Effect.Effect<Option.None<{
26
+ user: {
27
+ readonly email: string;
28
+ readonly id: string;
29
+ readonly name: string;
30
+ readonly permissions?: readonly {
31
+ readonly name: string;
32
+ readonly strength: "any" | "own";
33
+ }[];
34
+ readonly role?: string | null | undefined;
35
+ };
36
+ }> | Option.Some<{
37
+ user: {
38
+ readonly email: string;
39
+ readonly id: string;
40
+ readonly name: string;
41
+ readonly permissions?: readonly {
42
+ readonly name: string;
43
+ readonly strength: "any" | "own";
44
+ }[];
45
+ readonly role?: string | null | undefined;
46
+ };
47
+ }>, AuthUnavailable | import("./InvalidTokenClaim.ts").InvalidTokenClaim, never>;
25
48
  resourceMetadataUrl: string;
26
49
  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 & {
27
50
  cause: unknown;
@@ -1 +1 @@
1
- {"version":3,"file":"betterAuth.d.ts","sourceRoot":"","sources":["../../src/adapters/betterAuth.ts"],"names":[],"mappings":"AAAA,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,EACN,uBAAuB,EACvB,KAAK,oBAAoB,EAEzB,MAAM,kEAAkE,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AACxE,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;AAEtD,wBAAgB,WAAW,CAAC,EAAE,MAAgB,EAAE,GAAG,OAAO,EAAE,EAAE,oBAAoB,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAE9H;AAED,eAAO,MAAM,aAAa;mBACV;QACd,QAAQ,CAAC,GAAG,EAAE;YAAE,QAAQ,CAAC,sBAAsB,EAAE,MAAM,OAAO,CAAC;gBAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;SAAE,CAAC;KAC5H;uBACkB,MAAM;oBACT,UAAU;qBACT,YAAY;qBACZ,OAAO;;;;;;;;;eA6CvB,CAAC"}
1
+ {"version":3,"file":"betterAuth.d.ts","sourceRoot":"","sources":["../../src/adapters/betterAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,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,EACN,uBAAuB,EACvB,KAAK,oBAAoB,EAEzB,MAAM,kEAAkE,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AACxE,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;AAEtD,wBAAgB,WAAW,CAAC,EAAE,MAAgB,EAAE,GAAG,OAAO,EAAE,EAAE,oBAAoB,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAE9H;AAED,eAAO,MAAM,aAAa;mBACV;QACd,QAAQ,CAAC,GAAG,EAAE;YAAE,QAAQ,CAAC,sBAAsB,EAAE,MAAM,OAAO,CAAC;gBAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;SAAE,CAAC;KAC5H;uBACkB,MAAM;oBACT,UAAU;qBACT,YAAY;qBACZ,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAgDvB,CAAC"}
@@ -20,20 +20,21 @@ export const betterAuthMcp = Effect.fn("Mcp.betterAuthMcp")(function* (options)
20
20
  const resourceMetadataUrl = new URL(metadataPath, url).href;
21
21
  const authorizationMetadataPath = `/.well-known/oauth-authorization-server${new URL(config.issuer).pathname.replace(/\/$/u, "")}`;
22
22
  const verify = bearer(options.jwks ?? config.jwks_uri ?? new URL("/api/auth/jwks", url).href, resource, config.issuer);
23
+ const authenticate = Effect.fn("Mcp.authenticate")(function* (token) {
24
+ const claims = yield* verify(token);
25
+ if (Option.isNone(claims)) {
26
+ return Option.none();
27
+ }
28
+ const grant = yield* grants.resolveGrant(claims.value.grant_id, claims.value.sub, claims.value.client_id);
29
+ return Option.filter(grant, (live) => live.scopes.includes("mcp")).pipe(Option.map(({ user }) => ({ user })));
30
+ });
23
31
  const sessions = Layer.succeed(SessionPolicy, {
24
32
  origin: options.origin,
25
33
  ...(options.roles === undefined ? {} : { roles: options.roles }),
26
34
  provider: {
27
- get: (headers) => Effect.gen(function* () {
28
- const authorization = headers.authorization;
29
- const token = authorization?.match(/^Bearer (?<token>.+)$/iu)?.groups?.token;
30
- const claims = yield* verify(token);
31
- if (Option.isNone(claims) || typeof claims.value.sub !== "string" || typeof claims.value.client_id !== "string") {
32
- return Option.none();
33
- }
34
- const subject = yield* grants.resolveSubject(claims.value.sub, claims.value.client_id);
35
- return Option.map(subject, (user) => ({ user }));
36
- }),
35
+ get: (headers) => headers.cookie === undefined
36
+ ? authenticate(headers.authorization?.match(/^Bearer (?<token>.+)$/iu)?.groups?.token).pipe(Effect.catchTag("InvalidTokenClaim", () => Effect.succeed(Option.none())))
37
+ : Effect.succeed(Option.none()),
37
38
  },
38
39
  });
39
40
  const authorizationMetadata = Effect.fn("Mcp.authorizationMetadata")(function* (request) {
@@ -44,6 +45,6 @@ export const betterAuthMcp = Effect.fn("Mcp.betterAuthMcp")(function* (options)
44
45
  yield* router.add("GET", metadataPath, HttpServerResponse.jsonUnsafe({ "authorization_servers": [config.issuer], resource, "scopes_supported": ["mcp"] }));
45
46
  yield* router.add("GET", authorizationMetadataPath, authorizationMetadata);
46
47
  }));
47
- return { resourceMetadataUrl, routes, sessions };
48
+ return { authenticate, resourceMetadataUrl, routes, sessions };
48
49
  });
49
50
  //# sourceMappingURL=betterAuth.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"betterAuth.js","sourceRoot":"","sources":["../../src/adapters/betterAuth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"betterAuth.js","sourceRoot":"","sources":["../../src/adapters/betterAuth.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/mcp",
3
- "version": "0.5.0",
3
+ "version": "0.6.0",
4
4
  "description": "Identity-aware Effect MCP tools mounted on the application host",
5
5
  "keywords": [
6
6
  "effect"
@@ -43,26 +43,26 @@
43
43
  "README.md"
44
44
  ],
45
45
  "dependencies": {
46
- "@shivaedev/access": "0.3.6",
47
- "@shivaedev/errors": "0.5.0",
48
- "@shivaedev/identity": "0.19.0"
46
+ "@shivaedev/access": "0.4.0",
47
+ "@shivaedev/errors": "0.6.0",
48
+ "@shivaedev/identity": "0.20.0"
49
49
  },
50
50
  "devDependencies": {
51
51
  "@effect/platform-node": "4.0.6",
52
52
  "@effect/sql-pg": "4.0.6",
53
- "@shivaedev/quality": "0.56.0",
54
- "@shivaedev/rate-limit": "0.2.1",
55
- "@shivaedev/server": "0.19.0",
56
- "@shivaedev/test-sql": "0.16.2",
57
- "@shivaedev/test-story": "0.34.0",
53
+ "@shivaedev/quality": "0.57.0",
54
+ "@shivaedev/rate-limit": "0.3.0",
55
+ "@shivaedev/server": "0.20.0",
56
+ "@shivaedev/test-sql": "0.17.0",
57
+ "@shivaedev/test-story": "0.35.0",
58
58
  "@types/node": "24.19.2",
59
- "better-auth": "1.7.12",
59
+ "better-auth": "1.7.14",
60
60
  "effect": "4.0.6",
61
61
  "typescript": "7.0.2",
62
62
  "vitest": "5.0.5"
63
63
  },
64
64
  "peerDependencies": {
65
- "better-auth": "1.7.12",
65
+ "better-auth": "1.7.14",
66
66
  "effect": "4.0.6"
67
67
  },
68
68
  "peerDependenciesMeta": {
@@ -0,0 +1,9 @@
1
+ import { Data } from "effect";
2
+
3
+ export class InvalidTokenClaim extends Data.TaggedError("InvalidTokenClaim")<{
4
+ readonly claim: string;
5
+ }> {
6
+ override get message() {
7
+ return `MCP access token has a missing or invalid ${this.claim} claim`;
8
+ }
9
+ }
@@ -1,8 +1,9 @@
1
- import { APIError, isAPIError } from "better-auth/api";
1
+ import { isAPIError } from "better-auth/api";
2
2
  import { verifyJwsAccessToken } from "better-auth/oauth2";
3
3
  import { Effect, Option } from "effect";
4
4
  import { redact } from "@shivaedev/errors/redact.ts";
5
5
  import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
6
+ import { InvalidTokenClaim } from "./InvalidTokenClaim.ts";
6
7
 
7
8
  export type JwksSource = Parameters<typeof verifyJwsAccessToken>[1]["jwksFetch"];
8
9
 
@@ -17,7 +18,17 @@ const INVALID_TOKEN_ERRORS = new Set([
17
18
  "ERR_JOSE_NOT_SUPPORTED",
18
19
  ]);
19
20
 
20
- function bearerFailure(cause: unknown) {
21
+ function bearerFailure(cause: unknown): Effect.Effect<Option.Option<never>, AuthUnavailable | InvalidTokenClaim> {
22
+ const claim = cause instanceof Error ? Reflect.get(cause, "claim") : undefined;
23
+ if (
24
+ cause instanceof InvalidTokenClaim
25
+ || (cause instanceof Error
26
+ && ["ERR_JWT_CLAIM_VALIDATION_FAILED", "ERR_JWT_EXPIRED"].includes(String(Reflect.get(cause, "code")))
27
+ && typeof claim === "string")
28
+ ) {
29
+ const failure = cause instanceof InvalidTokenClaim ? cause : new InvalidTokenClaim({ claim });
30
+ return Effect.logWarning(failure.message).pipe(Effect.andThen(Effect.fail(failure)));
31
+ }
21
32
  if (
22
33
  (isAPIError(cause) && (cause.status === "UNAUTHORIZED" || cause.status === "FORBIDDEN"))
23
34
  || (cause instanceof Error && INVALID_TOKEN_ERRORS.has(String(Reflect.get(cause, "code"))))
@@ -29,6 +40,13 @@ function bearerFailure(cause: unknown) {
29
40
  );
30
41
  }
31
42
 
43
+ function requiredClaim(value: unknown, claim: string) {
44
+ if (typeof value !== "string" || value.trim() === "") {
45
+ throw new InvalidTokenClaim({ claim });
46
+ }
47
+ return value;
48
+ }
49
+
32
50
  export function bearer(jwks: JwksSource, audience: string, issuer: string) {
33
51
  return (token: string | undefined) => {
34
52
  if (!token) {
@@ -36,10 +54,16 @@ export function bearer(jwks: JwksSource, audience: string, issuer: string) {
36
54
  }
37
55
  return Effect.tryPromise(async () => {
38
56
  const claims = await verifyJwsAccessToken(token, { jwksFetch: jwks, verifyOptions: { audience, issuer } });
39
- if (typeof claims.scope !== "string" || !claims.scope.split(" ").includes("mcp") || claims.cnf !== undefined) {
40
- throw new APIError("UNAUTHORIZED");
57
+ const sub = requiredClaim(claims.sub, "sub");
58
+ const clientId = requiredClaim(claims.client_id, "client_id");
59
+ const grantId = requiredClaim(claims.grant_id, "grant_id");
60
+ if (typeof claims.scope !== "string" || !claims.scope.split(" ").includes("mcp")) {
61
+ throw new InvalidTokenClaim({ claim: "scope" });
62
+ }
63
+ if (claims.cnf !== undefined) {
64
+ throw new InvalidTokenClaim({ claim: "cnf" });
41
65
  }
42
- return claims;
66
+ return { ...claims, "client_id": clientId, "grant_id": grantId, sub };
43
67
  }).pipe(
44
68
  Effect.map(Option.some),
45
69
  Effect.catch(({ cause }) => bearerFailure(cause)),
@@ -36,21 +36,24 @@ export const betterAuthMcp = Effect.fn("Mcp.betterAuthMcp")(function* (options:
36
36
  const resourceMetadataUrl = new URL(metadataPath, url).href;
37
37
  const authorizationMetadataPath = `/.well-known/oauth-authorization-server${new URL(config.issuer).pathname.replace(/\/$/u, "")}` as const;
38
38
  const verify = bearer(options.jwks ?? config.jwks_uri ?? new URL("/api/auth/jwks", url).href, resource, config.issuer);
39
+ const authenticate = Effect.fn("Mcp.authenticate")(function* (token: string | undefined) {
40
+ const claims = yield* verify(token);
41
+ if (Option.isNone(claims)) {
42
+ return Option.none();
43
+ }
44
+ const grant = yield* grants.resolveGrant(claims.value.grant_id, claims.value.sub, claims.value.client_id);
45
+ return Option.filter(grant, (live) => live.scopes.includes("mcp")).pipe(Option.map(({ user }) => ({ user })));
46
+ });
39
47
  const sessions = Layer.succeed(SessionPolicy, {
40
48
  origin: options.origin,
41
49
  ...(options.roles === undefined ? {} : { roles: options.roles }),
42
50
  provider: {
43
51
  get: (headers) =>
44
- Effect.gen(function* () {
45
- const authorization = headers.authorization;
46
- const token = authorization?.match(/^Bearer (?<token>.+)$/iu)?.groups?.token;
47
- const claims = yield* verify(token);
48
- if (Option.isNone(claims) || typeof claims.value.sub !== "string" || typeof claims.value.client_id !== "string") {
49
- return Option.none();
50
- }
51
- const subject = yield* grants.resolveSubject(claims.value.sub, claims.value.client_id);
52
- return Option.map(subject, (user) => ({ user }));
53
- }),
52
+ headers.cookie === undefined
53
+ ? authenticate(headers.authorization?.match(/^Bearer (?<token>.+)$/iu)?.groups?.token).pipe(
54
+ Effect.catchTag("InvalidTokenClaim", () => Effect.succeed(Option.none())),
55
+ )
56
+ : Effect.succeed(Option.none()),
54
57
  },
55
58
  });
56
59
  const authorizationMetadata = Effect.fn("Mcp.authorizationMetadata")(function* (request: HttpServerRequest.HttpServerRequest) {
@@ -67,5 +70,5 @@ export const betterAuthMcp = Effect.fn("Mcp.betterAuthMcp")(function* (options:
67
70
  yield* router.add("GET", authorizationMetadataPath, authorizationMetadata);
68
71
  }),
69
72
  );
70
- return { resourceMetadataUrl, routes, sessions };
73
+ return { authenticate, resourceMetadataUrl, routes, sessions };
71
74
  });