Include AuthInfo from bearer validation in transport request handler
This commit is contained in:
parent
66e1508162
commit
af025e26a7
2 changed files with 22 additions and 10 deletions
|
|
@ -19,6 +19,7 @@ import {
|
|||
ServerCapabilities,
|
||||
} from "../types.js";
|
||||
import { Transport } from "./transport.js";
|
||||
import { AuthInfo } from "../server/auth/types.js";
|
||||
|
||||
/**
|
||||
* Callback for progress notifications.
|
||||
|
|
@ -88,6 +89,11 @@ export type RequestHandlerExtra = {
|
|||
* An abort signal used to communicate if the request was cancelled from the sender's side.
|
||||
*/
|
||||
signal: AbortSignal;
|
||||
|
||||
/**
|
||||
* Information about a validated access token, provided to request handlers.
|
||||
*/
|
||||
authInfo?: AuthInfo;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -232,11 +238,11 @@ export abstract class Protocol<
|
|||
this._onerror(error);
|
||||
};
|
||||
|
||||
this._transport.onmessage = (message) => {
|
||||
this._transport.onmessage = (message, authInfo) => {
|
||||
if (!("method" in message)) {
|
||||
this._onresponse(message);
|
||||
} else if ("id" in message) {
|
||||
this._onrequest(message);
|
||||
this._onrequest(message, authInfo);
|
||||
} else {
|
||||
this._onnotification(message);
|
||||
}
|
||||
|
|
@ -282,7 +288,7 @@ export abstract class Protocol<
|
|||
);
|
||||
}
|
||||
|
||||
private _onrequest(request: JSONRPCRequest): void {
|
||||
private _onrequest(request: JSONRPCRequest, authInfo?: AuthInfo): void {
|
||||
const handler =
|
||||
this._requestHandlers.get(request.method) ?? this.fallbackRequestHandler;
|
||||
|
||||
|
|
@ -309,7 +315,7 @@ export abstract class Protocol<
|
|||
|
||||
// Starting with Promise.resolve() puts any synchronous errors into the monad as well.
|
||||
Promise.resolve()
|
||||
.then(() => handler(request, { signal: abortController.signal }))
|
||||
.then(() => handler(request, { signal: abortController.signal, authInfo }))
|
||||
.then(
|
||||
(result) => {
|
||||
if (abortController.signal.aborted) {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
import { AuthInfo } from "../server/auth/types.js";
|
||||
import { JSONRPCMessage } from "../types.js";
|
||||
|
||||
/**
|
||||
|
|
@ -39,6 +40,9 @@ export interface Transport {
|
|||
|
||||
/**
|
||||
* Callback for when a message (request or response) is received over the connection.
|
||||
*
|
||||
* Includes the authInfo if the transport is authenticated.
|
||||
*
|
||||
*/
|
||||
onmessage?: (message: JSONRPCMessage) => void;
|
||||
onmessage?: (message: JSONRPCMessage, authInfo?: AuthInfo) => void;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue