Skip to content

fix(NcAvatar): redirect to guest avatar if avatar doesnt exist #8440

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
skjnldsv merged 1 commit into from
Apr 19, 2026
+22 −22
Merged

fix(NcAvatar): redirect to guest avatar if avatar doesnt exist #8440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/utils/getAvatarUrl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ interface AvatarUrlOptions {
*/
export function getAvatarUrl(user: string, options?: AvatarUrlOptions): string {
// backend only supports 64 and 512px
// so we only requrest the needed size for better caching of the request.
// so we only request the needed size for better caching of the request.
const size = (options?.size || 64) <= 64
? 64
: 512
Expand All @@ -45,7 +45,7 @@ export function getAvatarUrl(user: string, options?: AvatarUrlOptions): string {
? '/dark'
: ''

return generateUrl(`/avatar${guestUrl}/{user}/{size}${themeUrl}`, {
return generateUrl(`/avatar${guestUrl}/{user}/{size}${themeUrl}?guestFallback=true`, {
user,
size,
})
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/components/NcAvatar/NcAvatar.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ describe('NcAvatar.vue', () => {
await nextTick()

expect(wrapper.find('img').exists()).toBeTruthy()
expect(wrapper.find('img').attributes('src')).toMatch(/avatar\/user1\/64$/)
expect(wrapper.find('img').attributes('src')).toMatch(/avatar\/user1\/64\?guestFallback=true$/)
})

it('should render image with avatar url pointing to a user', async () => {
Expand Down
38 changes: 19 additions & 19 deletions tests/unit/utils/getAvatarUrl.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,56 +12,56 @@ describe('getAvatarUrl', () => {
})

it('should return correct relative URL for user avatar', () => {
expect(getAvatarUrl('alice')).toBe('//index.php/avatar/alice/64')
expect(getAvatarUrl('john', { size: 64 })).toBe('//index.php/avatar/john/64')
expect(getAvatarUrl('alice')).toBe('//index.php/avatar/alice/64?guestFallback=true')
expect(getAvatarUrl('john', { size: 64 })).toBe('//index.php/avatar/john/64?guestFallback=true')
})

it('should return correct relative URL with fixed sizes', () => {
/// @ts-expect-error testing invalid value
expect(getAvatarUrl('alice', { size: 0 })).toBe('//index.php/avatar/alice/64')
expect(getAvatarUrl('alice', { size: 0 })).toBe('//index.php/avatar/alice/64?guestFallback=true')
/// @ts-expect-error testing invalid value
expect(getAvatarUrl('alice', { size: -1 })).toBe('//index.php/avatar/alice/64')
expect(getAvatarUrl('john', { size: 64 })).toBe('//index.php/avatar/john/64')
expect(getAvatarUrl('alice', { size: -1 })).toBe('//index.php/avatar/alice/64?guestFallback=true')
expect(getAvatarUrl('john', { size: 64 })).toBe('//index.php/avatar/john/64?guestFallback=true')
/// @ts-expect-error testing invalid value
expect(getAvatarUrl('john', { size: 65 })).toBe('//index.php/avatar/john/512')
expect(getAvatarUrl('john', { size: 512 })).toBe('//index.php/avatar/john/512')
expect(getAvatarUrl('john', { size: 65 })).toBe('//index.php/avatar/john/512?guestFallback=true')
expect(getAvatarUrl('john', { size: 512 })).toBe('//index.php/avatar/john/512?guestFallback=true')
})

it('should return correct relative URL for user avatar in dark mode', () => {
document.body.style.setProperty('--background-invert-if-dark', 'invert(100%)')

expect(getAvatarUrl('alice')).toBe('//index.php/avatar/alice/64/dark')
expect(getAvatarUrl('john', { size: 512 })).toBe('//index.php/avatar/john/512/dark')
expect(getAvatarUrl('alice')).toBe('//index.php/avatar/alice/64/dark?guestFallback=true')
expect(getAvatarUrl('john', { size: 512 })).toBe('//index.php/avatar/john/512/dark?guestFallback=true')
})

it('should return correct relative URL for user avatar in dark mode if enforced', () => {
expect(getAvatarUrl('alice', { isDarkTheme: true })).toBe('//index.php/avatar/alice/64/dark')
expect(getAvatarUrl('john', { isDarkTheme: true, size: 512 })).toBe('//index.php/avatar/john/512/dark')
expect(getAvatarUrl('alice', { isDarkTheme: true })).toBe('//index.php/avatar/alice/64/dark?guestFallback=true')
expect(getAvatarUrl('john', { isDarkTheme: true, size: 512 })).toBe('//index.php/avatar/john/512/dark?guestFallback=true')
})

it('should return correct relative URL for user avatar in bright mode if enforced but body is darkmode', () => {
document.body.style.setProperty('--background-invert-if-dark', 'invert(100%)')

expect(getAvatarUrl('alice', { isDarkTheme: false })).toBe('//index.php/avatar/alice/64')
expect(getAvatarUrl('john', { isDarkTheme: false, size: 512 })).toBe('//index.php/avatar/john/512')
expect(getAvatarUrl('alice', { isDarkTheme: false })).toBe('//index.php/avatar/alice/64?guestFallback=true')
expect(getAvatarUrl('john', { isDarkTheme: false, size: 512 })).toBe('//index.php/avatar/john/512?guestFallback=true')
})

it('should return correct relative URL for user avatar in dark mode', () => {
document.body.style.setProperty('--background-invert-if-dark', 'invert(100%)')

expect(getAvatarUrl('alice')).toBe('//index.php/avatar/alice/64/dark')
expect(getAvatarUrl('john', { size: 64 })).toBe('//index.php/avatar/john/64/dark')
expect(getAvatarUrl('alice')).toBe('//index.php/avatar/alice/64/dark?guestFallback=true')
expect(getAvatarUrl('john', { size: 64 })).toBe('//index.php/avatar/john/64/dark?guestFallback=true')
})

it('should return correct relative URL for guest avatar', () => {
expect(getAvatarUrl('alice', { isGuest: true })).toBe('//index.php/avatar/guest/alice/64')
expect(getAvatarUrl('john', { size: 64, isGuest: true })).toBe('//index.php/avatar/guest/john/64')
expect(getAvatarUrl('alice', { isGuest: true })).toBe('//index.php/avatar/guest/alice/64?guestFallback=true')
expect(getAvatarUrl('john', { size: 64, isGuest: true })).toBe('//index.php/avatar/guest/john/64?guestFallback=true')
})

it('should return correct relative URL for guest avatar in dark mode', () => {
document.body.style.setProperty('--background-invert-if-dark', 'invert(100%)')

expect(getAvatarUrl('alice', { isGuest: true })).toBe('//index.php/avatar/guest/alice/64/dark')
expect(getAvatarUrl('john', { size: 64, isGuest: true })).toBe('//index.php/avatar/guest/john/64/dark')
expect(getAvatarUrl('alice', { isGuest: true })).toBe('//index.php/avatar/guest/alice/64/dark?guestFallback=true')
expect(getAvatarUrl('john', { size: 64, isGuest: true })).toBe('//index.php/avatar/guest/john/64/dark?guestFallback=true')
})
})
Loading