Skip intermediate login page with single provider

[bookstack] / app / Http / Middleware / ApplyCspRules.php

diff --git a/app/Http/Middleware/ApplyCspRules.php b/app/Http/Middleware/ApplyCspRules.php
index 6c9d14e7b6594af29c61d675533db0a78f2df271..9f3a8d1d84f157b69c95e8758e3f8b26f0d90d66 100644 (file)
--- a/app/Http/Middleware/ApplyCspRules.php
+++ b/app/Http/Middleware/ApplyCspRules.php
@@ -8,10 +8,7 @@ use Illuminate\Http\Request;
 
 class ApplyCspRules
 {
 
 class ApplyCspRules
 {

-    /**
-     * @var CspService
-     */
-    protected $cspService;
+    protected CspService $cspService;

 
     public function __construct(CspService $cspService)
     {
 
     public function __construct(CspService $cspService)
     {


@@ -35,10 +32,8 @@ class ApplyCspRules
 
         $response = $next($request);
 
 
         $response = $next($request);
 

-        $this->cspService->setFrameAncestors($response);
-        $this->cspService->setScriptSrc($response);
-        $this->cspService->setObjectSrc($response);
-        $this->cspService->setBaseUri($response);
+        $cspHeader = $this->cspService->getCspHeader();
+        $response->headers->set('Content-Security-Policy', $cspHeader, false);

 
         return $response;
     }
 
         return $response;
     }