From ae5870f1fa9bbf045f1881664bb8a3a098fd2610 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 11 Dec 2018 16:14:14 +0300
Subject: avatar upload api

---
 src/main/java/com/juick/server/api/Users.java      | 26 +++++++++++++++-------
 .../com/juick/server/www/controllers/Settings.java |  2 --
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/com/juick/server/api/Users.java b/src/main/java/com/juick/server/api/Users.java
index 6f9ab290..f8fdba0c 100644
--- a/src/main/java/com/juick/server/api/Users.java
+++ b/src/main/java/com/juick/server/api/Users.java
@@ -20,19 +20,17 @@ package com.juick.server.api;
 import com.juick.User;
 import com.juick.model.ApplicationStatus;
 import com.juick.model.UserInfo;
-import com.juick.server.util.HttpForbiddenException;
-import com.juick.server.util.HttpNotFoundException;
+import com.juick.server.util.*;
 import com.juick.server.www.WebApp;
-import com.juick.service.CrosspostService;
-import com.juick.service.EmailService;
-import com.juick.service.MessagesService;
-import com.juick.service.UserService;
-import com.juick.server.util.UserUtils;
-import com.juick.server.util.WebUtils;
+import com.juick.service.*;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.inject.Inject;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -52,6 +50,10 @@ public class Users {
     private EmailService emailService;
     @Inject
     private WebApp webApp;
+    @Inject
+    private ImagesService imagesService;
+    @Value("${upload_tmp_dir:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
+    private String tmpDir;
 
     @RequestMapping(value = "/api/auth", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public String getAuthToken() {
@@ -96,6 +98,14 @@ public class Users {
         me.setAvatar(webApp.getAvatarUrl(visitor));
         return me;
     }
+    @PostMapping("/api/me/upload")
+    public void updateInfo(@RequestParam MultipartFile avatar) throws IOException {
+        User visitor = UserUtils.getCurrentUser();
+        String avatarTmpPath = HttpUtils.receiveMultiPartFile(avatar, tmpDir).getHost();
+        if (StringUtils.isNotEmpty(avatarTmpPath)) {
+            imagesService.saveAvatar(avatarTmpPath, visitor.getUid());
+        }
+    }
 
     @RequestMapping(value = "/api/users/read", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public List<User> doGetUserRead(
diff --git a/src/main/java/com/juick/server/www/controllers/Settings.java b/src/main/java/com/juick/server/www/controllers/Settings.java
index 57984aef..fc84b410 100644
--- a/src/main/java/com/juick/server/www/controllers/Settings.java
+++ b/src/main/java/com/juick/server/www/controllers/Settings.java
@@ -60,8 +60,6 @@ import java.util.stream.IntStream;
 public class Settings {
     private static final Logger logger = LoggerFactory.getLogger(Settings.class);
 
-    @Value("${img_path:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
-    private String imgDir;
     @Value("${upload_tmp_dir:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
     private String tmpDir;
     @Inject
-- 
cgit v1.2.3