OAuth authentication for Mastodon and ActivityPub C2S

1 files changed, 7 insertions, 14 deletions

diff --git a/src/main/java/com/juick/www/api/Post.java b/src/main/java/com/juick/www/api/Post.java
index c840a590..2a92178d 100644
--- a/src/main/java/com/juick/www/api/Post.java
+++ b/src/main/java/com/juick/www/api/Post.java
@@ -37,7 +37,6 @@ import com.juick.service.MessagesService;
 import com.juick.service.StorageService;
 import com.juick.service.UserService;
 import com.juick.service.activities.UpdateEvent;
-import com.juick.service.security.annotation.Visitor;
 import com.juick.util.HttpBadRequestException;
 import com.juick.util.HttpForbiddenException;
 import com.juick.util.HttpNotFoundException;
@@ -49,13 +48,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -81,7 +74,7 @@ public class Post {
     @RequestMapping(value = "/api/post", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(value = HttpStatus.OK)
     public CommandResult doPostMessage(
-            @Visitor User visitor,
+            @ModelAttribute User visitor,
             @RequestParam(required = false, defaultValue = StringUtils.EMPTY) String body,
             @RequestParam(required = false) String img,
             @RequestParam(required = false) MultipartFile attach) throws Exception {
@@ -112,7 +105,7 @@ public class Post {
 
     @RequestMapping(value = "/api/comment", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     public CommandResult doPostComment(
-            @Visitor User visitor,
+            @ModelAttribute User visitor,
             @RequestParam(defaultValue = "0") int mid,
             @RequestParam(defaultValue = "0") int rid,
             @RequestParam(required = false, defaultValue = StringUtils.EMPTY) final String body,
@@ -164,7 +157,7 @@ public class Post {
 
     @PostMapping("/api/like")
     @ResponseStatus(value = HttpStatus.OK)
-    public Status doPostRecommendation(@Visitor User visitor, @RequestParam Integer mid) throws Exception {
+    public Status doPostRecommendation(@ModelAttribute User visitor, @RequestParam Integer mid) throws Exception {
         Optional<Message> message = messagesService.getMessage(mid);
         if (message.isEmpty()) {
             throw new HttpNotFoundException();
@@ -180,7 +173,7 @@ public class Post {
 
     @PostMapping("/api/subscribe")
     @ResponseStatus(value = HttpStatus.OK)
-    public Status doPostSubscribe(@Visitor User visitor,
+    public Status doPostSubscribe(@ModelAttribute User visitor,
                                   @RequestParam Integer mid) throws Exception {
         Optional<Message> message = messagesService.getMessage(mid);
         if (message.isEmpty()) {
@@ -204,7 +197,7 @@ public class Post {
     @PostMapping("/api/react")
     @ResponseStatus(value = HttpStatus.OK)
     public Status doPostReact(
-            @Visitor User visitor,
+            @ModelAttribute User visitor,
             @RequestParam Integer mid, @RequestParam @NotNull int reactionId,
             @RequestParam(required = false, defaultValue = "1") int count) {
 
@@ -226,7 +219,7 @@ public class Post {
     }
 
     @PostMapping("/api/update")
-    public CommandResult updateMessage(@Visitor User visitor,
+    public CommandResult updateMessage(@ModelAttribute User visitor,
                                        @RequestParam Integer mid,
                                        @RequestParam(required = false, defaultValue = "0") Integer rid,
                                        @RequestParam String body) {