Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 2 commits into from
Sep 12, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f748de
fix(ldap): avatar is not being fetched
blizzz Jul 3, 2023
00ac153
fix(LDAP): add return type hint and description
blizzz Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions apps/user_ldap/lib/User/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}

Expand All @@ -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
Expand Down
12 changes: 10 additions & 2 deletions apps/user_ldap/tests/User/UserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down