fix: adjust provisioning service to correctly update the display name…

… on login Signed-off-by: Julien Veyssier <[email protected]>
nextcloud · Nov 6, 2024 · bc6fcd3 · bc6fcd3
1 parent 42fde60
commit bc6fcd3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
@@ -78,7 +78,7 @@ public function createUser(int $providerId, string $userId, ?string $displayName
 	 */
 	public function deleteUser(string $userId): DataResponse {
 		$user = $this->userManager->get($userId);
-		if (is_null($user) || $user->getBackendClassName() !== 'user_oidc') {
+		if (is_null($user) || $user->getBackendClassName() !== Application::APP_ID) {
 			return new DataResponse(['message' => 'User not found'], Http::STATUS_NOT_FOUND);
 		}
 

diff --git a/lib/Controller/OcsApiController.php b/lib/Controller/OcsApiController.php
@@ -74,7 +74,7 @@ public function createUser(int $providerId, string $userId, ?string $displayName
 	 */
 	public function deleteUser(string $userId): DataResponse {
 		$user = $this->userManager->get($userId);
-		if (is_null($user) || $user->getBackendClassName() !== 'user_oidc') {
+		if (is_null($user) || $user->getBackendClassName() !== Application::APP_ID) {
 			return new DataResponse(['message' => 'User not found'], Http::STATUS_NOT_FOUND);
 		}
 

diff --git a/lib/Service/ProvisioningService.php b/lib/Service/ProvisioningService.php
@@ -7,6 +7,7 @@
 
 namespace OCA\UserOIDC\Service;
 
+use OCA\UserOIDC\AppInfo\Application;
 use OCA\UserOIDC\Db\UserMapper;
 use OCA\UserOIDC\Event\AttributeMappedEvent;
 use OCP\Accounts\IAccountManager;
@@ -163,6 +164,12 @@ public function provisionUser(string $tokenUserId, int $providerId, object $idTo
 				$oldDisplayName = $user->getDisplayName();
 				if ($newDisplayName !== $oldDisplayName) {
 					$user->setDisplayName($newDisplayName);
+					if ($user->getBackendClassName() === Application::APP_ID) {
+						$backendUser = $this->userMapper->getOrCreate($providerId, $user->getUID());
+						$backendUser->setDisplayName($newDisplayName);
+						$this->userMapper->update($backendUser);
+					}
+					$this->eventDispatcher->dispatchTyped(new UserChangedEvent($user, 'displayName', $newDisplayName, $oldDisplayName));
 				}
 			}
 		}