mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Migrate Two-Factor Backup Codes to new bootstrap mechanism 

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2020-06-08 19:27:28 +02:00
parent c5d2958ac7
commit a2c8bfadbc
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
2 changed files with 27 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/twofactor_backupcodes/appinfo/app.php
View File

@ -1,29 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
*
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
* @author Joas Schilling <coding@schilljs.com>
* @author Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* 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
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
use OCA\TwoFactorBackupCodes\AppInfo\Application;
$app = \OC::$server->query(Application::class);
$app->register();

51
apps/twofactor_backupcodes/lib/AppInfo/Application.php
View File

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/** /**
* @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com> * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
* *
@ -34,44 +37,44 @@ use OCA\TwoFactorBackupCodes\Listener\ProviderEnabled;
use OCA\TwoFactorBackupCodes\Listener\RegistryUpdater; use OCA\TwoFactorBackupCodes\Listener\RegistryUpdater;
use OCA\TwoFactorBackupCodes\Notifications\Notifier; use OCA\TwoFactorBackupCodes\Notifications\Notifier;
use OCP\AppFramework\App; use OCP\AppFramework\App;
use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap;
use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\Authentication\TwoFactorAuth\IRegistry; use OCP\Authentication\TwoFactorAuth\IRegistry;
use OCP\Notification\IManager; use OCP\Notification\IManager;
use OCP\Util; use OCP\Util;
class Application extends App { class Application extends App implements IBootstrap {
public const APP_ID = 'twofactor_backupcodes';
public function __construct() { public function __construct() {
parent::__construct('twofactor_backupcodes'); parent::__construct(self::APP_ID);
} }
/** public function register(IRegistrationContext $context): void {
* Register the different app parts $this->registerHooksAndEvents($context);
*/ }
public function register() {
$this->registerHooksAndEvents(); public function boot(IBootContext $context): void {
$this->registerNotification(); Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser');
$this->registerNotification(
$context->getAppContainer()->query(IManager::class)
);
} }
/** /**
* Register the hooks and events * Register the hooks and events
*/ */
public function registerHooksAndEvents() { public function registerHooksAndEvents(IRegistrationContext $context) {
Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser'); $context->registerEventListener(CodesGenerated::class, ActivityPublisher::class);
$context->registerEventListener(CodesGenerated::class, RegistryUpdater::class);
$container = $this->getContainer(); $context->registerEventListener(CodesGenerated::class, ClearNotifications::class);
$context->registerEventListener(IRegistry::EVENT_PROVIDER_ENABLED, ProviderEnabled::class);
/** @var IEventDispatcher $eventDispatcher */ $context->registerEventListener(IRegistry::EVENT_PROVIDER_DISABLED, ProviderDisabled::class);
$eventDispatcher = $container->query(IEventDispatcher::class);
$eventDispatcher->addServiceListener(CodesGenerated::class, ActivityPublisher::class);
$eventDispatcher->addServiceListener(CodesGenerated::class, RegistryUpdater::class);
$eventDispatcher->addServiceListener(CodesGenerated::class, ClearNotifications::class);
$eventDispatcher->addServiceListener(IRegistry::EVENT_PROVIDER_ENABLED, ProviderEnabled::class);
$eventDispatcher->addServiceListener(IRegistry::EVENT_PROVIDER_DISABLED, ProviderDisabled::class);
} }
public function registerNotification() { private function registerNotification(IManager $manager) {
$container = $this->getContainer();
/** @var IManager $manager */
$manager = $container->query(IManager::class);
$manager->registerNotifierService(Notifier::class); $manager->registerNotifierService(Notifier::class);
} }