summaryrefslogtreecommitdiffstats
path: root/core/Controller/LoginController.php
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@owncloud.com>2016-06-01 13:54:08 +0200
committerChristoph Wurst <christoph@owncloud.com>2016-06-01 14:43:47 +0200
commit5e71d23dedf7fc6a8b9f28d856d57f5516af44ac (patch)
treedf216565c56f53fcbd8d4bb8d253bb39ddd67e13 /core/Controller/LoginController.php
parent7b4459d28d40523c70ec05a733e158f2c14faac4 (diff)
downloadnextcloud-server-5e71d23dedf7fc6a8b9f28d856d57f5516af44ac.tar.gz
nextcloud-server-5e71d23dedf7fc6a8b9f28d856d57f5516af44ac.zip
remember redirect_url when solving the 2FA challenge
Diffstat (limited to 'core/Controller/LoginController.php')
-rw-r--r--core/Controller/LoginController.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 39e1019abe7..c64f58ae2cc 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -197,6 +197,11 @@ class LoginController extends Controller {
if ($this->twoFactorManager->isTwoFactorAuthenticated($loginResult)) {
$this->twoFactorManager->prepareTwoFactorLogin($loginResult);
+ if (!is_null($redirect_url)) {
+ return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge', [
+ 'redirect_url' => $redirect_url
+ ]));
+ }
return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
}