Skip to content

Commit 008afd6

Browse files
authored
Merge pull request #10731 from nextcloud/backport/10728/stable4.2
[stable4.2] fix: handle 204 response
2 parents 5a31301 + 413b6fe commit 008afd6

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

src/service/AvatarService.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,18 @@ export const fetchAvatarUrl = (email) => {
1717
})
1818

1919
return Axios.get(url, { adapter: 'fetch', fetchOptions: { priority: 'low' } })
20-
.then((resp) => resp.data)
21-
.then((avatar) => {
22-
if (avatar.isExternal) {
20+
.then(res => {
21+
if (res.status === 204) {
22+
return undefined
23+
}
24+
25+
if (res.data.isExternal) {
2326
return generateUrl('/apps/mail/api/avatars/image/{email}', {
2427
email,
2528
})
26-
} else {
27-
return avatar.url
28-
}
29-
})
30-
.catch((err) => {
31-
if (err.response.status === 404) {
32-
return undefined
3329
}
3430

35-
return Promise.reject(err)
31+
return res.data.url
3632
})
3733
}
3834

0 commit comments

Comments
 (0)