Merge pull request #26592 from nextcloud/enh/2fa_backup/fancy_new_events
Listen to proper UserDeletedEvent
This commit is contained in:
commit
d311e08f97
|
@ -20,6 +20,7 @@ return array(
|
||||||
'OCA\\TwoFactorBackupCodes\\Listener\\ProviderDisabled' => $baseDir . '/../lib/Listener/ProviderDisabled.php',
|
'OCA\\TwoFactorBackupCodes\\Listener\\ProviderDisabled' => $baseDir . '/../lib/Listener/ProviderDisabled.php',
|
||||||
'OCA\\TwoFactorBackupCodes\\Listener\\ProviderEnabled' => $baseDir . '/../lib/Listener/ProviderEnabled.php',
|
'OCA\\TwoFactorBackupCodes\\Listener\\ProviderEnabled' => $baseDir . '/../lib/Listener/ProviderEnabled.php',
|
||||||
'OCA\\TwoFactorBackupCodes\\Listener\\RegistryUpdater' => $baseDir . '/../lib/Listener/RegistryUpdater.php',
|
'OCA\\TwoFactorBackupCodes\\Listener\\RegistryUpdater' => $baseDir . '/../lib/Listener/RegistryUpdater.php',
|
||||||
|
'OCA\\TwoFactorBackupCodes\\Listener\\UserDeleted' => $baseDir . '/../lib/Listener/UserDeleted.php',
|
||||||
'OCA\\TwoFactorBackupCodes\\Migration\\CheckBackupCodes' => $baseDir . '/../lib/Migration/CheckBackupCodes.php',
|
'OCA\\TwoFactorBackupCodes\\Migration\\CheckBackupCodes' => $baseDir . '/../lib/Migration/CheckBackupCodes.php',
|
||||||
'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607104347' => $baseDir . '/../lib/Migration/Version1002Date20170607104347.php',
|
'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607104347' => $baseDir . '/../lib/Migration/Version1002Date20170607104347.php',
|
||||||
'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607113030' => $baseDir . '/../lib/Migration/Version1002Date20170607113030.php',
|
'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607113030' => $baseDir . '/../lib/Migration/Version1002Date20170607113030.php',
|
||||||
|
|
|
@ -35,6 +35,7 @@ class ComposerStaticInitTwoFactorBackupCodes
|
||||||
'OCA\\TwoFactorBackupCodes\\Listener\\ProviderDisabled' => __DIR__ . '/..' . '/../lib/Listener/ProviderDisabled.php',
|
'OCA\\TwoFactorBackupCodes\\Listener\\ProviderDisabled' => __DIR__ . '/..' . '/../lib/Listener/ProviderDisabled.php',
|
||||||
'OCA\\TwoFactorBackupCodes\\Listener\\ProviderEnabled' => __DIR__ . '/..' . '/../lib/Listener/ProviderEnabled.php',
|
'OCA\\TwoFactorBackupCodes\\Listener\\ProviderEnabled' => __DIR__ . '/..' . '/../lib/Listener/ProviderEnabled.php',
|
||||||
'OCA\\TwoFactorBackupCodes\\Listener\\RegistryUpdater' => __DIR__ . '/..' . '/../lib/Listener/RegistryUpdater.php',
|
'OCA\\TwoFactorBackupCodes\\Listener\\RegistryUpdater' => __DIR__ . '/..' . '/../lib/Listener/RegistryUpdater.php',
|
||||||
|
'OCA\\TwoFactorBackupCodes\\Listener\\UserDeleted' => __DIR__ . '/..' . '/../lib/Listener/UserDeleted.php',
|
||||||
'OCA\\TwoFactorBackupCodes\\Migration\\CheckBackupCodes' => __DIR__ . '/..' . '/../lib/Migration/CheckBackupCodes.php',
|
'OCA\\TwoFactorBackupCodes\\Migration\\CheckBackupCodes' => __DIR__ . '/..' . '/../lib/Migration/CheckBackupCodes.php',
|
||||||
'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607104347' => __DIR__ . '/..' . '/../lib/Migration/Version1002Date20170607104347.php',
|
'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607104347' => __DIR__ . '/..' . '/../lib/Migration/Version1002Date20170607104347.php',
|
||||||
'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607113030' => __DIR__ . '/..' . '/../lib/Migration/Version1002Date20170607113030.php',
|
'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607113030' => __DIR__ . '/..' . '/../lib/Migration/Version1002Date20170607113030.php',
|
||||||
|
|
|
@ -28,20 +28,20 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace OCA\TwoFactorBackupCodes\AppInfo;
|
namespace OCA\TwoFactorBackupCodes\AppInfo;
|
||||||
|
|
||||||
use OCA\TwoFactorBackupCodes\Db\BackupCodeMapper;
|
|
||||||
use OCA\TwoFactorBackupCodes\Event\CodesGenerated;
|
use OCA\TwoFactorBackupCodes\Event\CodesGenerated;
|
||||||
use OCA\TwoFactorBackupCodes\Listener\ActivityPublisher;
|
use OCA\TwoFactorBackupCodes\Listener\ActivityPublisher;
|
||||||
use OCA\TwoFactorBackupCodes\Listener\ClearNotifications;
|
use OCA\TwoFactorBackupCodes\Listener\ClearNotifications;
|
||||||
use OCA\TwoFactorBackupCodes\Listener\ProviderDisabled;
|
use OCA\TwoFactorBackupCodes\Listener\ProviderDisabled;
|
||||||
use OCA\TwoFactorBackupCodes\Listener\ProviderEnabled;
|
use OCA\TwoFactorBackupCodes\Listener\ProviderEnabled;
|
||||||
use OCA\TwoFactorBackupCodes\Listener\RegistryUpdater;
|
use OCA\TwoFactorBackupCodes\Listener\RegistryUpdater;
|
||||||
|
use OCA\TwoFactorBackupCodes\Listener\UserDeleted;
|
||||||
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\IBootContext;
|
||||||
use OCP\AppFramework\Bootstrap\IBootstrap;
|
use OCP\AppFramework\Bootstrap\IBootstrap;
|
||||||
use OCP\AppFramework\Bootstrap\IRegistrationContext;
|
use OCP\AppFramework\Bootstrap\IRegistrationContext;
|
||||||
use OCP\Authentication\TwoFactorAuth\IRegistry;
|
use OCP\Authentication\TwoFactorAuth\IRegistry;
|
||||||
use OCP\Util;
|
use OCP\User\Events\UserDeletedEvent;
|
||||||
|
|
||||||
class Application extends App implements IBootstrap {
|
class Application extends App implements IBootstrap {
|
||||||
public const APP_ID = 'twofactor_backupcodes';
|
public const APP_ID = 'twofactor_backupcodes';
|
||||||
|
@ -51,29 +51,16 @@ class Application extends App implements IBootstrap {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function register(IRegistrationContext $context): void {
|
public function register(IRegistrationContext $context): void {
|
||||||
$this->registerHooksAndEvents($context);
|
|
||||||
|
|
||||||
$context->registerNotifierService(Notifier::class);
|
$context->registerNotifierService(Notifier::class);
|
||||||
}
|
|
||||||
|
|
||||||
public function boot(IBootContext $context): void {
|
|
||||||
Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Register the hooks and events
|
|
||||||
*/
|
|
||||||
public function registerHooksAndEvents(IRegistrationContext $context) {
|
|
||||||
$context->registerEventListener(CodesGenerated::class, ActivityPublisher::class);
|
$context->registerEventListener(CodesGenerated::class, ActivityPublisher::class);
|
||||||
$context->registerEventListener(CodesGenerated::class, RegistryUpdater::class);
|
$context->registerEventListener(CodesGenerated::class, RegistryUpdater::class);
|
||||||
$context->registerEventListener(CodesGenerated::class, ClearNotifications::class);
|
$context->registerEventListener(CodesGenerated::class, ClearNotifications::class);
|
||||||
$context->registerEventListener(IRegistry::EVENT_PROVIDER_ENABLED, ProviderEnabled::class);
|
$context->registerEventListener(IRegistry::EVENT_PROVIDER_ENABLED, ProviderEnabled::class);
|
||||||
$context->registerEventListener(IRegistry::EVENT_PROVIDER_DISABLED, ProviderDisabled::class);
|
$context->registerEventListener(IRegistry::EVENT_PROVIDER_DISABLED, ProviderDisabled::class);
|
||||||
|
$context->registerEventListener(UserDeletedEvent::class, UserDeleted::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function deleteUser($params) {
|
public function boot(IBootContext $context): void {
|
||||||
/** @var BackupCodeMapper $mapper */
|
|
||||||
$mapper = $this->getContainer()->query(BackupCodeMapper::class);
|
|
||||||
$mapper->deleteCodesByUserId($params['uid']);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,50 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2021 Roeland Jago Douma <roeland@famdouma.nl>
|
||||||
|
*
|
||||||
|
* @author Roeland Jago Douma <roeland@famdouma.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/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCA\TwoFactorBackupCodes\Listener;
|
||||||
|
|
||||||
|
use OCA\TwoFactorBackupCodes\Db\BackupCodeMapper;
|
||||||
|
use OCP\EventDispatcher\Event;
|
||||||
|
use OCP\EventDispatcher\IEventListener;
|
||||||
|
use OCP\User\Events\UserDeletedEvent;
|
||||||
|
|
||||||
|
class UserDeleted implements IEventListener {
|
||||||
|
|
||||||
|
/** @var BackupCodeMapper */
|
||||||
|
private $backupCodeMapper;
|
||||||
|
|
||||||
|
public function __construct(BackupCodeMapper $backupCodeMapper) {
|
||||||
|
$this->backupCodeMapper = $backupCodeMapper;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function handle(Event $event): void {
|
||||||
|
if (!($event instanceof UserDeletedEvent)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->backupCodeMapper->deleteCodes($event->getUser());
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue