From e5ae4ed0cc13df67af7f04544dcbe88d64e4805b Mon Sep 17 00:00:00 2001 From: Jeremiah VALERIE Date: Sun, 12 Feb 2017 09:58:36 +0100 Subject: [PATCH] Fix sf toolbar updates when using graphiql Takes account of the generate url to avoid 404 when using `app_dev.php` base path. --- Resources/views/GraphiQL/index.html.twig | 5 +++-- Tests/Functional/app/config/routing.yml | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Resources/views/GraphiQL/index.html.twig b/Resources/views/GraphiQL/index.html.twig index f403c0aef..dff887cd1 100644 --- a/Resources/views/GraphiQL/index.html.twig +++ b/Resources/views/GraphiQL/index.html.twig @@ -44,9 +44,10 @@ credentials: 'include', }).then((res) => { var xdebugToken = res.headers.get('X-Debug-Token') - if (typeof Sfjs !== "undefined") { + if (typeof Sfjs !== "undefined" && xdebugToken) { var toolbarElement = document.querySelector('.sf-toolbar') - Sfjs.load(toolbarElement.id, '/_wdt/' + xdebugToken) + var debugUrlPattern = "{{ url('_wdt', {'token': '__TOKEN__'}) }}" + Sfjs.load(toolbarElement.id, debugUrlPattern.replace('__TOKEN__', xdebugToken )) } return res.text() }).then((body) => { diff --git a/Tests/Functional/app/config/routing.yml b/Tests/Functional/app/config/routing.yml index e06235317..620ed7e1b 100644 --- a/Tests/Functional/app/config/routing.yml +++ b/Tests/Functional/app/config/routing.yml @@ -3,3 +3,6 @@ overblog_graphql_endpoint: overblog_graphql_graphiql: resource: "@OverblogGraphQLBundle/Resources/config/routing/graphiql.yml" + +_wdt: + path: /_wdt/{token}