OAuth authentication for Mastodon and ActivityPub C2S

1 files changed, 7 insertions, 11 deletions

diff --git a/src/main/java/com/juick/www/api/Messages.java b/src/main/java/com/juick/www/api/Messages.java
index 2993e805..c23976f4 100644
--- a/src/main/java/com/juick/www/api/Messages.java
+++ b/src/main/java/com/juick/www/api/Messages.java
@@ -30,14 +30,11 @@ import com.juick.service.MessagesService;
 import com.juick.service.TagService;
 import com.juick.service.UserService;
 import com.juick.service.component.SystemEvent;
-import com.juick.service.security.annotation.Visitor;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
-import org.springframework.security.access.annotation.Secured;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -70,9 +67,8 @@ public class Messages {
 
     // TODO: serialize image urls
 
-    @GetMapping("/api/home")
-    @Secured("ROLE_USER")
-    public List<Message> getHome(@Visitor User visitor,
+    @GetMapping({"/api/home"})
+    public List<Message> getHome(@ModelAttribute User visitor,
             @RequestParam(defaultValue = "0") int before_mid) {
         int vuid = visitor.getUid();
         List<Integer> mids = messagesService.getMyFeed(vuid, before_mid, true);
@@ -82,7 +78,7 @@ public class Messages {
     }
 
     @GetMapping("/api/messages")
-    public List<Message> getMessages(@Visitor User visitor,
+    public List<Message> getMessages(@ModelAttribute User visitor,
             @RequestParam(required = false) String uname,
             @RequestParam(name = "before_mid", defaultValue = "0") Integer before,
             @RequestParam(required = false, defaultValue = "0") Integer daysback,
@@ -140,7 +136,7 @@ public class Messages {
     }
 
     @DeleteMapping("/api/messages")
-    public CommandResult deleteMessage(@Visitor User visitor, @RequestParam int mid,
+    public CommandResult deleteMessage(@ModelAttribute User visitor, @RequestParam int mid,
             @RequestParam(required = false, defaultValue = "0") int rid) {
         if (rid > 0) {
             if (messagesService.deleteReply(visitor.getUid(), mid, rid)) {
@@ -154,7 +150,7 @@ public class Messages {
     }
 
     @GetMapping("/api/messages/discussions")
-    public List<Message> getDiscussions(@Visitor User visitor,
+    public List<Message> getDiscussions(@ModelAttribute User visitor,
             @RequestParam(required = false, defaultValue = "0") Long to) {
         List<Message> msgs = messagesService.getMessages(visitor, messagesService.getDiscussions(visitor.getUid(), to));
         msgs.forEach(m -> m.getUser().setAvatar(webApp.getAvatarUrl(m.getUser())));
@@ -162,7 +158,7 @@ public class Messages {
     }
 
     @GetMapping("/api/thread")
-    public List<Message> getThread(@Visitor User visitor, @RequestParam(defaultValue = "0") int mid,
+    public List<Message> getThread(@ModelAttribute User visitor, @RequestParam(defaultValue = "0") int mid,
             @RequestParam(defaultValue = "true") boolean showReplies) {
         Optional<Message> message = messagesService.getMessage(mid);
         if (message.isPresent()) {
@@ -192,7 +188,7 @@ public class Messages {
     }
 
     @GetMapping(value = "/api/thread/mark_read/{mid}-{rid}.gif", produces = MediaType.IMAGE_GIF_VALUE)
-    public byte[] markThreadRead(@Visitor User visitor, @PathVariable int mid, @PathVariable int rid)
+    public byte[] markThreadRead(@ModelAttribute User visitor, @PathVariable int mid, @PathVariable int rid)
             throws IOException {
         if (!visitor.isAnonymous()) {
             messagesService.setLastReadComment(visitor, mid, rid);