WIP prevent automaticaly enabeling user at password creation #5

src/Controller/ResettingController.php

@@ -48,13 +48,14 @@ class ResettingController extends AbstractController
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
+            // Save enabled state
+            $wasEnabled = $user->isEnabled();
+
             $event = new FormEvent($form, $request);
             $this->dispatcher->dispatch($event, FOSUserEvents::RESETTING_RESET_SUCCESS);
 
-            // Don't force enable user, as opposed to what's done in FOSUserBundle
             $user->setConfirmationToken(null);
             $user->setPasswordRequestedAt(null);
-            // $user->setEnabled(false);
 
             $this->userManager->updateUser($user);
 
@@ -62,11 +63,17 @@ class ResettingController extends AbstractController
                 $response = new RedirectResponse($this->generateUrl('fos_user_profile_show'));
             }
 
-            $this->eventDispatcher->dispatch(
+            $this->dispatcher->dispatch(
                 new FilterUserResponseEvent($user, $request, $response),
                 FOSUserEvents::RESETTING_RESET_COMPLETED
             );
 
+            // Re-set original "enabled" state
+            if ($user->isEnabled() !== $wasEnabled) {
+                $user->setEnabled($wasEnabled);
+                $this->userManager->updateUser($user);
+            }
+
             return $response;
         }