Merge pull request #32016 from nextcloud/fix/PasswordUpdatedEvent_handling

Use stored user for PasswordUpdatedEvent

1 files changed, 18 insertions, 10 deletions

diff --git a/apps/files_external/lib/Listener/StorePasswordListener.php b/apps/files_external/lib/Listener/StorePasswordListener.php
index bd0c4dc1ffd..66232a78a93 100644
--- a/apps/files_external/lib/Listener/StorePasswordListener.php
+++ b/apps/files_external/lib/Listener/StorePasswordListener.php
@@ -50,19 +50,27 @@ class StorePasswordListener implements IEventListener {
 			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);
 		}
 	}
 }