From 8c82628622ad2a873dfe922dae455770409771b1 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Tue, 30 Aug 2016 11:10:45 +0200 Subject: [PATCH] redirect to default app after solving the 2FA challenge --- core/Controller/TwoFactorChallengeController.php | 6 ++++-- tests/Core/Controller/TwoFactorChallengeControllerTest.php | 7 +------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/core/Controller/TwoFactorChallengeController.php b/core/Controller/TwoFactorChallengeController.php index b9e10b147ce..7d72a7a2cf4 100644 --- a/core/Controller/TwoFactorChallengeController.php +++ b/core/Controller/TwoFactorChallengeController.php @@ -24,6 +24,8 @@ namespace OC\Core\Controller; use OC\Authentication\TwoFactorAuth\Manager; +use OC_User; +use OC_Util; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\TemplateResponse; @@ -67,7 +69,7 @@ class TwoFactorChallengeController extends Controller { * @return string */ protected function getLogoutAttribute() { - return \OC_User::getLogoutAttribute(); + return OC_User::getLogoutAttribute(); } /** @@ -143,7 +145,7 @@ class TwoFactorChallengeController extends Controller { if (!is_null($redirect_url)) { return new RedirectResponse($this->urlGenerator->getAbsoluteURL(urldecode($redirect_url))); } - return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index')); + return new RedirectResponse(OC_Util::getDefaultPageUrl()); } $this->session->set('two_factor_auth_error', true); diff --git a/tests/Core/Controller/TwoFactorChallengeControllerTest.php b/tests/Core/Controller/TwoFactorChallengeControllerTest.php index 08d8dd1452c..648d99a82fc 100644 --- a/tests/Core/Controller/TwoFactorChallengeControllerTest.php +++ b/tests/Core/Controller/TwoFactorChallengeControllerTest.php @@ -167,13 +167,8 @@ class TwoFactorChallengeControllerTest extends TestCase { ->method('verifyChallenge') ->with('myprovider', $user, 'token') ->will($this->returnValue(true)); - $this->urlGenerator->expects($this->once()) - ->method('linkToRoute') - ->with('files.view.index') - ->will($this->returnValue('files/index/url')); - $expected = new \OCP\AppFramework\Http\RedirectResponse('files/index/url'); - $this->assertEquals($expected, $this->controller->solveChallenge('myprovider', 'token')); + $this->assertInstanceOf('\OCP\AppFramework\Http\RedirectResponse', $this->controller->solveChallenge('myprovider', 'token')); } public function testSolveChallengeInvalidProvider() { -- 2.39.5