Adapting code for the new @Security annotation

Author: moufmouf

Security/AuthenticationService.php

@@ -5,6 +5,7 @@
 
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use TheCodingMachine\GraphQLite\Security\AuthenticationServiceInterface;
+use function is_object;
 
 class AuthenticationService implements AuthenticationServiceInterface
 {
@@ -24,21 +25,30 @@ public function __construct(?TokenStorageInterface $tokenStorage)
      * @return bool
      */
     public function isLogged(): bool
+    {
+        return $this->getUser() !== null;
+    }
+
+    /**
+     * Returns an object representing the current logged user.
+     * Can return null if the user is not logged.
+     */
+    public function getUser(): ?object
     {
         if ($this->tokenStorage === null) {
             throw new \LogicException('The SecurityBundle is not registered in your application. Try running "composer require symfony/security-bundle".');
         }
 
         $token = $this->tokenStorage->getToken();
         if (null === $token) {
-            return false;
+            return null;
         }
 
-        if (!\is_object($token->getUser())) {
+        $user = $token->getUser();
+        if (!\is_object($user)) {
             // e.g. anonymous authentication
-            return false;
+            return null;
         }
-
-        return true;
+        return $user;
     }
 }

Security/AuthorizationService.php

@@ -28,10 +28,9 @@ public function __construct(?AuthorizationCheckerInterface $authorizationChecker
     /**
      * Returns true if the "current" user has access to the right "$right"
      *
-     * @param string $right
-     * @return bool
+     * @param mixed $subject The scope this right applies on. $subject is typically an object or a FQCN. Set $subject to "null" if the right is global.
      */
-    public function isAllowed(string $right): bool
+    public function isAllowed(string $right, $subject = null): bool
     {
         if ($this->authorizationChecker === null || $this->tokenStorage === null) {
             throw new \LogicException('The SecurityBundle is not registered in your application. Try running "composer require symfony/security-bundle".');
@@ -42,6 +41,6 @@ public function isAllowed(string $right): bool
             return false;
         }
 
-        return $this->authorizationChecker->isGranted($right);
+        return $this->authorizationChecker->isGranted($right, $subject);
     }
 }