Do not load 2fa admin settings async

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

1 files changed, 21 insertions, 5 deletions

diff --git a/lib/private/Settings/Admin/Security.php b/lib/private/Settings/Admin/Security.php
index dd80d4d3ae6..21e18883cc0 100644
--- a/lib/private/Settings/Admin/Security.php
+++ b/lib/private/Settings/Admin/Security.php
@@ -25,25 +25,35 @@
 
 namespace OC\Settings\Admin;
 
+use OC\Authentication\TwoFactorAuth\MandatoryTwoFactor;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Encryption\IManager;
+use OCP\IInitialStateService;
 use OCP\IUserManager;
 use OCP\Settings\ISettings;
 
 class Security implements ISettings {
+
 	/** @var IManager */
 	private $manager;
 
 	/** @var IUserManager */
 	private $userManager;
 
-	/**
-	 * @param IManager $manager
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IManager $manager, IUserManager $userManager) {
+	/** @var MandatoryTwoFactor */
+	private $mandatoryTwoFactor;
+
+	/** @var IInitialStateService */
+	private $initialState;
+
+	public function __construct(IManager $manager,
+								IUserManager $userManager,
+								MandatoryTwoFactor $mandatoryTwoFactor,
+								IInitialStateService $initialState) {
 		$this->manager = $manager;
 		$this->userManager = $userManager;
+		$this->mandatoryTwoFactor = $mandatoryTwoFactor;
+		$this->initialState = $initialState;
 	}
 
 	/**
@@ -61,6 +71,12 @@ class Security implements ISettings {
 			}
 		}
 
+		$this->initialState->provideInitialState(
+			'settings',
+			'mandatory2FAState',
+			$this->mandatoryTwoFactor->getState()
+		);
+
 		$parameters = [
 			// Encryption API
 			'encryptionEnabled'       => $this->manager->isEnabled(),