Skip to content

fix: use empty url to use the same url as the playground #21

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

Merged
StarpTech merged 3 commits into from
Aug 29, 2023
Merged

fix: use empty url to use the same url as the playground #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afd5030
fix: use empty url to use the same url as the playground
StarpTech Aug 29, 2023
0d08dc5
chore: improve
StarpTech Aug 29, 2023
84e2e8a
Merge branch 'main' into dustin/allow-to-graphql-url
StarpTech Aug 29, 2023
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
7 changes: 4 additions & 3 deletions router/pkg/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,9 +388,10 @@ func (a *App) newRouter(ctx context.Context, routerConfig *nodev1.RouterConfig)

if a.playground {
graphqlPlaygroundHandler := graphiql.NewPlayground(&graphiql.PlaygroundOptions{
Log: a.logger,
Html: graphiql.GetGraphiqlPlaygroundHTML(),
NodeUrl: a.baseURL,
Log: a.logger,
Html: graphiql.GetGraphiqlPlaygroundHTML(),
// Empty url to use the same url as the playground
GraphqlURL: "",
})
router.Get(a.graphqlPath, graphqlPlaygroundHandler)
a.logger.Debug("PlaygroundHandler registered",
Expand Down
6 changes: 3 additions & 3 deletions router/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ func (ipd *Base64Decoder) Decode(value string) error {

type Config struct {
FederatedGraphName string `envconfig:"FEDERATED_GRAPH_NAME" validate:"required"`
ControlplaneURL string `validate:"required" envconfig:"CONTROLPLANE_URL" validate:"uri"`
ControlplaneURL string `validate:"required" default:"https://cosmo-cp.wundergraph.com" envconfig:"CONTROLPLANE_URL" validate:"uri"`
ListenAddr string `default:"localhost:3002" envconfig:"LISTEN_ADDR"`
OTELTracingEnabled bool `default:"true" envconfig:"OTEL_TRACING_ENABLED"`
OTELCollectorEndpoint string `validate:"required" envconfig:"OTEL_COLLECTOR_ENDPOINT" validate:"uri"`
OTELCollectorEndpoint string `validate:"required" default:"https://cosmo-otel.wundergraph.com" envconfig:"OTEL_COLLECTOR_ENDPOINT" validate:"uri"`
OTELCollectorHeaders map[string]string `default:"" envconfig:"OTEL_COLLECTOR_HEADERS"`
OTELSampler float64 `default:"1" envconfig:"OTEL_SAMPLER"`
OTELBatchTimeoutSeconds int `default:"5" envconfig:"OTEL_BATCH_TIMEOUT_SECONDS"`
Expand All @@ -38,7 +38,7 @@ type Config struct {
PrometheusHttpAddr string `default:"127.0.0.1:8088" envconfig:"PROMETHEUS_HTTP_ADDR"`
CORSAllowedOrigins []string `default:"*" envconfig:"CORS_ALLOWED_ORIGINS"`
CORSAllowedMethods []string `default:"HEAD,GET,POST" envconfig:"CORS_ALLOWED_METHODS"`
CORSAllowCredentials bool `default:"false" envconfig:"CORS_ALLOW_CREDENTIALS"`
CORSAllowCredentials bool `default:"true" envconfig:"CORS_ALLOW_CREDENTIALS"`
CORSAllowedHeaders []string `default:"Origin,Content-Length,Content-Type" envconfig:"CORS_ALLOWED_HEADERS"`
CORSMaxAgeMinutes int `default:"5" envconfig:"CORS_MAX_AGE_MINUTES"`
PlaygroundEnabled bool `default:"true" envconfig:"PLAYGROUND_ENABLED"`
Expand Down
4 changes: 2 additions & 2 deletions router/pkg/graphiql/graphiql.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
const generator = async function* () {
const abort = new AbortController();
try {
const res = await fetch('{{apiURL}}/graphql', {
const res = await fetch('{{graphqlURL}}', {
method: 'post',
headers: {
...config.headers || {},
Expand Down Expand Up @@ -93,7 +93,7 @@
};
return generator();
}
return fetch('{{apiURL}}/graphql', {
return fetch('{{graphqlURL}}', {
method: 'post',
headers: {
...config.headers || {},
Expand Down
8 changes: 4 additions & 4 deletions router/pkg/graphiql/playgroundhandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import (
)

type PlaygroundOptions struct {
Log *zap.Logger
Html string
NodeUrl string
Log *zap.Logger
Html string
GraphqlURL string
}

func NewPlayground(opts *PlaygroundOptions) http.HandlerFunc {
fn := func(w http.ResponseWriter, r *http.Request) {
tpl := strings.Replace(opts.Html, "{{apiURL}}", opts.NodeUrl, -1)
tpl := strings.Replace(opts.Html, "{{graphqlURL}}", opts.GraphqlURL, -1)
resp := []byte(tpl)

w.Header().Set("Content-Type", "text/html; charset=utf-8")
Expand Down
8 changes: 4 additions & 4 deletions router/pkg/graphiql/playgroundhandler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import (

func TestHealthCheckHandler(t *testing.T) {
handler := NewPlayground(&PlaygroundOptions{
Log: zap.NewNop(),
Html: "test {{apiURL}}",
NodeUrl: "http://localhost:8080",
Log: zap.NewNop(),
Html: "test {{graphqlURL}}",
GraphqlURL: "/",
})
rec := httptest.NewRecorder()

handler.ServeHTTP(rec, test.NewRequest(http.MethodGet, "/html"))

assert.Equal(t, http.StatusOK, rec.Code)
assert.Equal(t, "text/html; charset=utf-8", rec.Header().Get("Content-Type"))
assert.Equal(t, "test http://localhost:8080", rec.Body.String())
assert.Equal(t, "test /", rec.Body.String())
}