diff options
author | Vincent Petry <pvince81@owncloud.com> | 2016-06-08 10:27:21 +0200 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2016-06-08 10:27:21 +0200 |
commit | 7dcc47dc94c2db2e1968b9a5bdcab694d1b78dbb (patch) | |
tree | 21bad607f43497f4906fa6961baa4d4a1c406c90 /core/Controller | |
parent | b3592ab8067931bf63c5edcb26a684f3b235aa94 (diff) | |
parent | 3e3b326c85d31f69cbc30aa8b9aaa65d4ce04087 (diff) | |
download | nextcloud-server-7dcc47dc94c2db2e1968b9a5bdcab694d1b78dbb.tar.gz nextcloud-server-7dcc47dc94c2db2e1968b9a5bdcab694d1b78dbb.zip |
Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2fa
Allow to cancel 2FA after login
Diffstat (limited to 'core/Controller')
-rw-r--r-- | core/Controller/TwoFactorChallengeController.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/Controller/TwoFactorChallengeController.php b/core/Controller/TwoFactorChallengeController.php index 499898de3bc..edaf3378cd8 100644 --- a/core/Controller/TwoFactorChallengeController.php +++ b/core/Controller/TwoFactorChallengeController.php @@ -62,6 +62,13 @@ class TwoFactorChallengeController extends Controller { } /** + * @return string + */ + protected function getLogoutAttribute() { + return \OC_User::getLogoutAttribute(); + } + + /** * @NoAdminRequired * @NoCSRFRequired * @@ -75,6 +82,7 @@ class TwoFactorChallengeController extends Controller { $data = [ 'providers' => $providers, 'redirect_url' => $redirect_url, + 'logout_attribute' => $this->getLogoutAttribute(), ]; return new TemplateResponse($this->appName, 'twofactorselectchallenge', $data, 'guest'); } @@ -106,6 +114,7 @@ class TwoFactorChallengeController extends Controller { $data = [ 'error' => $error, 'provider' => $provider, + 'logout_attribute' => $this->getLogoutAttribute(), 'template' => $tmpl->fetchPage(), ]; return new TemplateResponse($this->appName, 'twofactorshowchallenge', $data, 'guest'); |