diff options
| -rw-r--r-- | apps/files_external/lib/Listener/StorePasswordListener.php | 9 | ||||
| -rw-r--r-- | lib/private/Server.php | 2 | ||||
| -rw-r--r-- | lib/public/User/Events/UserLoggedInEvent.php | 13 |
3 files changed, 19 insertions, 5 deletions
diff --git a/apps/files_external/lib/Listener/StorePasswordListener.php b/apps/files_external/lib/Listener/StorePasswordListener.php index f1683af2ecb..a2c359e58db 100644 --- a/apps/files_external/lib/Listener/StorePasswordListener.php +++ b/apps/files_external/lib/Listener/StorePasswordListener.php @@ -51,11 +51,14 @@ class StorePasswordListener implements IEventListener { } $stored = $this->credentialsManager->retrieve($event->getUser()->getUID(), LoginCredentials::CREDENTIALS_IDENTIFIER); + $update = $stored['password'] !== $event->getPassword(); + if (!$update && $event instanceof UserLoggedInEvent) { + $update = $stored['user'] !== $event->getLoginName(); + } - if ($stored && ($stored['user'] !== $event->getUser()->getUID() - || $stored['password'] !== $event->getPassword())) { + if ($stored && $update) { $credentials = [ - 'user' => $event->getUser()->getUID(), + 'user' => $event->getLoginName(), 'password' => $event->getPassword() ]; diff --git a/lib/private/Server.php b/lib/private/Server.php index 1114e60f475..ba954165799 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -575,7 +575,7 @@ class Server extends ServerContainer implements IServerContainer { /** @var IEventDispatcher $dispatcher */ $dispatcher = $this->get(IEventDispatcher::class); - $dispatcher->dispatchTyped(new UserLoggedInEvent($user, $password, $isTokenLogin)); + $dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin)); }); $userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) { /** @var IEventDispatcher $dispatcher */ diff --git a/lib/public/User/Events/UserLoggedInEvent.php b/lib/public/User/Events/UserLoggedInEvent.php index e2cb37a64dc..7d0c0bf41de 100644 --- a/lib/public/User/Events/UserLoggedInEvent.php +++ b/lib/public/User/Events/UserLoggedInEvent.php @@ -43,14 +43,18 @@ class UserLoggedInEvent extends Event { /** @var bool */ private $isTokenLogin; + /** @var string */ + private $loginName; + /** * @since 18.0.0 */ - public function __construct(IUser $user, string $password, bool $isTokenLogin) { + public function __construct(IUser $user, string $loginName, string $password, bool $isTokenLogin) { parent::__construct(); $this->user = $user; $this->password = $password; $this->isTokenLogin = $isTokenLogin; + $this->loginName = $loginName; } /** @@ -61,6 +65,13 @@ class UserLoggedInEvent extends Event { } /** + * @since 21.0.0 + */ + public function getLoginName(): string { + return $this->loginName; + } + + /** * @since 18.0.0 */ public function getPassword(): string { |