From a7cf5b6d558a63191c6529bec8cc14f6bd430352 Mon Sep 17 00:00:00 2001
From: Andreas Marek <andimarek@fastmail.fm>
Date: Tue, 15 Sep 2020 03:14:26 +1000
Subject: [PATCH] pass params to interceptor

---
 .../springframework/graphql/GraphQLHandler.java    | 14 +++++++++-----
 .../graphql/GraphQLInterceptor.java                | 14 +++++++++++---
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLHandler.java b/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLHandler.java
index 29532830..349eb15e 100644
--- a/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLHandler.java
+++ b/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLHandler.java
@@ -4,6 +4,7 @@ import graphql.ExecutionInput;
 import graphql.ExecutionResult;
 import graphql.GraphQL;
 import org.springframework.http.HttpHeaders;
+import org.springframework.util.MultiValueMap;
 import reactor.core.publisher.Mono;
 
 import java.util.List;
@@ -26,14 +27,17 @@ public class GraphQLHandler {
                 .operationName(graphQLHttpRequest.getOperationName())
                 .variables(graphQLHttpRequest.getVariables())
                 .build();
-        Mono<ExecutionInput> executionInput = interceptor.preHandle(input, graphQLHttpRequest.getHttpHeaders());
+        MultiValueMap<String, String> requestParams = graphQLHttpRequest.getRequestParams();
+        Mono<ExecutionInput> executionInput = interceptor.preHandle(input,
+                graphQLHttpRequest.getHttpHeaders(),
+                requestParams);
         return executionInput
                 .flatMap(this::execute)
-                .flatMap(result -> interceptor.postHandle(result, graphQLHttpRequest.getHttpHeaders()))
-                .flatMap(result -> toResponseBody(result, graphQLHttpRequest.getHttpHeaders()));
+                .flatMap(result -> interceptor.postHandle(result, graphQLHttpRequest.getHttpHeaders(), requestParams))
+                .flatMap(result -> toResponseBody(result, graphQLHttpRequest.getHttpHeaders(), requestParams));
     }
 
-    private Mono<GraphQLHttpResponse> toResponseBody(ExecutionResult executionResult, HttpHeaders httpHeaders) {
+    private Mono<GraphQLHttpResponse> toResponseBody(ExecutionResult executionResult, HttpHeaders httpHeaders, MultiValueMap<String, String> requestParams) {
         Map<String, Object> responseBodyRaw = executionResult.toSpecification();
         Object data = responseBodyRaw.get("data");
         List<Map<String, Object>> errors = (List<Map<String, Object>>) responseBodyRaw.get("errors");
@@ -41,7 +45,7 @@ public class GraphQLHandler {
         GraphQLHttpResponse responseBody = new GraphQLHttpResponse(data,
                 errors,
                 extensions, httpHeaders);
-        Mono<GraphQLHttpResponse> graphQLResponseBodyMono = interceptor.customizeResponseBody(responseBody, executionResult, httpHeaders);
+        Mono<GraphQLHttpResponse> graphQLResponseBodyMono = interceptor.customizeResponseBody(responseBody, executionResult, httpHeaders, requestParams);
         return graphQLResponseBodyMono;
     }
 
diff --git a/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLInterceptor.java b/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLInterceptor.java
index 3220ea82..496a594d 100644
--- a/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLInterceptor.java
+++ b/spring-graphql-common/src/main/java/org/springframework/graphql/GraphQLInterceptor.java
@@ -3,19 +3,27 @@ package org.springframework.graphql;
 import graphql.ExecutionInput;
 import graphql.ExecutionResult;
 import org.springframework.http.HttpHeaders;
+import org.springframework.util.MultiValueMap;
 import reactor.core.publisher.Mono;
 
 public interface GraphQLInterceptor {
 
-    default Mono<ExecutionInput> preHandle(ExecutionInput input, HttpHeaders headers) {
+    default Mono<ExecutionInput> preHandle(ExecutionInput input,
+                                           HttpHeaders headers,
+                                           MultiValueMap<String, String> requestParams) {
         return Mono.just(input);
     }
 
-    default Mono<ExecutionResult> postHandle(ExecutionResult result, HttpHeaders httpHeaders) {
+    default Mono<ExecutionResult> postHandle(ExecutionResult result,
+                                             HttpHeaders httpHeaders,
+                                             MultiValueMap<String, String> requestParams) {
         return Mono.just(result);
     }
 
-    default Mono<GraphQLHttpResponse> customizeResponseBody(GraphQLHttpResponse graphQLHttpResponse, ExecutionResult executionResult, HttpHeaders httpHeader) {
+    default Mono<GraphQLHttpResponse> customizeResponseBody(GraphQLHttpResponse graphQLHttpResponse,
+                                                            ExecutionResult executionResult,
+                                                            HttpHeaders httpHeader,
+                                                            MultiValueMap<String, String> requestParams) {
         return Mono.just(graphQLHttpResponse);
     }