Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/server/express/a2a_express_app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ export class A2AExpressApp {
private requestHandler: A2ARequestHandler;
private userBuilder?: UserBuilder;

constructor(requestHandler: A2ARequestHandler, userBuilder?: UserBuilder) {
constructor(
requestHandler: A2ARequestHandler,
userBuilder: UserBuilder = UserBuilder.NoAuthentication
) {
this.requestHandler = requestHandler;
this.userBuilder = userBuilder;
}
Expand Down
6 changes: 5 additions & 1 deletion src/server/express/common.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { Request } from 'express';
import { User } from '../authentication/user.js';
import { UnauthenticatedUser, User } from '../authentication/user.js';

export type UserBuilder = (req: Request) => Promise<User>;

export const UserBuilder = {
NoAuthentication: () => Promise.resolve(new UnauthenticatedUser()),
};
2 changes: 1 addition & 1 deletion src/server/express/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
*/

export { A2AExpressApp } from './a2a_express_app.js';
export type { UserBuilder } from './common.js';
export { UserBuilder } from './common.js';
4 changes: 2 additions & 2 deletions src/server/express/json_rpc_handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { UserBuilder } from './common.js';

export interface JsonRpcHandlerOptions {
requestHandler: A2ARequestHandler;
userBuilder?: UserBuilder;
userBuilder: UserBuilder;
}

/**
Expand All @@ -37,7 +37,7 @@ export function jsonRpcHandler(options: JsonRpcHandlerOptions): RequestHandler {

router.post('/', async (req: Request, res: Response) => {
try {
const user = await options.userBuilder?.(req);
const user = await options.userBuilder(req);
const context = new ServerCallContext(
getRequestedExtensions(req.header(HTTP_EXTENSION_HEADER)),
user ?? new UnauthenticatedUser()
Expand Down