adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 11:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Strips the base off the generated URL from the AuthComponent.

Browse source 
Fixes #3922.
This commit is contained in:
Phally 2013-07-26 12:05:45 +02:00
parent 8b21710c95
commit f7eab23a5c
2 changed files with 36 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

@ -677,7 +677,7 @@ class AuthComponent extends Component {
$redir = '/'; $redir = '/';
} }
if (is_array($redir)) { if (is_array($redir)) {
return Router::url($redir); return Router::url($redir + array('base' => false));
} }
return $redir; return $redir;
} }

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

@ -1268,6 +1268,41 @@ class AuthComponentTest extends CakeTestCase {
$this->assertFalse($this->Auth->Session->check('Auth.redirect')); $this->assertFalse($this->Auth->Session->check('Auth.redirect'));
} }
/**
* test that the returned URL doesn't contain the base URL.
*
* @see https://cakephp.lighthouseapp.com/projects/42648/tickets/3922-authcomponentredirecturl-prepends-appbaseurl
*
* @return void This test method doesn't return anything.
*/
public function testRedirectUrlWithBaseSet() {
$App = Configure::read('App');
Configure::write('App', array(
'dir' => APP_DIR,
'webroot' => WEBROOT_DIR,
'base' => false,
'baseUrl' => '/cake/index.php'
));
$url = '/users/login';
$this->Auth->request = $this->Controller->request = new CakeRequest($url);
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->url = Router::normalize($url);
Router::setRequestInfo($this->Auth->request);
$this->Auth->loginAction = array('controller' => 'users', 'action' => 'login');
$this->Auth->loginRedirect = array('controller' => 'users', 'action' => 'home');
$result = $this->Auth->redirectUrl();
$this->assertEquals('/users/home', $result);
$this->assertFalse($this->Auth->Session->check('Auth.redirect'));
Configure::write('App', $App);
Router::reload();
}
/** /**
* test password hashing * test password hashing
* *