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

bugfix : graphiql/index.html does not replace fetch path #737

Merged
merged 5 commits into from Nov 23, 2021
Merged

bugfix : graphiql/index.html does not replace fetch path #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92297be
bugfix : graphiql/index.html does not replace fetch path
heo-d Nov 16, 2021
64b0b42
Merge remote-tracking branch 'origin/master'
heo-d Nov 16, 2021
e31aa97
rollback linkbreak
heo-d Nov 16, 2021
65910b0
remove unused import
heo-d Nov 16, 2021
42cd0fe
remove unused import
heo-d Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions ...n/kotlin/com/netflix/graphql/dgs/webflux/autoconfiguration/DgsWebFluxAutoConfiguration.kt
View file
Open in desktop
Expand Up @@ -31,20 +31,22 @@ import com.netflix.graphql.dgs.webflux.handlers.DgsWebfluxHttpHandler
import com.netflix.graphql.dgs.webflux.handlers.WebFluxCookieValueResolver
import graphql.ExecutionInput
import graphql.GraphQL
import graphql.execution.*
import graphql.execution.AsyncExecutionStrategy
import graphql.execution.AsyncSerialExecutionStrategy
import graphql.execution.DataFetcherExceptionHandler
import graphql.execution.ExecutionIdProvider
import graphql.execution.ExecutionStrategy
import graphql.execution.instrumentation.ChainedInstrumentation
import graphql.introspection.IntrospectionQuery
import graphql.schema.GraphQLSchema
import org.springframework.beans.factory.annotation.Qualifier
import org.springframework.beans.factory.annotation.Value
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.context.ApplicationContext
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.core.env.Environment
import org.springframework.core.io.Resource
import org.springframework.http.MediaType
import org.springframework.web.reactive.function.server.RequestPredicates.accept
import org.springframework.web.reactive.function.server.RouterFunction
Expand Down Expand Up @@ -113,14 +115,11 @@ open class DgsWebFluxAutoConfiguration(private val configProps: DgsWebfluxConfig

@Bean
@ConditionalOnProperty(name = ["dgs.graphql.graphiql.enabled"], havingValue = "true", matchIfMissing = true)
open fun graphiQlIndexRedirect(@Value("classpath:/static/graphiql/index.html") indexHtml: Resource): RouterFunction<ServerResponse> {
open fun graphiQlIndexRedirect(): RouterFunction<ServerResponse> {
return RouterFunctions.route()
.GET(configProps.graphiql.path) {
permanentRedirect(URI.create(configProps.graphiql.path + "/index.html")).build()
}
.GET(configProps.graphiql.path + "/index.html") {
ok().bodyValue(indexHtml)
}
.build()
}

Expand Down
4 changes: 2 additions & 2 deletions ...e/src/main/kotlin/com/netflix/graphql/dgs/webflux/autoconfiguration/GraphiQlConfigurer.kt
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ class GraphiQlConfigurer(private val configProps: DgsWebfluxConfigurationPropert
override fun addResourceHandlers(registry: ResourceHandlerRegistry) {
val graphqlPath = configProps.path
registry
.addResourceHandler("/graphiql/**")
.addResourceHandler(configProps.graphiql.path + "/**")
.addResourceLocations("classpath:/static/graphiql/")
.resourceChain(true)
.addResolver(PathResourceResolver())
Expand All @@ -53,7 +53,7 @@ class GraphiQlConfigurer(private val configProps: DgsWebfluxConfigurationPropert
resource: Resource,
transformerChain: ResourceTransformerChain
): Mono<Resource> {
if (exchange.request.uri.toASCIIString().endsWith("graphiql/index.html")) {
if (exchange.request.uri.toASCIIString().endsWith(configProps.graphiql.path + "/index.html")) {
val content = resource.inputStream.bufferedReader().use(BufferedReader::readText)
return Mono.just(
TransformedResource(
Expand Down
4 changes: 4 additions & 0 deletions ...c/test/kotlin/com/netflix/graphql/dgs/webflux/autoconfiguration/GraphiQlCustomEndpoint.kt
View file
Open in desktop
Expand Up @@ -17,11 +17,13 @@
package com.netflix.graphql.dgs.webflux.autoconfiguration

import com.netflix.graphql.dgs.autoconfig.DgsAutoConfiguration
import graphql.Assert
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.test.web.reactive.server.WebTestClient
import org.springframework.test.web.reactive.server.expectBody
import org.springframework.web.reactive.config.EnableWebFlux

@AutoConfigureWebTestClient
Expand All @@ -48,5 +50,7 @@ class GraphiQlCustomEndpoint {
.exchange()
.expectStatus()
.is2xxSuccessful
.expectBody<String>()
.consumeWith { it -> Assert.assertTrue(it.responseBody!!.contains("fetch('/graphql")) }
}
}