diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-03-15 15:05:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-15 15:05:33 +0100 |
| commit | 27defd7e51a29370e513679ff0bd30b3cc49834c (patch) | |
| tree | 9fc06b1463de7619f4ec68a5eeae534f96439cc3 /lib/private/legacy | |
| parent | 7ea50446593771e79ab2af60891acc00ba97c293 (diff) | |
| parent | 0047789580ae4d2398979dde9d883283984d37e4 (diff) | |
| download | nextcloud-server-27defd7e51a29370e513679ff0bd30b3cc49834c.tar.gz nextcloud-server-27defd7e51a29370e513679ff0bd30b3cc49834c.zip | |
Merge pull request #40127 from summersab/refactor/OC-Server-getTwoFactorAuthManager
Diffstat (limited to 'lib/private/legacy')
| -rw-r--r-- | lib/private/legacy/OC_JSON.php | 5 | ||||
| -rw-r--r-- | lib/private/legacy/OC_Util.php | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/legacy/OC_JSON.php b/lib/private/legacy/OC_JSON.php index b6791fe4b85..5188a92fe1d 100644 --- a/lib/private/legacy/OC_JSON.php +++ b/lib/private/legacy/OC_JSON.php @@ -27,6 +27,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + +use OC\Authentication\TwoFactorAuth\Manager as TwoFactorAuthManager; + class OC_JSON { /** * Check if the app is enabled, send json error msg if not @@ -48,7 +51,7 @@ class OC_JSON { * @suppress PhanDeprecatedFunction */ public static function checkLoggedIn() { - $twoFactorAuthManger = \OC::$server->getTwoFactorAuthManager(); + $twoFactorAuthManger = \OC::$server->get(TwoFactorAuthManager::class); if (!\OC::$server->getUserSession()->isLoggedIn() || $twoFactorAuthManger->needsSecondFactor(\OC::$server->getUserSession()->getUser())) { $l = \OC::$server->getL10N('lib'); diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 42a0d9450b5..09d0719ff2b 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -65,6 +65,7 @@ */ use bantu\IniGetWrapper\IniGetWrapper; +use OC\Authentication\TwoFactorAuth\Manager as TwoFactorAuthManager; use OC\Files\SetupManager; use OCP\Files\Template\ITemplateManager; use OCP\IConfig; @@ -785,7 +786,7 @@ class OC_Util { exit(); } // Redirect to 2FA challenge selection if 2FA challenge was not solved yet - if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) { + if (\OC::$server->get(TwoFactorAuthManager::class)->needsSecondFactor(\OC::$server->getUserSession()->getUser())) { header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge')); exit(); } |