Merge pull request #1491 from nextcloud/fix/avatar-caching

Fix avatar caching for non-user rendering
nextcloud-libraries · Oct 20, 2020 · 8e4e1f2 · 8e4e1f2
2 parents f6812c3 + 18f06e9
commit 8e4e1f2
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/components/Avatar/Avatar.vue b/src/components/Avatar/Avatar.vue
@@ -112,7 +112,9 @@ function getUserHasAvatar(userId) {
 }
 
 function setUserHasAvatar(userId, flag) {
-	browserStorage.setItem('user-has-avatar.' + userId, flag)
+	if (userId) {
+		browserStorage.setItem('user-has-avatar.' + userId, flag)
+	}
 }
 
 export default {
@@ -516,7 +518,7 @@ export default {
 		updateImageIfValid(url, srcset = null) {
 			// skip loading
 			const userHasAvatar = getUserHasAvatar(this.user)
-			if (typeof userHasAvatar === 'boolean') {
+			if (this.isUserDefined && typeof userHasAvatar === 'boolean') {
 				this.isAvatarLoaded = true
 				this.avatarUrlLoaded = url
 				if (srcset) {
@@ -539,8 +541,13 @@ export default {
 				setUserHasAvatar(this.user, true)
 			}
 			img.onerror = () => {
+				console.debug('Invalid avatar url', url)
+				// Avatar is invalid, reset
+				this.avatarUrlLoaded = null
+				this.avatarSrcSetLoaded = null
+
 				this.userDoesNotExist = true
-				this.isAvatarLoaded = true
+				this.isAvatarLoaded = false
 				setUserHasAvatar(this.user, false)
 			}