[stable27] fix(ldap): avatar is not being fetched

apps/user_ldap/lib/User/User.php

@@ -695,9 +695,9 @@ public function updateAvatarPostLogin($params) {
 
  /**
  * @brief attempts to get an image from LDAP and sets it as Nextcloud avatar
- * @return bool
+ * @return bool true when the avatar was set successfully or is up to date
  */
- public function updateAvatar($force = false) {
+ public function updateAvatar(bool $force = false): bool {
  if (!$force && $this->wasRefreshed('avatar')) {
  return false;
  }
@@ -714,7 +714,7 @@ public function updateAvatar($force = false) {
  // use the checksum before modifications
  $checksum = md5($this->image->data());
 
- if ($checksum === $this->config->getUserValue($this->uid, 'user_ldap', 'lastAvatarChecksum', '')) {
+ if ($checksum === $this->config->getUserValue($this->uid, 'user_ldap', 'lastAvatarChecksum', '') && $this->avatarExists()) {
  return true;
  }
 
@@ -728,6 +728,15 @@ public function updateAvatar($force = false) {
  return $isSet;
  }
 
+ private function avatarExists(): bool {
+ try {
+ $currentAvatar = $this->avatarManager->getAvatar($this->uid);
+ return $currentAvatar->exists() && $currentAvatar->isCustomAvatar();
+ } catch (\Exception $e) {
+ return false;
+ }
+ }
+
  /**
  * @brief sets an image as Nextcloud avatar
  * @return bool

apps/user_ldap/tests/User/UserTest.php

@@ -585,9 +585,17 @@ public function testUpdateAvatarKnownJpegPhotoProvided() {
  $avatar = $this->createMock(IAvatar::class);
  $avatar->expects($this->never())
  ->method('set');
+ $avatar->expects($this->any())
+ ->method('exists')
+ ->willReturn(true);
+ $avatar->expects($this->any())
+ ->method('isCustomAvatar')
+ ->willReturn(true);
 
- $this->avatarManager->expects($this->never())
- ->method('getAvatar');
+ $this->avatarManager->expects($this->any())
+ ->method('getAvatar')
+ ->with($this->uid)
+ ->willReturn($avatar);
 
  $this->connection->expects($this->any())
  ->method('resolveRule')