Merge pull request #192 from georgringer/patch-1

[BUGFIX] Check for CLI usage
Leuchtfeuer · Jan 8, 2024 · ac5f83f · ac5f83f
2 parents e1b8ae8 + 5f3009b
commit ac5f83f
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/Classes/Factory/SecureLinkFactory.php b/Classes/Factory/SecureLinkFactory.php
@@ -21,6 +21,7 @@
 use Leuchtfeuer\SecureDownloads\Registry\TokenRegistry;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\UserAspect;
+use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\EventDispatcher\EventDispatcher;
 use TYPO3\CMS\Core\Http\ApplicationType;
 use TYPO3\CMS\Core\Http\ServerRequest;
@@ -66,13 +67,15 @@ public function __construct(EventDispatcher $eventDispatcher, ExtensionConfigura
     protected function initializeToken(): void
     {
         $this->token->setExp($this->calculateLinkLifetime());
-        $request = $this->getRequest();
-        if (ApplicationType::fromRequest($request)->isFrontend()) {
-            $pageArguments = $request->getAttribute('routing');
-            $pageId = $pageArguments->getPageId();
-        } elseif (ApplicationType::fromRequest($request)->isBackend()) {
-            $site = $request->getAttribute('site');
-            $pageId = $site->getRootPageId();
+        if (!Environment::isCli()) {
+            $request = $this->getRequest();
+            if (ApplicationType::fromRequest($request)->isFrontend()) {
+                $pageArguments = $request->getAttribute('routing');
+                $pageId = $pageArguments->getPageId();
+            } elseif (ApplicationType::fromRequest($request)->isBackend()) {
+                $site = $request->getAttribute('site');
+                $pageId = $site->getRootPageId();
+            }
         }
         $this->token->setPage($pageId ?? 0);