Fix voter

pimcore · Apr 10, 2024 · f415840 · f415840
1 parent 356e0f1
commit f415840
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/Security/Voter/AuthorizationVoter.php b/src/Security/Voter/AuthorizationVoter.php
@@ -59,6 +59,12 @@ protected function voteOnAttribute(string $attribute, mixed $subject, TokenInter
 
         $authToken = $this->getAuthToken($request);
 
-        return $this->securityService->checkAuthToken($authToken);
+        if(!$this->securityService->checkAuthToken($authToken)) {
+            throw new NotAuthorizedException(
+                401,
+                'Full authentication is required.'
+            );
+        }
+        return true;
     }
 }
diff --git a/src/Security/Voter/PublicAuthorizationVoter.php b/src/Security/Voter/PublicAuthorizationVoter.php
@@ -56,18 +56,18 @@ protected function supports(string $attribute, mixed $subject): bool
     protected function voteOnAttribute(string $attribute, mixed $subject, TokenInterface $token): bool
     {
         $request = $this->getCurrentRequest($this->requestStack);
-
+        $subjectName = $this->getSubjectName($subject);
         try {
             $authToken = $this->getAuthToken($request);
         } catch (NotAuthorizedException) {
-            return $this->voteOnRequest($request, $this->getSubjectName($subject));
+            return $this->voteOnRequest($request, $subjectName);
         }
 
         if ($this->securityService->checkAuthToken($authToken)) {
             return true;
         }
 
-        return $this->voteOnRequest($request, $subject);
+        return $this->voteOnRequest($request, $subjectName);
     }
 
     /**