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

Move event listener to dedicated class 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2020-07-30 11:53:09 +02:00
parent d1bd3ba594
commit 0b0cc48c88
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
2 changed files with 67 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php
View File

@ -27,6 +27,7 @@ namespace OCA\Files_External\Lib\Auth\Password;
use OCA\Files_External\Lib\Auth\AuthMechanism;
use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
use OCA\Files_External\Lib\StorageConfig;
use OCA\Files_External\Listener\StorePasswordListener;
use OCP\Authentication\Exceptions\CredentialsUnavailableException;
use OCP\Authentication\LoginCredentials\IStore as CredentialsStore;
use OCP\EventDispatcher\IEventDispatcher;
@ -64,28 +65,8 @@ class LoginCredentials extends AuthMechanism {
->addParameters([
]);
$eventDispatcher->addListener(UserLoggedInEvent::class, [$this, 'updateCredentials']);
$eventDispatcher->addListener(PasswordUpdatedEvent::class, [$this, 'updateCredentials']);
}
/**
* @param UserLoggedInEvent | PasswordUpdatedEvent $event
*/
public function updateCredentials($event) {
if ($event instanceof UserLoggedInEvent && $event->isTokenLogin()) {
return;
}
$stored = $this->credentialsManager->retrieve($event->getUser()->getUID(), self::CREDENTIALS_IDENTIFIER);
if ($stored && $stored['password'] != $event->getPassword()) {
$credentials = [
'user' => $stored['user'],
'password' => $event->getPassword()
];
$this->credentialsManager->store($event->getUser()->getUID(), self::CREDENTIALS_IDENTIFIER, $credentials);
}
$eventDispatcher->addServiceListener(UserLoggedInEvent::class, StorePasswordListener::class);
$eventDispatcher->addServiceListener(PasswordUpdatedEvent::class, StorePasswordListener::class);
}
private function getCredentials(IUser $user): array {

64
apps/files_external/lib/Listener/StorePasswordListener.php Normal file
View File

@ -0,0 +1,64 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2020, Morris Jobke <hey@morrisjobke.de>
*
* @author Morris Jobke <hey@morrisjobke.de>
*
* @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\Files_External\Listener;
use OCA\Files_External\Lib\Auth\Password\LoginCredentials;
use OCP\EventDispatcher\Event;
use OCP\EventDispatcher\IEventListener;
use OCP\Security\ICredentialsManager;
use OCP\User\Events\PasswordUpdatedEvent;
use OCP\User\Events\UserLoggedInEvent;
class StorePasswordListener implements IEventListener {
/** @var ICredentialsManager */
private $credentialsManager;
public function __construct(ICredentialsManager $credentialsManager) {
$this->credentialsManager = $credentialsManager;
}
public function handle(Event $event): void {
if (!$event instanceof UserLoggedInEvent && !$event instanceof PasswordUpdatedEvent) {
return;
}
if ($event instanceof UserLoggedInEvent && $event->isTokenLogin()) {
return;
}
$stored = $this->credentialsManager->retrieve($event->getUser()->getUID(), LoginCredentials::CREDENTIALS_IDENTIFIER);
if ($stored && $stored['password'] !== $event->getPassword()) {
$credentials = [
'user' => $stored['user'],
'password' => $event->getPassword()
];
$this->credentialsManager->store($event->getUser()->getUID(), LoginCredentials::CREDENTIALS_IDENTIFIER, $credentials);
}
}
}