fix: Fire UserChangedEvent only after change happenned

come-nc · backportbot[bot] · commit 8355cb0e1048 · 2024-08-16T18:53:27.000Z
This is not a before event, so the user should already have been changed
 when it fires. Should fix issues with dav address book and newly mapped
 saml users.

Signed-off-by: Côme Chilliet &lt;come.chilliet@nextcloud.com&gt;
diff --git a/lib/UserBackend.php b/lib/UserBackend.php
@@ -657,8 +657,8 @@ public function updateAttributes($uid,
 			$currentDisplayname = $this->getDisplayName($uid);
 			if ($newDisplayname !== null
 				&& $currentDisplayname !== $newDisplayname) {
-				$this->eventDispatcher->dispatchTyped(new UserChangedEvent($user, 'displayName', $newDisplayname, $currentDisplayname));
 				$this->setDisplayName($uid, $newDisplayname);
+				$this->eventDispatcher->dispatchTyped(new UserChangedEvent($user, 'displayName', $newDisplayname, $currentDisplayname));
 			}
 
 			if ($newQuota !== null) {

Original file line number	Diff line number	Diff line change
`@@ -657,8 +657,8 @@ public function updateAttributes($uid,`
`657`	`657`	`$currentDisplayname = $this->getDisplayName($uid);`
`658`	`658`	`if ($newDisplayname !== null`
`659`	`659`	`&& $currentDisplayname !== $newDisplayname) {`
`660`		`- $this->eventDispatcher->dispatchTyped(new UserChangedEvent($user, 'displayName', $newDisplayname, $currentDisplayname));`
`661`	`660`	`$this->setDisplayName($uid, $newDisplayname);`
	`661`	`+ $this->eventDispatcher->dispatchTyped(new UserChangedEvent($user, 'displayName', $newDisplayname, $currentDisplayname));`
`662`	`662`	`}`
`663`	`663`
`664`	`664`	`if ($newQuota !== null) {`