Merge pull request #39992 from nextcloud/backport/39770/stable25

[stable25] fix: always use display name from correct backend
nextcloud · Oct 9, 2023 · 8fa780b · 8fa780b
2 parents cddcba4 + 40056c8
commit 8fa780b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php
@@ -61,6 +61,7 @@
 use OCP\Mail\IMailer;
 use OCP\Security\ICrypto;
 use OCP\Security\VerificationToken\IVerificationToken;
+use OCP\User\Backend\IGetDisplayNameBackend;
 use OCP\Util;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -791,6 +792,10 @@ public function getAccount(IUser $user): IAccount {
 			return $this->internalCache->get($user->getUID());
 		}
 		$account = $this->parseAccountData($user, $this->getUser($user));
+		if ($user->getBackend() instanceof IGetDisplayNameBackend) {
+			$property = $account->getProperty(self::PROPERTY_DISPLAYNAME);
+			$account->setProperty(self::PROPERTY_DISPLAYNAME, $user->getDisplayName(), $property->getScope(), $property->getVerified());
+		}
 		$this->internalCache->set($user->getUID(), $account);
 		return $account;
 	}