Refactoring (#16)

* Update * Update refresh token Co-authored-by: Artem Henvald <artem.genvald@stfalcon.com>
stfalcon-studio · Jan 17, 2022 · 0abf9bb · 0abf9bb
1 parent 3dd9b28
commit 0abf9bb
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 14 deletions.
diff --git a/Entity/JWT/RefreshToken.php b/Entity/JWT/RefreshToken.php
@@ -13,7 +13,7 @@
 namespace StfalconStudio\ApiBundle\Entity\JWT;
 
 use Doctrine\ORM\Mapping as ORM;
-use Gesdinet\JWTRefreshTokenBundle\Entity\RefreshToken as BaseRefreshToken;
+use Gesdinet\JWTRefreshTokenBundle\Model\AbstractRefreshToken;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
@@ -30,8 +30,36 @@
  *     }
  * )
  */
-class RefreshToken extends BaseRefreshToken
+class RefreshToken extends AbstractRefreshToken
 {
+    /**
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @var string|null
+     *
+     * @ORM\Column(name="refresh_token", type="string", unique=true, length=128)
+     */
+    protected $refreshToken;
+
+    /**
+     * @var string|null
+     *
+     * @ORM\Column(type="string", length=255)
+     */
+    protected $username;
+
+    /**
+     * @var \DateTimeInterface|null
+     *
+     * @ORM\Column(type="datetime")
+     */
+    protected $valid;
+
     /**
      * @ORM\Column(type="datetimetz_immutable")
      *

diff --git a/EventListener/JWT/JwtRefreshSubscriber.php b/EventListener/JWT/JwtRefreshSubscriber.php
@@ -39,7 +39,7 @@ public static function getSubscribedEvents(): iterable
      */
     public function processRefreshToken(RefreshEvent $event): void
     {
-        $user = $event->getPreAuthenticatedToken()->getUser();
+        $user = $event->getToken()->getUser();
 
         if ($user instanceof CredentialsInterface) {
             $refreshToken = $event->getRefreshToken();

diff --git a/Tests/EventListener/JWT/JwtRefreshSubscriberTest.php b/Tests/EventListener/JWT/JwtRefreshSubscriberTest.php
@@ -27,22 +27,21 @@ final class JwtRefreshSubscriberTest extends TestCase
     private $refreshEvent;
 
     /** @var PostAuthenticationGuardToken|MockObject */
-    private $preAuthenticatedToken;
+    private $token;
 
     /** @var RefreshToken|MockObject */
     private $refreshToken;
 
     /** @var CredentialsInterface|MockObject */
     private $user;
 
-    /** @var JwtRefreshSubscriber */
-    private $subscriber;
+    private JwtRefreshSubscriber $subscriber;
 
     protected function setUp(): void
     {
         $this->refreshEvent = $this->createMock(RefreshEvent::class);
         $this->user = $this->createMock(CredentialsInterface::class);
-        $this->preAuthenticatedToken = $this->createMock(PostAuthenticationGuardToken::class);
+        $this->token = $this->createMock(PostAuthenticationGuardToken::class);
         $this->refreshToken = $this->createMock(RefreshToken::class);
         $this->subscriber = new JwtRefreshSubscriber();
     }
@@ -52,7 +51,7 @@ protected function tearDown(): void
         unset(
             $this->refreshEvent,
             $this->user,
-            $this->preAuthenticatedToken,
+            $this->token,
             $this->refreshToken,
             $this->subscriber,
         );
@@ -76,8 +75,8 @@ public function testProcessRefreshTokenWithException(): void
     {
         $this->refreshEvent
             ->expects(self::once())
-            ->method('getPreAuthenticatedToken')
-            ->willReturn($this->preAuthenticatedToken)
+            ->method('getToken')
+            ->willReturn($this->token)
         ;
         $this->refreshEvent
             ->expects(self::once())
@@ -91,7 +90,7 @@ public function testProcessRefreshTokenWithException(): void
             ->willReturn(new \DateTime('2030-01-01 00:00:01'))
         ;
 
-        $this->preAuthenticatedToken
+        $this->token
             ->expects(self::once())
             ->method('getUser')
             ->willReturn($this->user)
@@ -112,8 +111,8 @@ public function testProcessRefreshTokenWithoutException(): void
     {
         $this->refreshEvent
             ->expects(self::once())
-            ->method('getPreAuthenticatedToken')
-            ->willReturn($this->preAuthenticatedToken)
+            ->method('getToken')
+            ->willReturn($this->token)
         ;
         $this->refreshEvent
             ->expects(self::once())
@@ -127,7 +126,7 @@ public function testProcessRefreshTokenWithoutException(): void
             ->willReturn(new \DateTime('2030-01-01 00:00:01'))
         ;
 
-        $this->preAuthenticatedToken
+        $this->token
             ->expects(self::once())
             ->method('getUser')
             ->willReturn($this->user)