add storage of the target path in the session

Controller/SecurityController.php

@@ -5,9 +5,12 @@
 use FOS\UserBundle\Controller\SecurityController as BaseSecurityController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Security\Http\Util\TargetPathTrait;
 
 class SecurityController extends BaseSecurityController
 {
+    use TargetPathTrait;
+
     /**
      * The target path, used during the login and passed to the login view.
      * @var string
@@ -33,6 +36,14 @@ public function loginAction(Request $request)
         $this->pullUsernameFromQuery($request);
         $this->pullTargetPathFromQuery($request);
 
+        if ($this->targetPath) {
+            $this->saveTargetPath(
+                $request->getSession(),
+                'main',
+                $this->targetPath
+            );
+        }
+
         return parent::loginAction($request);
     }
 
@@ -76,6 +87,9 @@ protected function pullUsernameFromQuery(Request $request)
     protected function pullTargetPathFromQuery(Request $request)
     {
         $targetPath = $request->query->get('target_path');
+        if (!$targetPath) {
+            $targetPath = $request->query->get('_target_path');
+        }
 
         if ($targetPath) {
             $this->targetPath = $targetPath;
@@ -99,4 +113,4 @@ protected function isRegistrationEnabled()
 
         return (null !== $routes->get('fos_user_registration_register'));
     }
-}
+}