Add explicit exception handling

pimcore · Mar 7, 2024 · 9b76072 · 9b76072
1 parent 337b5da
commit 9b76072
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Security/Trait/RequestTrait.php b/src/Security/Trait/RequestTrait.php
@@ -46,6 +46,7 @@ private function getAuthToken(Request $request): string
     private function getCurrentRequest(RequestStack $requestStack): Request
     {
         $request = $requestStack->getCurrentRequest();
+
         if(!$request) {
             throw new NoRequestException('No request found');
         }

diff --git a/src/Security/Voter/PublicTokenVoter.php b/src/Security/Voter/PublicTokenVoter.php
@@ -49,18 +49,20 @@ protected function supports(string $attribute, mixed $subject): bool
 
     /**
      * @throws NoRequestException
-     * @throws NoAuthTokenFound
      * @throws NonPublicTranslationException
      */
     protected function voteOnAttribute(string $attribute, mixed $subject, TokenInterface $token): bool
     {
 
         $request = $this->getCurrentRequest($this->requestStack);
 
-        $authToken = $this->getAuthToken($request);
-
-        if ($this->securityService->checkAuthToken($authToken)) {
-            return true;
+        try {
+            $authToken = $this->getAuthToken($request);
+            if ($this->securityService->checkAuthToken($authToken)) {
+                return true;
+            }
+        } catch (NoAuthTokenFound) {
+            return $this->voteOnRequest($request, $subject);
         }
 
         return $this->voteOnRequest($request, $subject);