Fixes for currentURL

Use _cubex where available
MrEssex · Nov 7, 2023 · ad58aee · ad58aee
1 parent 4c3ebf8
commit ad58aee
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 50 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Context/AppContext.php b/src/Context/AppContext.php
@@ -36,7 +36,7 @@ protected function _initialize(): void
    *
    * @return LinkBuilder
    */
-  public function linkBuilder(string $path = '', array $query = []): LinkBuilder
+  public function www(string $path = '', array $query = []): LinkBuilder
   {
     return LinkBuilder::fromRequest($this->request(), $path, $query)->setSubDomain('www');
   }

diff --git a/src/Http/Layout/DefaultLayout/Layout.phtml b/src/Http/Layout/DefaultLayout/Layout.phtml
@@ -16,11 +16,11 @@ $store = Dispatch::instance()->store();
 <head>
   <meta charset="UTF-8">
 
-  <link rel="icon" href="<?= $ctx->linkBuilder('/favicon.ico?v=1.0') ?>">
-  <link rel="icon" href="<?= $ctx->linkBuilder('/icon.svg') ?>" type="image/svg+xml">
-  <link rel="apple-touch-icon" href="<?= $ctx->linkBuilder('/icon.png') ?>">
-  <link type="text/plain" rel="author" href="<?= $ctx->linkBuilder('/humans.txt') ?>">
-  <link rel="manifest" href="<?= $ctx->linkBuilder('/site.webmanifest') ?>">
+  <link rel="icon" href="<?= $ctx->www('/favicon.ico?v=1.0') ?>">
+  <link rel="icon" href="<?= $ctx->www('/icon.svg') ?>" type="image/svg+xml">
+  <link rel="apple-touch-icon" href="<?= $ctx->www('/icon.png') ?>">
+  <link type="text/plain" rel="author" href="<?= $ctx->www('/humans.txt') ?>">
+  <link rel="manifest" href="<?= $ctx->www('/site.webmanifest') ?>">
 
   <?php if($this->seoProvider): ?>
     <?= $this->seoProvider ?>

diff --git a/src/Http/Layout/LayoutController.php b/src/Http/Layout/LayoutController.php
@@ -2,7 +2,6 @@
 
 namespace CubexBase\Application\Http\Layout;
 
-use Cubex\CubexAware;
 use CubexBase\Application\Http\Layout\DefaultLayout\Layout;
 use CubexBase\Application\Http\Views\AbstractView;
 use CubexBase\Application\MainApplication;
@@ -67,11 +66,12 @@ protected function _isAppropriateResponse($result): bool
 
   public function getTheme()
   {
-    $ctx = $this->getContext();
-    if($ctx instanceof CubexAware)
+    $cubex = $this->_cubex();
+    if($cubex)
     {
-      return $ctx->getCubex()->resolve(Layout::class);
+      return $cubex->resolve(Layout::class);
     }
+
     return Layout::withContext($this);
   }
 }
diff --git a/src/Http/Layout/WithErrorController.php b/src/Http/Layout/WithErrorController.php
@@ -3,8 +3,6 @@
 namespace CubexBase\Application\Http\Layout;
 
 use Cubex\Controller\AuthedController;
-use Cubex\Cubex;
-use Cubex\CubexAware;
 use Cubex\I18n\GetTranslatorTrait;
 use CubexBase\Application\Context\AppContext;
 use CubexBase\Application\Http\Middleware\WithMiddlewareTrait;
@@ -34,10 +32,9 @@ protected function _processHandler(Context $c, $handler, &$response): bool
   {
     while(is_callable($handler))
     {
-      /** @var Cubex $cubex */
-      if($c instanceof CubexAware)
+      $cubex = $this->_cubex();
+      if($cubex)
       {
-        $cubex = @$c->getCubex();
         $handler = $cubex->resolveMethod($handler[0], $handler[1]);
       }
     }

diff --git a/src/MainApplication.php b/src/MainApplication.php
@@ -166,13 +166,8 @@ protected function _setupApplication(): void
   {
     $ctx = $this->getContext();
     $ctx->prepareTranslator('/translations/', $ctx->matches(ExpectEnvironment::local()));
-
-    if(!$this->getCubex() instanceof Cubex)
-    {
-      return;
-    }
-
-    $this->getCubex()->listen(
+    $cubex = @$this->getCubex();
+    $cubex->listen(
       ResponsePreSendHeadersEvent::class,
       function (ResponsePreSendHeadersEvent $event) {
         $this->_setupHeaders($event);
@@ -183,7 +178,7 @@ function (ResponsePreSendHeadersEvent $event) {
     // Dont generate sitemap on api requests
     if($ctx->matches(ExpectEnvironment::local()) && !str_starts_with($ctx->request()->path(), '/api'))
     {
-      SitemapListener::with($this->getCubex(), $ctx);
+      SitemapListener::with($cubex, $ctx);
     }
   }
 
@@ -203,11 +198,17 @@ protected function _setupHeaders(ResponsePreSendHeadersEvent $event): SResponse
       $response->headers->set('Access-Control-Allow-Origin', $ctx->request()->headers->get('origin'));
     }
 
-    $url = 'http://www.cubexbase.local-host.xyz:6090';
+    $currentUrl = $ctx->request()->urlSprintf();
+    $schema = $ctx->request()->getScheme();
+    if(!str_contains($currentUrl, $schema . '://www'))
+    {
+      $currentUrl = str_replace($schema . '://', $schema . '://www.', $currentUrl);
+    }
+
     $csp = new ContentSecurityPolicy([
-      ContentSecurityPolicy::DEFAULT_SRC => ["'self'"],
-      ContentSecurityPolicy::IMG_SRC => ["'self'", $url],
-      ContentSecurityPolicy::SCRIPT_SRC => ["'self'", "'unsafe-inline'", "'unsafe-eval'"],
+      ContentSecurityPolicy::DEFAULT_SRC => ["'self'", $currentUrl],
+      ContentSecurityPolicy::IMG_SRC => ["'self'", $currentUrl],
+      ContentSecurityPolicy::SCRIPT_SRC => ["'self'", "'unsafe-inline'", "'unsafe-eval'", $currentUrl],
       ContentSecurityPolicy::OBJECT_SRC => ["'none'"],
       ContentSecurityPolicy::FRAME_ANCESTORS => ["'none'"],
     ]);
@@ -224,20 +225,12 @@ protected function _defaultHandler(): Handler
   protected function _setupCookies(ResponsePreSendHeadersEvent $event)
   {
     $response = $event->getResponse();
-    /** @var AppContext $ctx */
-    $ctx = $event->getContext();
+    $cubex = @$this->getCubex();
 
     // Add flash messages to cookies
-    $flash = $ctx->getCubex()->retrieve(FlashMessageProvider::class);
-    if($flash->hasMessages())
-    {
-      $response->headers->setCookie(
-        $flash->toCookie()
-      );
-    }
-    else
-    {
+    $flash = $cubex->retrieve(FlashMessageProvider::class);
+    $flash->hasMessages() ?
+      $response->headers->setCookie($flash->toCookie()) :
       $response->headers->clearCookie('flash');
-    }
   }
 }