adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9840 from chinpei215/2.x-blank-redir

Browse source 
Fix redirectUrl issue when loginRedirect is empty
This commit is contained in:
Mark Story 2016-12-04 09:26:19 -05:00 committed by GitHub
commit 14192ba1e8
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Controller/Component/AuthComponent.php
View file

@ -741,7 +741,7 @@ class AuthComponent extends Component {
$this->Session->delete('Auth.redirect'); $this->Session->delete('Auth.redirect');
if (Router::normalize($redir) === Router::normalize($this->loginAction)) { if (Router::normalize($redir) === Router::normalize($this->loginAction)) {
$redir = $this->loginRedirect; $redir = $this->loginRedirect ?: '/';
} }
} elseif ($this->loginRedirect) { } elseif ($this->loginRedirect) {
$redir = $this->loginRedirect; $redir = $this->loginRedirect;

14
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
View file

@ -1652,6 +1652,20 @@ class AuthComponentTest extends CakeTestCase {
Router::reload(); Router::reload();
} }
/**
* Test that redirectUrl() returns '/' if loginRedirect is empty
* and Auth.redirect is the login page.
*
* @return void
*/
public function testRedirectUrlWithoutLoginRedirect() {
$this->Auth->loginRedirect = null;
$this->Auth->Session->write('Auth.redirect', '/users/login');
$this->Auth->request->addParams(Router::parse('/users/login'));
$result = $this->Auth->redirectUrl();
$this->assertEquals('/', $result);
}
/** /**
* test password hashing * test password hashing
* *