diff options
author | Morris Jobke <hey@morrisjobke.de> | 2020-07-14 05:47:54 +0300 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2020-07-14 05:47:54 +0300 |
commit | f42e557fa1a985760b5981a29622b9551223e591 (patch) | |
tree | 561cc592a018cbad5d5fd170ada7ff1cfeb56abe /apps/user_ldap | |
parent | 5dca062c975a7f4b3fbbef8f3b5354258255ec10 (diff) |
Use IBootstrap for the app user_ldap
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/user_ldap')
-rw-r--r-- | apps/user_ldap/appinfo/app.php | 64 | ||||
-rw-r--r-- | apps/user_ldap/lib/AppInfo/Application.php | 65 |
2 files changed, 57 insertions, 72 deletions
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php deleted file mode 100644 index 93a4253bd4f..00000000000 --- a/apps/user_ldap/appinfo/app.php +++ /dev/null @@ -1,64 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Arthur Schiwon <blizzz@arthur-schiwon.de> - * @author Christoph Wurst <christoph@winzerhof-wurst.at> - * @author Dominik Schmidt <dev@dominik-schmidt.de> - * @author Joas Schilling <coding@schilljs.com> - * @author Juan Pablo Villafáñez <jvillafanez@solidgear.es> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * @author Vinicius Cubas Brand <vinicius@eita.org.br> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -$app = \OC::$server->query(\OCA\User_LDAP\AppInfo\Application::class); - -$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig()); -$configPrefixes = $helper->getServerConfigurationPrefixes(true); -if (count($configPrefixes) > 0) { - $ldapWrapper = new OCA\User_LDAP\LDAP(); - $ocConfig = \OC::$server->getConfig(); - $notificationManager = \OC::$server->getNotificationManager(); - $notificationManager->registerNotifierService(\OCA\User_LDAP\Notification\Notifier::class); - $userSession = \OC::$server->getUserSession(); - - $userPluginManager = \OC::$server->query(\OCA\User_LDAP\UserPluginManager::class); - $groupPluginManager = \OC::$server->query(\OCA\User_LDAP\GroupPluginManager::class); - - $userBackend = new OCA\User_LDAP\User_Proxy( - $configPrefixes, $ldapWrapper, $ocConfig, $notificationManager, $userSession, $userPluginManager - ); - $groupBackend = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager); - // register user backend - OC_User::useBackend($userBackend); - - // Hook to allow plugins to work on registered backends - OC::$server->getEventDispatcher()->dispatch('OCA\\User_LDAP\\User\\User::postLDAPBackendAdded'); - - \OC::$server->getGroupManager()->addBackend($groupBackend); - - $app->registerBackendDependents(); -} - -\OCP\Util::connectHook( - '\OCA\Files_Sharing\API\Server2Server', - 'preLoginNameUsedAsUserName', - '\OCA\User_LDAP\Helper', - 'loginName2UserName' -); diff --git a/apps/user_ldap/lib/AppInfo/Application.php b/apps/user_ldap/lib/AppInfo/Application.php index 6e5b73a9bec..ddf40a13d35 100644 --- a/apps/user_ldap/lib/AppInfo/Application.php +++ b/apps/user_ldap/lib/AppInfo/Application.php @@ -28,14 +28,23 @@ namespace OCA\User_LDAP\AppInfo; use OCA\Files_External\Service\BackendService; use OCA\User_LDAP\Controller\RenewPasswordController; +use OCA\User_LDAP\Group_Proxy; +use OCA\User_LDAP\GroupPluginManager; use OCA\User_LDAP\Handler\ExtStorageConfigHandler; +use OCA\User_LDAP\Helper; use OCA\User_LDAP\ILDAPWrapper; use OCA\User_LDAP\LDAP; +use OCA\User_LDAP\Notification\Notifier; +use OCA\User_LDAP\User_Proxy; +use OCA\User_LDAP\UserPluginManager; use OCP\AppFramework\App; +use OCP\AppFramework\Bootstrap\IBootContext; +use OCP\AppFramework\Bootstrap\IBootstrap; +use OCP\AppFramework\Bootstrap\IRegistrationContext; use OCP\AppFramework\IAppContainer; use OCP\IL10N; -class Application extends App { +class Application extends App implements IBootstrap { public function __construct() { parent::__construct('user_ldap'); $container = $this->getContainer(); @@ -63,15 +72,55 @@ class Application extends App { }); } - public function registerBackendDependents() { - $container = $this->getContainer(); + public function register(IRegistrationContext $context): void { + } + + public function boot(IBootContext $context): void { + $server = $context->getServerContainer(); + $config = $server->getConfig(); + + $helper = new Helper($config); + $configPrefixes = $helper->getServerConfigurationPrefixes(true); + if (count($configPrefixes) > 0) { + $ldapWrapper = new LDAP(); + + $notificationManager = $server->getNotificationManager(); + $notificationManager->registerNotifierService(Notifier::class); + $userSession = $server->getUserSession(); + + $userPluginManager = $server->query(UserPluginManager::class); + $groupPluginManager = $server->query(GroupPluginManager::class); + + $userBackend = new User_Proxy( + $configPrefixes, $ldapWrapper, $config, $notificationManager, $userSession, $userPluginManager + ); + $groupBackend = new Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager); + // register user backend + \OC_User::useBackend($userBackend); + + // Hook to allow plugins to work on registered backends + $server->getEventDispatcher()->dispatch('OCA\\User_LDAP\\User\\User::postLDAPBackendAdded'); + + $server->getGroupManager()->addBackend($groupBackend); + + $this->registerBackendDependents($context->getAppContainer()); + } + + \OCP\Util::connectHook( + '\OCA\Files_Sharing\API\Server2Server', + 'preLoginNameUsedAsUserName', + '\OCA\User_LDAP\Helper', + 'loginName2UserName' + ); + } - $container->getServer()->getEventDispatcher()->addListener( + public function registerBackendDependents(IAppContainer $appContainer) { + $appContainer->getServer()->getEventDispatcher()->addListener( 'OCA\\Files_External::loadAdditionalBackends', - function () use ($container) { - $storagesBackendService = $container->query(BackendService::class); - $storagesBackendService->registerConfigHandler('home', function () use ($container) { - return $container->query(ExtStorageConfigHandler::class); + function () use ($appContainer) { + $storagesBackendService = $appContainer->query(BackendService::class); + $storagesBackendService->registerConfigHandler('home', function () use ($appContainer) { + return $appContainer->query(ExtStorageConfigHandler::class); }); } ); |