Merge pull request #600 from Eye4web/missingLoginRedirectRoute

Add zfcuser/authenticate to redirectCallback check
ZF-Commons · Aug 17, 2015 · 6bc1372 · 6bc1372
2 parents acda2eb + a3ec479
commit 6bc1372
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/ZfcUser/Controller/RedirectCallback.php b/src/ZfcUser/Controller/RedirectCallback.php
@@ -103,6 +103,7 @@ protected function getRedirect($currentRoute, $redirect = false)
         switch ($currentRoute) {
             case 'zfcuser/register':
             case 'zfcuser/login':
+            case 'zfcuser/authenticate':
                 $route = ($redirect) ?: $this->options->getLoginRedirectRoute();
                 return $this->router->assemble(array(), array('name' => $route));
                 break;

diff --git a/tests/ZfcUserTest/Controller/RedirectCallbackTest.php b/tests/ZfcUserTest/Controller/RedirectCallbackTest.php
@@ -226,6 +226,7 @@ public function providerGetRedirectNoRedirectParam()
     {
         return array(
             array('zfcuser/login', 'zfcuser', '/user', 'getLoginRedirectRoute'),
+            array('zfcuser/authenticate', 'zfcuser', '/user', 'getLoginRedirectRoute'),
             array('zfcuser/logout', 'zfcuser/login', '/user/login', 'getLogoutRedirectRoute'),
             array('testDefault', 'zfcuser', '/home', false),
         );