chore(tests): add voyager reactive tests

Author: oliemansm

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/voyager/ReactiveVoyagerAutoConfiguration.java

@@ -13,10 +13,7 @@
 /** @author Max David Günther */
 @Configuration
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
-@ConditionalOnProperty(
-    value = "graphql.voyager.enabled",
-    havingValue = "true",
-    matchIfMissing = true)
+@ConditionalOnProperty(value = "graphql.voyager.enabled", havingValue = "true")
 @EnableConfigurationProperties(VoyagerPropertiesConfiguration.class)
 public class ReactiveVoyagerAutoConfiguration {
 

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/voyager/ReactiveVoyagerController.java

@@ -1,17 +1,17 @@
 package graphql.kickstart.autoconfigure.editor.voyager;
 
-import static graphql.kickstart.autoconfigure.editor.EditorConstants.CSRF_ATTRIBUTE_NAME;
-
 import java.io.IOException;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.web.server.csrf.CsrfToken;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestAttribute;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
 
 /** @author Max David Günther */
 @Controller
@@ -21,14 +21,23 @@ public class ReactiveVoyagerController {
   @Autowired private VoyagerIndexHtmlTemplate indexTemplate;
 
   @GetMapping(path = "${graphql.voyager.mapping:/voyager}")
-  public ResponseEntity<String> voyager(
-      final @RequestAttribute(value = CSRF_ATTRIBUTE_NAME, required = false) Object csrf,
-      @PathVariable Map<String, String> params)
-      throws IOException {
+  public Mono<ResponseEntity<String>> voyager(
+      ServerWebExchange exchange, @PathVariable Map<String, String> params) {
     // no context path in spring-webflux
-    String indexHtmlContent = indexTemplate.fillIndexTemplate("", csrf, params);
-    return ResponseEntity.ok()
-        .contentType(MediaType.valueOf("text/html; charset=UTF-8"))
-        .body(indexHtmlContent);
+    Mono<CsrfToken> csrfToken = exchange.getAttribute(CsrfToken.class.getName());
+    return csrfToken != null
+        ? csrfToken.map(csrf -> fillTemplate(csrf, params))
+        : Mono.just(fillTemplate(null, params));
+  }
+
+  private ResponseEntity<String> fillTemplate(CsrfToken csrf, Map<String, String> params) {
+    try {
+      String indexHtmlContent = indexTemplate.fillIndexTemplate("", csrf, params);
+      return ResponseEntity.ok()
+          .contentType(MediaType.valueOf("text/html; charset=UTF-8"))
+          .body(indexHtmlContent);
+    } catch (IOException e) {
+      return ResponseEntity.status(500).body(null);
+    }
   }
 }

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/voyager/VoyagerAutoConfiguration.java

@@ -9,10 +9,7 @@
 /** @author Guilherme Blanco */
 @Configuration
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
-@ConditionalOnProperty(
-    value = "graphql.voyager.enabled",
-    havingValue = "true",
-    matchIfMissing = true)
+@ConditionalOnProperty(value = "graphql.voyager.enabled", havingValue = "true")
 @EnableConfigurationProperties(VoyagerPropertiesConfiguration.class)
 public class VoyagerAutoConfiguration {
 

graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/PermitAllWebFluxSecurity.java

@@ -0,0 +1,19 @@
+package graphql.kickstart.autoconfigure;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.web.server.SecurityWebFilterChain;
+import org.springframework.web.reactive.config.EnableWebFlux;
+
+@EnableWebFlux
+@Configuration
+@EnableWebFluxSecurity
+public class PermitAllWebFluxSecurity {
+
+  @Bean
+  public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
+    return http.authorizeExchange().anyExchange().permitAll().and().csrf().and().build();
+  }
+}

graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/editor/voyager/ReactiveVoyagerControllerTest.java

@@ -0,0 +1,51 @@
+package graphql.kickstart.autoconfigure.editor.voyager;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import graphql.kickstart.autoconfigure.PermitAllWebFluxSecurity;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.security.reactive.ReactiveSecurityAutoConfiguration;
+import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+@Import(PermitAllWebFluxSecurity.class)
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(
+    classes = {ReactiveVoyagerAutoConfiguration.class, ReactiveSecurityAutoConfiguration.class},
+    properties = {"graphql.voyager.enabled=true", "spring.main.web-application-type=reactive"})
+@AutoConfigureWebTestClient
+@ActiveProfiles("voyager")
+class ReactiveVoyagerWithCsrfTest {
+
+  @Autowired private WebTestClient webTestClient;
+
+  @Test
+  void shouldLoadCSRFData() {
+    final String responseBody =
+        webTestClient
+            .get()
+            .uri("/voyager")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBody(String.class)
+            .returnResult()
+            .getResponseBody();
+
+    final Document document = Jsoup.parse(responseBody);
+    final String script = document.body().select("body script").dataNodes().get(0).getWholeData();
+    assertThat(script)
+        .contains("let csrf = {\"")
+        .contains("\"token\":\"")
+        .contains("\"parameterName\":\"_csrf\"")
+        .contains("\"headerName\":\"X-CSRF-TOKEN\"");
+  }
+}

graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/editor/voyager/ReactiveVoyagerWithCsrfTest.java

@@ -23,7 +23,7 @@
 @Import(PermitAllWebSecurity.class)
 @SpringBootTest(
     classes = {VoyagerAutoConfiguration.class, SecurityAutoConfiguration.class},
-    properties = {"spring.main.web-application-type=servlet"})
+    properties = {"graphql.voyager.enabled=true", "spring.main.web-application-type=servlet"})
 @AutoConfigureMockMvc
 @ActiveProfiles("voyager")
 class VoyagerWithCsrfTest {

graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/editor/voyager/VoyagerControllerTest.java

@@ -12,6 +12,7 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
@@ -20,6 +21,7 @@
 @SpringBootTest(classes = {VoyagerAutoConfiguration.class})
 @AutoConfigureMockMvc
 @ActiveProfiles("voyager")
+@TestPropertySource("classpath:enabled-config.properties")
 class VoyagerWithoutCsrfTest {
 
   @Autowired private MockMvc mockMvc;