NEW common HTTP headers for all facades in System.config.json

axenox · Jan 24, 2024 · 8517f56 · 8517f56
1 parent 3f1f560
commit 8517f56
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Facades/IDEFacade.php b/Facades/IDEFacade.php
@@ -288,7 +288,8 @@ protected function launchAdminer() : ?string
      */
     protected function buildHeadersCommon() : array
     {
-        $headers = array_filter($this->getConfig()->getOption('FACADE.HEADERS.COMMON')->toArray());
+        $baseHeaders = parent::buildHeadersCommon();
+        $facadeHeaders = array_filter($this->getConfig()->getOption('FACADE.HEADERS.COMMON')->toArray());
 
         $workbenchHosts = [];
         foreach ($this->getWorkbench()->getConfig()->getOption('SERVER.BASE_URLS') as $url) {
@@ -316,6 +317,7 @@ protected function buildHeadersCommon() : array
             }
         }
 
-        return array_merge(['Content-Security-Policy' => $cspString], $headers);
+        $secPolHeaders = ['Content-Security-Policy' => $cspString];
+        return array_merge($baseHeaders, $secPolHeaders, $facadeHeaders);
     }
 }