XWIKI-10998: After a user deletes his avatar, "User Avatar" is not correctly displayed

- The macro is now checking if the attachment file exists
- Added test and updated existing ones

xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-useravatar/src/main/java/org/xwiki/rendering/internal/macro/useravatar/UserAvatarMacro.java

@@ -27,6 +27,7 @@
 import javax.inject.Singleton;
 
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
 import org.xwiki.bridge.DocumentAccessBridge;
 import org.xwiki.bridge.SkinAccessBridge;
 import org.xwiki.component.annotation.Component;
@@ -102,6 +103,12 @@ public class UserAvatarMacro extends AbstractMacro<UserAvatarMacroParameters>
     @Named("current")
     private EntityReferenceValueProvider currentEntityReferenceValueProvider;
 
+    /**
+     * Logging framework.
+     */
+    @Inject
+    private Logger logger;
+
     /**
      * Create and initialize the descriptor of the macro.
      */
@@ -134,14 +141,27 @@ public List<Block> execute(UserAvatarMacroParameters parameters, String content,
                 + "] is not registered in this wiki");
         }
 
-        ResourceReference imageReference;
-        if (StringUtils.isBlank(fileName)) {
-            imageReference = new ResourceReference(this.skinAccessBridge.getSkinFile("noavatar.png"), ResourceType.URL);
-        } else {
+        // Initialize with the default avatar.
+        ResourceReference imageReference =
+            new ResourceReference(this.skinAccessBridge.getSkinFile("noavatar.png"), ResourceType.URL);
+
+        // Try to use the configured avatar.
+        if (!StringUtils.isBlank(fileName)) {
             AttachmentReference attachmentReference = new AttachmentReference(fileName, userReference);
-            imageReference =
-                new ResourceReference(this.compactWikiEntityReferenceSerializer.serialize(attachmentReference),
-                    ResourceType.ATTACHMENT);
+
+            // Check if the configured avatar file actually exists.
+            try {
+                if (documentAccessBridge.getAttachmentVersion(attachmentReference) != null) {
+                    // Use it.
+                    imageReference =
+                        new ResourceReference(this.compactWikiEntityReferenceSerializer.serialize(attachmentReference),
+                            ResourceType.ATTACHMENT);
+                }
+            } catch (Exception e) {
+                // Log and fallback on default.
+                logger.warn("Failed to get the avatar for user [{}]. Using default.",
+                    this.compactWikiEntityReferenceSerializer.serialize(userReference));
+            }
         }
         ImageBlock imageBlock = new ImageBlock(imageReference, false);
 

xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-useravatar/src/test/java/org/xwiki/rendering/macro/useravatar/IntegrationTests.java

@@ -67,6 +67,8 @@ public void initialize(ComponentManager componentManager) throws Exception
         final DocumentReference userWithoutAvatarReference =
             new DocumentReference("wiki", "XWiki", "ExistingUserWithoutAvatar");
         final DocumentReference userNotExistingReference = new DocumentReference("wiki", "XWiki", "UserNotExisting");
+        final DocumentReference userWithNonExistingAvatarFileReference =
+            new DocumentReference("wiki", "XWiki", "UserWithNonExistingAvatarFile");
         final DocumentReference userClassReference = new DocumentReference("wiki", "XWiki", "XWikiUsers");
         final DocumentAccessBridge mockDocumentAccessBridge =
             registerMockComponent(componentManager, mockery, DocumentAccessBridge.class);
@@ -75,10 +77,19 @@ public void initialize(ComponentManager componentManager) throws Exception
             allowing(mockDocumentAccessBridge).exists(userWithoutAvatarReference); will(returnValue(true));
             allowing(mockDocumentAccessBridge).exists(with(any(String.class))); will(returnValue(false));
             allowing(mockDocumentAccessBridge).exists(userNotExistingReference); will(returnValue(false));
+            allowing(mockDocumentAccessBridge).exists(userWithNonExistingAvatarFileReference); will(returnValue(true));
+
             allowing(mockDocumentAccessBridge).getProperty(adminUserReference, userClassReference, "avatar");
                 will(returnValue("mockAvatar.png"));
             allowing(mockDocumentAccessBridge).getProperty(userWithoutAvatarReference, userClassReference,
                 "avatar"); will(returnValue(null));
+            allowing(mockDocumentAccessBridge).getProperty(userWithNonExistingAvatarFileReference,
+                userClassReference, "avatar"); will(returnValue("mockAvatar.png"));
+
+            allowing(mockDocumentAccessBridge).getAttachmentVersion(new AttachmentReference("mockAvatar.png",
+                adminUserReference)); will(returnValue("1.1"));
+            allowing(mockDocumentAccessBridge).getAttachmentVersion(new AttachmentReference("mockAvatar.png",
+                userWithNonExistingAvatarFileReference)); will(returnValue(null));
         }});
 
         // Document Resolver Mock
@@ -94,6 +105,9 @@ public void initialize(ComponentManager componentManager) throws Exception
             allowing(mockDocumentReferenceResolver).resolve("XWiki.UserNotExisting",
                 new EntityReference("XWiki", EntityType.SPACE));
                 will(returnValue(userNotExistingReference));
+            allowing(mockDocumentReferenceResolver).resolve("XWiki.UserWithNonExistingAvatarFile",
+                new EntityReference("XWiki", EntityType.SPACE));
+                will(returnValue(userWithNonExistingAvatarFileReference));
         }});
 
         // Entity Reference Serializer Mock
@@ -105,6 +119,9 @@ public void initialize(ComponentManager componentManager) throws Exception
                 will(returnValue("XWiki.Admin@mockAvatar.png"));
             allowing(mockEntityReferenceSerializer).serialize(userNotExistingReference);
                 will(returnValue("XWiki.UserNotExisting"));
+            allowing(mockEntityReferenceSerializer).serialize(
+                new AttachmentReference("mockAvatar.png", userWithNonExistingAvatarFileReference));
+                will(returnValue("XWiki.UserWithNonExistingAvatarFile@mockAvatar.png"));
         }});
 
         // Entity Reference Serializer Mock

xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-useravatar/src/test/resources/macrouseravatar4.test

+.runTransformations
+.#--------------------------------------------------------------------
+.input|xwiki/2.0
+.# Verify that the macro generates an error if the user doesn't exist.
+.#--------------------------------------------------------------------
+{{useravatar username="XWiki.UserWithNonExistingAvatarFile" /}}
+.#--------------------------------------------------------------------
+.expect|event/1.0
+.#--------------------------------------------------------------------
+beginDocument
+beginMacroMarkerStandalone [useravatar] [username=XWiki.UserWithNonExistingAvatarFile]
+onImage [Typed = [true] Type = [url] Reference = [/xwiki/noavatar.png]] [false] [[alt]=[Picture of UserWithNonExistingAvatarFile][title]=[UserWithNonExistingAvatarFile]]
+endMacroMarkerStandalone [useravatar] [username=XWiki.UserWithNonExistingAvatarFile]
+endDocument
\ No newline at end of file