Support vectorial images for avatars

car031 · car031 · commit 6b3754d9a2c0 · 2025-04-15T21:16:36.000+02:00
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/util/UserUtil.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/util/UserUtil.java
@@ -43,7 +43,7 @@ public class UserUtil {
 	/**
 	 * A transparent 1x1 PNG
 	 */
-	private static final String TRANSPARENT_IMAGE = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=";
+	private static final String TRANSPARENT_IMAGE = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=";
 
 	private static final Logger log = LoggerFactory.getLogger(UserUtil.class);
 
@@ -118,22 +118,29 @@ public static File getUsersDir() {
 	 * 
 	 * @param user The user to elaborate
 	 * @param avatarImageFile The file containing the avatar image
+	 * @param avatarImageFile The image type(eg png, svg)
 	 */
-	public static void saveAvatar(User user, File avatarImageFile) {
+	public static void saveAvatar(User user, File avatarImageFile, String imageType) {
 		UserDAO userDao = Context.get(UserDAO.class);
 		TenantDAO tenantDao = Context.get(TenantDAO.class);
 
 		File tmpAvatarImage = null;
 		try {
 			userDao.initialize(user);
-			String tenantName = tenantDao.getTenantName(user.getTenantId());
-			int size = Context.get().getProperties().getInt(tenantName + ".gui.avatar.size", 128);
+			if ("svg".equalsIgnoreCase(imageType)) {
+				// In case of SVG we save the image as is
+				user.setAvatar("data:image/svg+xml;base64," + ImageUtil.encodeImage(avatarImageFile));
+			} else {
+				// In case of raster image we crop and resize
+				String tenantName = tenantDao.getTenantName(user.getTenantId());
+				int size = Context.get().getProperties().getInt(tenantName + ".gui.avatar.size", 128);
+				tmpAvatarImage = FileUtil.createTempFile(AVATAR, ".png");
+				BufferedImage avatar = ImageIO.read(avatarImageFile);
+				avatar = ImageUtil.cropCenterSquare(avatar, size);
+				ImageIO.write(avatar, "png", tmpAvatarImage);
+				user.setAvatar("data:image/png;base64," + ImageUtil.encodeImage(tmpAvatarImage));
+			}
 
-			tmpAvatarImage = FileUtil.createTempFile(AVATAR, ".png");
-			BufferedImage avatar = ImageIO.read(avatarImageFile);
-			avatar = ImageUtil.cropCenterSquare(avatar, size);
-			ImageIO.write(avatar, "png", tmpAvatarImage);
-			user.setAvatar(ImageUtil.encodeImage(tmpAvatarImage));
 			userDao.store(user);
 		} catch (Exception t) {
 			log.warn(ERROR_GENERATING_DEFAULT_THE_AVATAR_FOR_USER, user, t);
@@ -150,7 +157,7 @@ public static void saveAvatar(User user, File avatarImageFile) {
 	 */
 	public static void generateDefaultAvatar(User user) {
 		UserDAO userDao = Context.get(UserDAO.class);
-		
+
 		File tmpAvatarImage = null;
 		try {
 			userDao.initialize(user);
@@ -162,7 +169,7 @@ public static void generateDefaultAvatar(User user) {
 
 			BufferedImage avatar = UserUtil.generateDefaultAvatarImage(user, size);
 			ImageIO.write(avatar, "png", tmpAvatarImage);
-			user.setAvatar(ImageUtil.encodeImage(tmpAvatarImage));
+			user.setAvatar("data:image/png;base64," + ImageUtil.encodeImage(tmpAvatarImage));
 
 			if (user.getType() != User.TYPE_SYSTEM) {
 				userDao.store(user);
diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIBranding.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIBranding.java
@@ -16,7 +16,7 @@ public class GUIBranding implements Serializable {
 
 	public static final String PNG_PREFIX = DATA_PREFIX + "png;base64,";
 
-	public static final String SVG_PREFIX = DATA_PREFIX + "svg+xml;base64,";
+	private static final String SVG_PREFIX = DATA_PREFIX + "svg+xml;base64,";
 
 	private static final String LOGO_OEM = PNG_PREFIX
 			+ "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";
diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/UserAvatar.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/UserAvatar.java
@@ -79,10 +79,7 @@ public void onSuccess(Void arg) {
 
 		MenuItem update = new MenuItem();
 		update.setTitle(I18N.message("update"));
-		update.addClickHandler(event -> {
-			Uploader uploader = new Uploader(userId);
-			uploader.show();
-		});
+		update.addClickHandler(click -> new Uploader(userId).show());
 
 		Menu contextMenu = new Menu();
 		contextMenu.setItems(reset, update);
@@ -110,7 +107,7 @@ public Uploader(long userId) {
 			setAutoSize(true);
 
 			saveButton = new IButton(I18N.message("save"));
-			saveButton.addClickHandler(event -> onSave());
+			saveButton.addClickHandler(click -> onSave());
 
 			Label hint = new Label(I18N.message("avatarhint", Session.get().getConfig(GUI_AVATAR_SIZE),
 					Session.get().getConfig(GUI_AVATAR_SIZE)));
@@ -175,7 +172,7 @@ public void onSuccess(Void result) {
 		public boolean equals(Object other) {
 			return super.equals(other);
 		}
-		
+
 		@Override
 		public int hashCode() {
 			return super.hashCode();
@@ -186,7 +183,7 @@ public int hashCode() {
 	public boolean equals(Object other) {
 		return super.equals(other);
 	}
-	
+
 	@Override
 	public int hashCode() {
 		return super.hashCode();
diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/AvatarServlet.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/AvatarServlet.java
@@ -1,18 +1,17 @@
 package com.logicaldoc.web;
 
-import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Base64;
 import java.util.Base64.Decoder;
 
-import javax.imageio.ImageIO;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,6 +32,8 @@ public class AvatarServlet extends HttpServlet {
 
 	private static final long serialVersionUID = -6956612970433309888L;
 
+	private static final String DATA_PREFIX = "data:image/";
+
 	private static final Logger log = LoggerFactory.getLogger(AvatarServlet.class);
 
 	/**
@@ -57,29 +58,40 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
 		try {
 			String id = request.getParameter(USER_ID);
 
-			String fileName = "avatar-" + id + ".png";
+			String content = UserUtil.getAvatarImage(id);
+			String fileName = "avatar-" + id + "." + getExtension(content);
+
 			response.setContentType(MimeType.getByFilename(fileName));
 			ServletUtil.setContentDisposition(request, response, fileName);
 
-			String content = UserUtil.getAvatarImage(id);
 			saveImage(content, response.getOutputStream());
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			ServletUtil.sendError(response, e.getMessage());
 		}
 	}
 
+	private String getExtension(String content) {
+		String extension = "png";
+		if (content.startsWith(DATA_PREFIX)) {
+			extension = content.substring(content.indexOf('/') + 1, content.indexOf(';') - 1);
+			if (extension.contains("+"))
+				extension = extension.substring(0, extension.indexOf('+'));
+		}
+		
+		System.out.println(extension);
+		
+		return extension;
+	}
+
 	private void saveImage(String content, OutputStream out) throws IOException {
-		BufferedImage image = null;
-		byte[] imageByte;
+		if (content.startsWith(DATA_PREFIX))
+			content = content.substring(content.indexOf(',') + 1);
 
 		Decoder decoder = Base64.getDecoder();
-		imageByte = decoder.decode(content);
+		byte[] imageByte = decoder.decode(content);
 		try (ByteArrayInputStream bis = new ByteArrayInputStream(imageByte)) {
-			image = ImageIO.read(bis);
+			IOUtils.write(imageByte, out);
 		}
-
-		// write the image to a file
-		ImageIO.write(image, "png", out);
 	}
 }
diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/SecurityServiceImpl.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/SecurityServiceImpl.java
@@ -89,6 +89,7 @@
 import com.logicaldoc.util.config.WebConfigurator;
 import com.logicaldoc.util.config.WebContextConfigurator;
 import com.logicaldoc.util.crypt.CryptUtil;
+import com.logicaldoc.util.io.FileUtil;
 import com.logicaldoc.util.security.PasswordCriteria;
 import com.logicaldoc.util.security.PasswordGenerator;
 import com.logicaldoc.util.security.PasswordValidator;
@@ -1572,12 +1573,12 @@ public void saveAvatar(long userId) throws ServerException {
 		Session session = validateSession();
 
 		Map<String, File> uploadedFilesMap = UploadServlet.getUploads(session.getSid());
-		File file = uploadedFilesMap.values().iterator().next();
+		Map.Entry<String, File> file = uploadedFilesMap.entrySet().iterator().next();
 		try {
 			UserDAO userDao = Context.get(UserDAO.class);
 			User user = userDao.findById(userId);
 			if (user != null)
-				UserUtil.saveAvatar(user, file);
+				UserUtil.saveAvatar(user, file.getValue(), FileUtil.getExtension(file.getKey()));
 		} catch (PersistenceException e) {
 			log.error("Unable to store the avatar", e);
 		} finally {
