Merge pull request #886 from nextcloud/fix/log-attribute-update

fix: Log attribute updates
nextcloud · Oct 8, 2024 · e08e742 · e08e742
2 parents a8139e3 + f0f870d
commit e08e742
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 38 deletions.
diff --git a/lib/UserBackend.php b/lib/UserBackend.php
@@ -564,23 +564,52 @@ public function updateAttributes(string $uid, array $attributes): void {
 		}
 
 		if ($user !== null) {
-			$currentEmail = (string)(method_exists($user, 'getSystemEMailAddress') ? $user->getSystemEMailAddress() : $user->getEMailAddress());
+			$this->logger->debug('Updating attributes for existing user', ['app' => 'user_saml', 'user' => $user->getUID()]);
+			$currentEmail = (string)$user->getSystemEMailAddress();
 			if ($newEmail !== null
 				&& $currentEmail !== $newEmail) {
-				$user->setEMailAddress($newEmail);
+				$user->setSystemEMailAddress($newEmail);
+				$this->logger->debug('Email address updated', ['app' => 'user_saml', 'user' => $user->getUID()]);
+			} else {
+				$this->logger->debug('Email address not updated', [
+					'app' => 'user_saml',
+					'user' => $user->getUID(),
+					'currentEmail' => $currentEmail,
+					'newEmail' => $newEmail,
+				]);
 			}
 			$currentDisplayname = $this->getDisplayName($uid);
 			if ($newDisplayname !== null
 				&& $currentDisplayname !== $newDisplayname) {
 				$this->setDisplayName($uid, $newDisplayname);
+				$this->logger->debug('Display name updated', ['app' => 'user_saml', 'user' => $user->getUID()]);
 				$this->eventDispatcher->dispatchTyped(new UserChangedEvent($user, 'displayName', $newDisplayname, $currentDisplayname));
+				$this->logger->debug('Display name update event dispatched', ['app' => 'user_saml', 'user' => $user->getUID()]);
+			} else {
+				$this->logger->debug('Display name not updated', [
+					'app' => 'user_saml',
+					'user' => $user->getUID(),
+					'newDisplayname' => $newDisplayname,
+					'currentDisplayname' => $currentDisplayname,
+				]);
 			}
 
 			if ($newQuota !== null) {
 				$user->setQuota($newQuota);
+				$this->logger->debug('Quota updated', ['app' => 'user_saml', 'user' => $user->getUID()]);
+			} else {
+				$this->logger->debug('Quota not updated', [
+					'app' => 'user_saml',
+					'user' => $user->getUID(),
+				]);
 			}
 
 			$this->groupManager->handleIncomingGroups($user, $newGroups ?? []);
+			$this->logger->debug('Incoming groups updated', [
+				'app' => 'user_saml',
+				'user' => $user->getUID(),
+				'groups' => $newGroups,
+			]);
 		}
 	}
 

diff --git a/tests/unit/UserBackendTest.php b/tests/unit/UserBackendTest.php
@@ -114,20 +114,13 @@ public function testUpdateAttributesWithoutAttributes() {
 			->method('get')
 			->with('ExistingUser')
 			->willReturn($user);
-		if (method_exists($user, 'getSystemEMailAddress')) {
-			$user
-				->expects($this->once())
-				->method('getSystemEMailAddress')
-				->willReturn(null);
-		} else {
-			$user
-				->expects($this->once())
-				->method('getEMailAddress')
-				->willReturn(null);
-		}
+		$user
+			->expects($this->once())
+			->method('getSystemEMailAddress')
+			->willReturn(null);
 		$user
 			->expects($this->never())
-			->method('setEMailAddress');
+			->method('setSystemEMailAddress');
 		$this->userBackend
 			->expects($this->once())
 			->method('getDisplayName')
@@ -187,20 +180,13 @@ public function testUpdateAttributes() {
 			->method('get')
 			->with('ExistingUser')
 			->willReturn($user);
-		if (method_exists($user, 'getSystemEMailAddress')) {
-			$user
-				->expects($this->once())
-				->method('getSystemEMailAddress')
-				->willReturn('[email protected]');
-		} else {
-			$user
-				->expects($this->once())
-				->method('getEMailAddress')
-				->willReturn('[email protected]');
-		}
 		$user
 			->expects($this->once())
-			->method('setEMailAddress')
+			->method('getSystemEMailAddress')
+			->willReturn('[email protected]');
+		$user
+			->expects($this->once())
+			->method('setSystemEMailAddress')
 			->with('[email protected]');
 		$user
 			->expects($this->once())
@@ -251,20 +237,13 @@ public function testUpdateAttributesQuotaDefaultFallback() {
 			->method('get')
 			->with('ExistingUser')
 			->willReturn($user);
-		if (method_exists($user, 'getSystemEMailAddress')) {
-			$user
-				->expects($this->once())
-				->method('getSystemEMailAddress')
-				->willReturn('[email protected]');
-		} else {
-			$user
-				->expects($this->once())
-				->method('getEMailAddress')
-				->willReturn('[email protected]');
-		}
 		$user
 			->expects($this->once())
-			->method('setEMailAddress')
+			->method('getSystemEMailAddress')
+			->willReturn('[email protected]');
+		$user
+			->expects($this->once())
+			->method('setSystemEMailAddress')
 			->with('[email protected]');
 		$user
 			->expects($this->once())