diff --git a/appinfo/info.xml b/appinfo/info.xml index 6d72844..0c4c844 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -22,7 +22,7 @@ auth - + \OCA\UserSQL\Settings\Admin diff --git a/lib/Backend/UserBackend.php b/lib/Backend/UserBackend.php index 095fda3..fca2959 100644 --- a/lib/Backend/UserBackend.php +++ b/lib/Backend/UserBackend.php @@ -34,11 +34,9 @@ use OCA\UserSQL\Crypto\IPasswordAlgorithm; use OCA\UserSQL\Model\User; use OCA\UserSQL\Properties; use OCA\UserSQL\Repository\UserRepository; -use OCP\EventDispatcher\IEventDispatcher; use OCP\IConfig; use OCP\IL10N; use OCP\ILogger; -use OCP\Security\Events\ValidatePasswordPolicyEvent; use OCP\User\Backend\ABackend; use OCP\User\Backend\ICheckPasswordBackend; use OCP\User\Backend\ICountUsersBackend; @@ -98,10 +96,6 @@ final class UserBackend extends ABackend implements * @var EventDispatcher The event dispatcher. */ private $eventDispatcher; - /** - * @var IEventDispatcher The new event dispatcher. - */ - private $newEventDispatcher; /** * @var IUserAction[] The actions to execute. */ @@ -118,12 +112,11 @@ final class UserBackend extends ABackend implements * @param IL10N $localization The localization service. * @param IConfig $config The config instance. * @param EventDispatcher $eventDispatcher The event dispatcher. - * @param IEventDispatcher $newEventDispatcher The new event dispatcher. */ public function __construct( $AppName, Cache $cache, ILogger $logger, Properties $properties, UserRepository $userRepository, IL10N $localization, IConfig $config, - EventDispatcher $eventDispatcher, IEventDispatcher $newEventDispatcher + EventDispatcher $eventDispatcher ) { $this->appName = $AppName; $this->cache = $cache; @@ -133,7 +126,6 @@ final class UserBackend extends ABackend implements $this->localization = $localization; $this->config = $config; $this->eventDispatcher = $eventDispatcher; - $this->newEventDispatcher = $newEventDispatcher; $this->actions = []; $this->initActions(); @@ -523,8 +515,10 @@ final class UserBackend extends ABackend implements return false; } - $event = new ValidatePasswordPolicyEvent($password); - $this->newEventDispatcher->dispatchTyped($event); + $event = new GenericEvent($password); + $this->eventDispatcher->dispatch( + 'OCP\PasswordPolicy::validate', $event + ); $user = $this->userRepository->findByUid($uid); if (!($user instanceof User)) {