Fix mistake

markstory · markstory · commit 6f959c0d23c0 · 2023-07-29T14:05:07.000-04:00
diff --git a/src/Middleware/DebugKitMiddleware.php b/src/Middleware/DebugKitMiddleware.php
@@ -69,6 +69,6 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             return $response;
         }
 
-        return $this->service->injectScripts($row, $request, $response);
+        return $this->service->injectScripts($row, $response);
     }
 }
diff --git a/src/ToolbarService.php b/src/ToolbarService.php
@@ -360,11 +360,9 @@ public function injectScripts($row, ResponseInterface $response)
         // Use Router to get the request so that we can see the
         // state after other middleware have been applied.
         $request = Router::getRequest();
-        if ($request) {
-            $nonce = $request->getAttribute('cspScriptNonce');
-            if ($nonce) {
-                $nonce = sprintf(' nonce="%s"', $nonce);
-            }
+        $nonce = '';
+        if ($request && $request->getAttribute('cspScriptNonce')) {
+            $nonce = sprintf(' nonce="%s"', $request->getAttribute('cspScriptNonce'));
         }
 
         $url = Router::url('/', true);
diff --git a/tests/TestCase/Middleware/DebugKitMiddlewareTest.php b/tests/TestCase/Middleware/DebugKitMiddlewareTest.php
@@ -21,6 +21,7 @@
 use Cake\Http\CallbackStream;
 use Cake\Http\Response;
 use Cake\Http\ServerRequest;
+use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
 use DebugKit\Middleware\DebugKitMiddleware;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -122,7 +123,7 @@ public function testInvokeSaveData()
         $this->assertNotNull($result->panels[11]->summary);
         $this->assertSame('Sql Log', $result->panels[11]->title);
 
-        $timeStamp = filemtime(Plugin::path('DebugKit') . 'webroot' . DS . 'js' . DS . 'main.js');
+        $timeStamp = filemtime(Plugin::path('DebugKit') . 'webroot' . DS . 'js' . DS . 'inject-iframe.js');
 
         $expected = '<html><title>test</title><body><p>some text</p>' .
             '<script id="__debug_kit_script" data-id="' . $result->id . '" ' .
@@ -144,6 +145,7 @@ public function testInvokeInjectCspNonce()
             'environment' => ['REQUEST_METHOD' => 'GET'],
         ]);
         $request = $request->withAttribute('cspScriptNonce', 'csp-nonce');
+        Router::setRequest($request);
 
         $response = new Response([
             'statusCode' => 200,
diff --git a/tests/TestCase/ToolbarServiceTest.php b/tests/TestCase/ToolbarServiceTest.php
@@ -305,9 +305,9 @@ public function testInjectScriptsLastBodyTag()
         $bar = new ToolbarService($this->events, []);
         $bar->loadPanels();
         $row = $bar->saveData($request, $response);
-        $response = $bar->injectScripts($row, response);
+        $response = $bar->injectScripts($row, $response);
 
-        $timeStamp = filemtime(Plugin::path('DebugKit') . 'webroot' . DS . 'js' . DS . 'main.js');
+        $timeStamp = filemtime(Plugin::path('DebugKit') . 'webroot' . DS . 'js' . DS . 'inject-iframe.js');
 
         $expected = '<html><title>test</title><body><p>some text</p>' .
             '<script id="__debug_kit_script" data-id="' . $row->id . '" ' .
@@ -367,6 +367,10 @@ public function testInjectScriptsStreamBodies()
      */
     public function testInjectScriptsNoModifyResponse()
     {
+        $request = new Request([
+            'url' => '/articles/view/123',
+            'params' => [],
+        ]);
         $response = new Response([
             'statusCode' => 200,
             'type' => 'application/json',

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,6 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface`
`69`	`69`	`return $response;`
`70`	`70`	`}`
`71`	`71`
`72`		`- return $this->service->injectScripts($row, $request, $response);`
	`72`	`+ return $this->service->injectScripts($row, $response);`
`73`	`73`	`}`
`74`	`74`	`}`