Skip to content

[stable23] Use stored user for PasswordUpdatedEvent #32975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 1 commit into from
Jul 5, 2022
Merged

[stable23] Use stored user for PasswordUpdatedEvent #32975

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Use stored user for PasswordUpdatedEvent 
When handling PasswordUpdatedEvent event, we are calling getLoginName which does not exists.

This PR adds a condition to use the previously stored user when handling PasswordUpdatedEvent.

Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
@artonge @backportbot-nextcloud
artonge authored and backportbot-nextcloud[bot] committed Jun 22, 2022
commit 48477ba33a20ccf7d2804b6467cbbec091a85316
28 changes: 18 additions & 10 deletions apps/files_external/lib/Listener/StorePasswordListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,27 @@ public function handle(Event $event): void {
return;
}

$stored = $this->credentialsManager->retrieve($event->getUser()->getUID(), LoginCredentials::CREDENTIALS_IDENTIFIER);
$update = isset($stored['password']) && $stored['password'] !== $event->getPassword();
if (!$update && $event instanceof UserLoggedInEvent) {
$update = isset($stored['user']) && $stored['user'] !== $event->getLoginName();
$storedCredentials = $this->credentialsManager->retrieve($event->getUser()->getUID(), LoginCredentials::CREDENTIALS_IDENTIFIER);

if (!$storedCredentials) {
return;
}

$newCredentials = $storedCredentials;
$shouldUpdate = false;

if (isset($storedCredentials['password']) && $storedCredentials['password'] !== $event->getPassword()) {
$shouldUpdate = true;
$newCredentials['password'] = $event->getPassword();
}

if ($stored && $update) {
$credentials = [
'user' => $event->getLoginName(),
'password' => $event->getPassword()
];
if (isset($storedCredentials['user']) && $event instanceof UserLoggedInEvent && $storedCredentials['user'] !== $event->getLoginName()) {
$shouldUpdate = true;
$newCredentials['user'] = $event->getLoginName();
}

$this->credentialsManager->store($event->getUser()->getUID(), LoginCredentials::CREDENTIALS_IDENTIFIER, $credentials);
if ($shouldUpdate) {
$this->credentialsManager->store($event->getUser()->getUID(), LoginCredentials::CREDENTIALS_IDENTIFIER, $newCredentials);
}
}
}