mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2981 from nextcloud/backport-2854-2fa-redirect-url 

[stable11] Set redirect_url on 2FA challenge page
This commit is contained in:
Roeland Jago Douma 2017-01-09 19:37:16 +01:00 committed by GitHub
parent ea8617fc8f 2625b6297b
commit 120009f7a5
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/Controller/TwoFactorChallengeController.php
View File

@ -128,6 +128,7 @@ class TwoFactorChallengeController extends Controller {
'provider' => $provider, 'provider' => $provider,
'backupProvider' => $backupProvider, 'backupProvider' => $backupProvider,
'logout_attribute' => $this->getLogoutAttribute(), 'logout_attribute' => $this->getLogoutAttribute(),
'redirect_url' => $redirect_url,
'template' => $tmpl->fetchPage(), 'template' => $tmpl->fetchPage(),
]; ];
return new TemplateResponse($this->appName, 'twofactorshowchallenge', $data, 'guest'); return new TemplateResponse($this->appName, 'twofactorshowchallenge', $data, 'guest');

1
tests/Core/Controller/TwoFactorChallengeControllerTest.php
View File

@ -143,6 +143,7 @@ class TwoFactorChallengeControllerTest extends TestCase {
'backupProvider' => $backupProvider, 'backupProvider' => $backupProvider,
'logout_attribute' => 'logoutAttribute', 'logout_attribute' => 'logoutAttribute',
'template' => '<html/>', 'template' => '<html/>',
'redirect_url' => '/re/dir/ect/url',
], 'guest'); ], 'guest');
$this->assertEquals($expected, $this->controller->showChallenge('myprovider', '/re/dir/ect/url')); $this->assertEquals($expected, $this->controller->showChallenge('myprovider', '/re/dir/ect/url'));