mirror of https://github.com/nextcloud/server
Refactor `OC\Server::getTwoFactorAuthManager`
Signed-off-by: Andrew Summers <18727110+summersab@users.noreply.github.com>
This commit is contained in:
parent
df1cd1ba7e
commit
0047789580
|
@ -43,6 +43,7 @@ use OC\Authentication\Exceptions\PasswordlessTokenException;
|
|||
use OC\Authentication\Exceptions\PasswordLoginForbiddenException;
|
||||
use OC\Authentication\Token\IProvider;
|
||||
use OC\Authentication\Token\IToken;
|
||||
use OC\Authentication\TwoFactorAuth\Manager as TwoFactorAuthManager;
|
||||
use OC\Hooks\Emitter;
|
||||
use OC\Hooks\PublicEmitter;
|
||||
use OC_User;
|
||||
|
@ -524,7 +525,7 @@ class Session implements IUserSession, Emitter {
|
|||
$user = $users[0];
|
||||
}
|
||||
// DI not possible due to cyclic dependencies :'-/
|
||||
return OC::$server->getTwoFactorAuthManager()->isTwoFactorAuthenticated($user);
|
||||
return OC::$server->get(TwoFactorAuthManager::class)->isTwoFactorAuthenticated($user);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -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');
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue