redirect to default app after solving the 2FA challenge

diff --git a/core/Controller/TwoFactorChallengeController.php b/core/Controller/TwoFactorChallengeController.php
index c19cf5232796be8cc4b9d905e8e1981738b54ede..48dea062812d266e85f066ded02db22227a3b599 100644 (file)
--- 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 08d8dd1452ca3d4735e0654d30790db787dd10da..648d99a82fcd3dce6c6243b01a8bade89b86d35e 100644 (file)
--- 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() {