Merge pull request #126 from szymach/3.2

Fixed new activation token not being persisted to database
fsi-open · Oct 14, 2019 · 536182b · 536182b
2 parents 8b200a3 + bd1c648
commit 536182b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/EventListener/PersistDoctrineUserListener.php b/EventListener/PersistDoctrineUserListener.php
@@ -40,6 +40,7 @@ public static function getSubscribedEvents(): array
             AdminSecurityEvents::CHANGE_PASSWORD => 'onChangePassword',
             AdminSecurityEvents::RESET_PASSWORD_REQUEST => 'onResetPasswordRequest',
             AdminSecurityEvents::ACTIVATION => 'onActivation',
+            AdminSecurityEvents::RESEND_ACTIVATION_TOKEN => 'onActivationResend',
             AdminSecurityEvents::DEACTIVATION => 'onDeactivation',
             AdminSecurityEvents::USER_CREATED => 'onUserCreated',
             AdminSecurityEvents::PROMOTE_USER => 'onPromoteUser',
@@ -53,6 +54,11 @@ public function onActivation(ActivationEvent $event): void
         $this->flushUserObjectManager($event->getUser());
     }
 
+    public function onActivationResend(ActivationEvent $event): void
+    {
+        $this->flushUserObjectManager($event->getUser());
+    }
+
     public function onDeactivation(ActivationEvent $event): void
     {
         $this->flushUserObjectManager($event->getUser());

diff --git a/spec/FSi/Bundle/AdminSecurityBundle/EventListener/PersistDoctrineUserListenerSpec.php b/spec/FSi/Bundle/AdminSecurityBundle/EventListener/PersistDoctrineUserListenerSpec.php
@@ -39,6 +39,7 @@ function it_subscribes_all_events()
             AdminSecurityEvents::CHANGE_PASSWORD => 'onChangePassword',
             AdminSecurityEvents::RESET_PASSWORD_REQUEST => 'onResetPasswordRequest',
             AdminSecurityEvents::ACTIVATION => 'onActivation',
+            AdminSecurityEvents::RESEND_ACTIVATION_TOKEN => 'onActivationResend',
             AdminSecurityEvents::DEACTIVATION => 'onDeactivation',
             AdminSecurityEvents::USER_CREATED => 'onUserCreated',
             AdminSecurityEvents::PROMOTE_USER => 'onPromoteUser',
@@ -86,6 +87,19 @@ function it_flushes_om_after_activation(
         $this->onActivation($event);
     }
 
+    function it_flushes_om_after_resending_activation_token(
+        ActivationEvent $event,
+        ObjectManager $objectManager,
+        User $user
+    ) {
+        $event->getUser()->willReturn($user);
+
+        $objectManager->persist($user)->shouldBeCalled();
+        $objectManager->flush()->shouldBeCalled();
+
+        $this->onActivationResend($event);
+    }
+
     function it_flushes_om_after_deactivation(
         ActivationEvent $event,
         ObjectManager $objectManager,