New redirect strategy

config/module.config.php

@@ -16,14 +16,17 @@
         ),
     ),
     'controllers' => array(
-        'invokables' => array(
-            'zfcuser' => 'ZfcUser\Controller\UserController',
+        'factories' => array(
+            'zfcuser' => 'ZfcUser\Factory\Controller\UserControllerFactory',
         ),
     ),
     'service_manager' => array(
         'aliases' => array(
             'zfcuser_zend_db_adapter' => 'Zend\Db\Adapter\Adapter',
         ),
+        'factories' => array(
+            'zfcuser_redirect_callback' => 'ZfcUser\Factory\Controller\RedirectCallbackFactory'
+        )
     ),
     'router' => array(
         'routes' => array(

src/ZfcUser/Controller/RedirectCallback.php

@@ -0,0 +1,121 @@
+<?php
+
+namespace ZfcUser\Controller;
+
+use Zend\Mvc\Application;
+use Zend\Mvc\Router\RouteInterface;
+use Zend\Mvc\Router\RouteMatch;
+use Zend\Mvc\Router\Exception;
+use Zend\Http\PhpEnvironment\Request;
+use Zend\Http\PhpEnvironment\Response;
+use ZfcUser\Options\ModuleOptions;
+
+class RedirectCallback
+{
+    /** @var RouteMatch */
+    protected $routeMatch;
+
+    /** @var RouteInterface  */
+    protected $router;
+
+    /** @var Response */
+    protected $response;
+
+    /** @var Request */
+    protected $request;
+
+    /** @var ModuleOptions */
+    protected $options;
+
+    /**
+     * @param Application $application
+     * @param RouteInterface $router
+     * @param ModuleOptions $options
+     */
+    public function __construct(Application $application, RouteInterface $router, ModuleOptions $options)
+    {
+        $this->routeMatch = $application->getMvcEvent()->getRouteMatch();
+        $this->router = $router;
+        $this->request = $application->getRequest();
+        $this->response = $application->getResponse();
+        $this->options = $options;
+    }
+
+    /**
+     * @return Response
+     */
+    public function __invoke()
+    {
+        $redirect = $this->getRedirect($this->routeMatch->getMatchedRouteName(), $this->getRedirectRouteFromRequest());
+
+        $response = $this->response;
+        $response->getHeaders()->addHeaderLine('Location', $redirect);
+        $response->setStatusCode(302);
+        return $response;
+    }
+
+    /**
+     * Return the redirect from param.
+     * First checks GET then POST
+     * @return string
+     */
+    protected function getRedirectRouteFromRequest()
+    {
+        $request  = $this->request;
+        $redirect = $request->getQuery('redirect');
+        if ($redirect && $this->routeExists($redirect)) {
+            return $redirect;
+        }
+
+        $redirect = $request->getPost('redirect');
+        if ($redirect && $this->routeExists($redirect)) {
+            return $redirect;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $route
+     * @return bool
+     */
+    protected function routeExists($route)
+    {
+        try {
+            $this->router->assemble([], ['name' => $route]);
+        } catch (Exception\RuntimeException $e) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Returns the url to redirect to based on current route.
+     * If $redirect is set and the option to use redirect is set to true, it will return the $redirect url.
+     *
+     * @param string $currentRoute
+     * @param bool $redirect
+     * @return mixed
+     */
+    protected function getRedirect($currentRoute, $redirect = false)
+    {
+        $useRedirect = $this->options->getUseRedirectParameterIfPresent();
+        $routeExists = ($redirect && $this->routeExists($redirect));
+        if (!$useRedirect || !$routeExists) {
+            $redirect = false;
+        }
+
+        switch ($currentRoute) {
+            case 'zfcuser/login':
+                $route = ($redirect) ?: $this->options->getLoginRedirectRoute();
+                return $this->router->assemble([], ['name' => $route]);
+                break;
+            case 'zfcuser/logout':
+                $route = ($redirect) ?: $this->options->getLogoutRedirectRoute();
+                return $this->router->assemble([], ['name' => $route]);
+                break;
+            default:
+                return $this->router->assemble([], ['name' => 'zfcuser']);
+        }
+    }
+}

src/ZfcUser/Controller/UserController.php

@@ -55,6 +55,20 @@ class UserController extends AbstractActionController
      */
     protected $options;
 
+    /**
+     * @var callable $redirectCallback
+     */
+    protected $redirectCallback;
+
+
+    /**
+     * @param callable $redirectCallback
+     */
+    public function __construct($redirectCallback)
+    {
+        $this->redirectCallback = $redirectCallback;
+    }
+
     /**
      * User page
      */
@@ -116,13 +130,8 @@ public function logoutAction()
         $this->zfcUserAuthentication()->getAuthAdapter()->logoutAdapters();
         $this->zfcUserAuthentication()->getAuthService()->clearIdentity();
 
-        $redirect = $this->params()->fromPost('redirect', $this->params()->fromQuery('redirect', false));
-
-        if ($this->getOptions()->getUseRedirectParameterIfPresent() && $redirect) {
-            return $this->redirect()->toRoute($redirect);
-        }
-
-        return $this->redirect()->toRoute($this->getOptions()->getLogoutRedirectRoute());
+        $redirect = $this->redirectCallback;
+        return $redirect();
     }
 
     /**
@@ -155,17 +164,15 @@ public function authenticateAction()
             );
         }
 
-        if ($this->getOptions()->getUseRedirectParameterIfPresent() && $redirect) {
-            return $this->redirect()->toRoute($redirect);
-        }
-
         $route = $this->getOptions()->getLoginRedirectRoute();
 
         if (is_callable($route)) {
             $route = $route($this->zfcUserAuthentication()->getIdentity());
+            return $this->redirect()->toRoute($route);
         }
 
-        return $this->redirect()->toRoute($route);
+        $redirect = $this->redirectCallback;
+        return $redirect();
     }
 
     /**

src/ZfcUser/Factory/Controller/RedirectCallbackFactory.php

@@ -0,0 +1,21 @@
+<?php
+namespace ZfcUser\Factory\Controller;
+
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use ZfcUser\Controller\RedirectCallback;
+
+class RedirectCallbackFactory implements FactoryInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        $router = $serviceLocator->get('Router');
+        $application = $serviceLocator->get('Application');
+        $options = $serviceLocator->get('zfcuser_module_options');
+
+        return new RedirectCallback($application, $router, $options);
+    }
+}

src/ZfcUser/Factory/Controller/UserControllerFactory.php

@@ -0,0 +1,25 @@
+<?php
+namespace ZfcUser\Factory\Controller;
+
+use Zend\Mvc\Controller\ControllerManager;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use ZfcUser\Authentication\Adapter;
+use ZfcUser\Controller\UserController;
+
+class UserControllerFactory implements FactoryInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function createService(ServiceLocatorInterface $controllerManager)
+    {
+        /** @var ControllerManager $controllerManager*/
+        $serviceManager = $controllerManager->getServiceLocator();
+
+        $redirectCallback = $serviceManager->get('zfcuser_redirect_callback');
+        $controller = new UserController($redirectCallback);
+
+        return $controller;
+    }
+}