Merge remote-tracking branch 'security/advisory-fix-MST-33-5.1' into 5.1

escopecz · Sep 19, 2024 · 20b9b4c · 20b9b4c
1 parent a69f122
commit 20b9b4c
Showing 1 changed file with 0 additions and 27 deletions.
diff --git a/app/bundles/UserBundle/Controller/SecurityController.php b/app/bundles/UserBundle/Controller/SecurityController.php
@@ -46,33 +46,6 @@ public function onRequest(RequestEvent $event): void
      */
     public function loginAction(Request $request, AuthenticationUtils $authenticationUtils, IntegrationHelper $integrationHelper, TranslatorInterface $translator): \Symfony\Component\HttpFoundation\Response
     {
-        // A way to keep the upgrade from failing if the session is lost after
-        // the cache is cleared by upgrade.php
-        if ($request->cookies->has('mautic_update')) {
-            $step = $request->cookies->get('mautic_update');
-            if ('clearCache' === $step) {
-                // Run migrations
-                $request->query->set('finalize', 1);
-
-                return $this->forward('Mautic\CoreBundle\Controller\AjaxController::updateDatabaseMigrationAction',
-                    [
-                        'request' => $request,
-                    ]
-                );
-            } elseif ('schemaMigration' === $step) {
-                // Done so finalize
-                return $this->forward('Mautic\CoreBundle\Controller\AjaxController::updateFinalizationAction',
-                    [
-                        'request' => $request,
-                    ]
-                );
-            }
-
-            /** @var \Mautic\CoreBundle\Helper\CookieHelper $cookieHelper */
-            $cookieHelper = $this->factory->getHelper('cookie');
-            $cookieHelper->deleteCookie('mautic_update');
-        }
-
         $error = $authenticationUtils->getLastAuthenticationError();
 
         if (null !== $error) {