Move 2FA registration to IBootstrap

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

1 files changed, 17 insertions, 1 deletions

diff --git a/lib/private/Authentication/TwoFactorAuth/ProviderLoader.php b/lib/private/Authentication/TwoFactorAuth/ProviderLoader.php
index 40385d737ae..57b9413feb4 100644
--- a/lib/private/Authentication/TwoFactorAuth/ProviderLoader.php
+++ b/lib/private/Authentication/TwoFactorAuth/ProviderLoader.php
@@ -40,8 +40,12 @@ class ProviderLoader {
 	/** @var IAppManager */
 	private $appManager;
 
-	public function __construct(IAppManager $appManager) {
+	/** @var OC\AppFramework\Bootstrap\Coordinator */
+	private $coordinator;
+
+	public function __construct(IAppManager $appManager, OC\AppFramework\Bootstrap\Coordinator $coordinator) {
 		$this->appManager = $appManager;
+		$this->coordinator = $coordinator;
 	}
 
 	/**
@@ -72,6 +76,18 @@ class ProviderLoader {
 			}
 		}
 
+		$registeredProviders = $this->coordinator->getRegistrationContext()->getTwoFactorProvider();
+		foreach ($registeredProviders as $provider) {
+			try {
+				$this->loadTwoFactorApp($provider->getAppId());
+				$provider = OC::$server->query($provider->getService());
+				$providers[$provider->getId()] = $provider;
+			} catch (QueryException $exc) {
+				// Provider class can not be resolved
+				throw new Exception('Could not load two-factor auth provider ' . $provider->getService());
+			}
+		}
+
 		return $providers;
 	}