fix return status code for bad requests

apollographql · Jun 3, 2024 · a9a0e30 · a9a0e30
1 parent ad1b1c9
commit a9a0e30
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/...-callback/src/main/java/com/apollographql/subscription/CallbackWebGraphQLInterceptor.java b/...-callback/src/main/java/com/apollographql/subscription/CallbackWebGraphQLInterceptor.java
@@ -15,6 +15,8 @@
 import org.springframework.graphql.server.WebGraphQlResponse;
 import org.springframework.graphql.server.WebSocketGraphQlRequest;
 import org.springframework.graphql.support.DefaultExecutionGraphQlResponse;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.server.ResponseStatusException;
 import reactor.core.publisher.Mono;
 
 /**
@@ -65,7 +67,7 @@ public Mono<WebGraphQlResponse> intercept(WebGraphQlRequest request, Chain chain
                 if (logger.isErrorEnabled()) {
                   logger.error("Unable to start subscription using callback protocol", error);
                 }
-                return Mono.just(errorCallbackResponse(request));
+                return Mono.error(new ResponseStatusException(HttpStatus.BAD_REQUEST));
               });
     } else {
       return chain.next(request);

diff --git a/...lback/src/test/java/com/apollographql/subscription/CallbackGraphQLHttpHandlerAbstrIT.java b/...lback/src/test/java/com/apollographql/subscription/CallbackGraphQLHttpHandlerAbstrIT.java
@@ -99,9 +99,7 @@ public void verifyMalformedCallbackInfo(WebTestClient testClient) {
         .bodyValue(graphQLRequest)
         .exchange()
         .expectStatus()
-        .is4xxClientError()
-        .expectBody()
-        .isEmpty();
+        .is4xxClientError();
   }
 
   public void verifyFailedCallbackInit(WebTestClient testClient) {
@@ -116,8 +114,6 @@ public void verifyFailedCallbackInit(WebTestClient testClient) {
         .bodyValue(graphQLRequest)
         .exchange()
         .expectStatus()
-        .is4xxClientError()
-        .expectBody()
-        .isEmpty();
+        .is4xxClientError();
   }
 }