FEATURE: Respect configured Neos.Flow.http.baseUri

Related: #15
bwaidelich · Aug 14, 2019 · 25da007 · 25da007
1 parent 2bda941
commit 25da007
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/Classes/Resource/Target/ProtectedResourceTarget.php b/Classes/Resource/Target/ProtectedResourceTarget.php
@@ -65,6 +65,12 @@ class ProtectedResourceTarget implements TargetInterface
      */
     protected $httpRequest;
 
+    /**
+     * @Flow\InjectConfiguration(package="Neos.Flow", path="http.baseUri")
+     * @var string
+     */
+    protected $defaultBaseUri;
+
     /**
      * @param string $name Name of this target instance, according to the resource settings
      * @param array $options Options for this target
@@ -171,12 +177,11 @@ protected function shouldIncludeSecurityContext()
      */
     protected function detectResourcesBaseUri()
     {
-        $uri = '';
         $request = $this->getHttpRequest();
-        if ($request instanceof HttpRequest) {
-            $uri = $request->getBaseUri();
+        if (!$request instanceof HttpRequest) {
+            return $this->defaultBaseUri;
         }
-        return (string)$uri;
+        return (string)$request->getBaseUri();
     }
 
     /**