Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

grpc-js: Ensure server interceptors work with builder utility classes #2696

Merged
merged 1 commit into from
Mar 26, 2024
Merged

grpc-js: Ensure server interceptors work with builder utility classes #2696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 17 additions & 3 deletions packages/grpc-js/src/server-interceptors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,12 @@ export class ServerInterceptingCall implements ServerInterceptingCallInterface {
private nextCall: ServerInterceptingCallInterface,
responder?: Responder
) {
this.responder = { ...defaultResponder, ...responder };
this.responder = {
start: responder?.start ?? defaultResponder.start,
sendMetadata: responder?.sendMetadata ?? defaultResponder.sendMetadata,
sendMessage: responder?.sendMessage ?? defaultResponder.sendMessage,
sendStatus: responder?.sendStatus ?? defaultResponder.sendStatus,
};
}

private processPendingMessage() {
Expand All @@ -369,8 +374,17 @@ export class ServerInterceptingCall implements ServerInterceptingCallInterface {
start(listener: InterceptingServerListener): void {
this.responder.start(interceptedListener => {
const fullInterceptedListener: FullServerListener = {
...defaultServerListener,
...interceptedListener,
onReceiveMetadata:
interceptedListener?.onReceiveMetadata ??
defaultServerListener.onReceiveMetadata,
onReceiveMessage:
interceptedListener?.onReceiveMessage ??
defaultServerListener.onReceiveMessage,
onReceiveHalfClose:
interceptedListener?.onReceiveHalfClose ??
defaultServerListener.onReceiveHalfClose,
onCancel:
interceptedListener?.onCancel ?? defaultServerListener.onCancel,
};
const finalInterceptingListener = new InterceptingServerListenerImpl(
fullInterceptedListener,
Expand Down
35 changes: 16 additions & 19 deletions packages/grpc-js/test/test-server-interceptors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,22 @@ const testAuthInterceptor: grpc.ServerInterceptor = (
methodDescriptor,
call
) => {
return new grpc.ServerInterceptingCall(call, {
start: next => {
const authListener: grpc.ServerListener = {
onReceiveMetadata: (metadata, mdNext) => {
if (
metadata.get(AUTH_HEADER_KEY)?.[0] !== AUTH_HEADER_ALLOWED_VALUE
) {
call.sendStatus({
code: grpc.status.UNAUTHENTICATED,
details: 'Auth metadata not correct',
});
} else {
mdNext(metadata);
}
},
};
next(authListener);
},
});
const authListener = (new grpc.ServerListenerBuilder())
.withOnReceiveMetadata((metadata, mdNext) => {
if (
metadata.get(AUTH_HEADER_KEY)?.[0] !== AUTH_HEADER_ALLOWED_VALUE
) {
call.sendStatus({
code: grpc.status.UNAUTHENTICATED,
details: 'Auth metadata not correct',
});
} else {
mdNext(metadata);
}
}).build();
const responder = (new grpc.ResponderBuilder())
.withStart(next => next(authListener)).build();
return new grpc.ServerInterceptingCall(call, responder);
};

let eventCounts = {
Expand Down