summaryrefslogtreecommitdiffstats
path: root/lib/private/Server.php
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-05-23 20:50:03 +0200
committerVincent Petry <pvince81@owncloud.com>2016-05-23 20:50:03 +0200
commit87fa86a69ae8df7aadcb882eb3a9a7f767e453a7 (patch)
tree170586f2d6a9e10e96f7102c21fb684971ac9179 /lib/private/Server.php
parentaa56d42fa8aafbed96eecfb898fa5c02340493a7 (diff)
parent847bbc51b61b4222503ae089f78124c2d18d5f22 (diff)
downloadnextcloud-server-87fa86a69ae8df7aadcb882eb3a9a7f767e453a7.tar.gz
nextcloud-server-87fa86a69ae8df7aadcb882eb3a9a7f767e453a7.zip
Merge pull request #24559 from owncloud/2fa
two factor auth
Diffstat (limited to 'lib/private/Server.php')
-rw-r--r--lib/private/Server.php12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php
index ea0c436d84b..c7b3799448e 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -276,6 +276,11 @@ class Server extends ServerContainer implements IServerContainer {
});
return $userSession;
});
+
+ $this->registerService('\OC\Authentication\TwoFactorAuth\Manager', function (Server $c) {
+ return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig());
+ });
+
$this->registerService('NavigationManager', function ($c) {
return new \OC\NavigationManager();
});
@@ -856,6 +861,13 @@ class Server extends ServerContainer implements IServerContainer {
}
/**
+ * @return \OC\Authentication\TwoFactorAuth\Manager
+ */
+ public function getTwoFactorAuthManager() {
+ return $this->query('\OC\Authentication\TwoFactorAuth\Manager');
+ }
+
+ /**
* @return \OC\NavigationManager
*/
public function getNavigationManager() {