anonymous user support

1 files changed, 8 insertions, 19 deletions

diff --git a/juick-api/src/main/java/com/juick/api/controllers/Messages.java b/juick-api/src/main/java/com/juick/api/controllers/Messages.java
index 723d2f15..47053706 100644
--- a/juick-api/src/main/java/com/juick/api/controllers/Messages.java
+++ b/juick-api/src/main/java/com/juick/api/controllers/Messages.java
@@ -3,9 +3,9 @@ package com.juick.api.controllers;
 import com.juick.Tag;
 import com.juick.User;
 import com.juick.api.ApiServer;
+import com.juick.server.helpers.Status;
 import com.juick.server.util.HttpBadRequestException;
 import com.juick.server.util.HttpForbiddenException;
-import com.juick.server.helpers.Status;
 import com.juick.service.MessagesService;
 import com.juick.service.TagService;
 import com.juick.service.UserService;
@@ -25,7 +25,6 @@ import rocks.xmpp.addr.Jid;
 import rocks.xmpp.core.stanza.model.Message;
 
 import javax.inject.Inject;
-import java.security.Principal;
 import java.util.Collections;
 import java.util.List;
 
@@ -58,11 +57,9 @@ public class Messages {
 
     @RequestMapping("/home")
     public ResponseEntity<List<com.juick.Message>> getHome(
-            @RequestParam(defaultValue = "0") int before_mid,
-            Principal principal) {
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
-        if (visitor != null) {
+            @RequestParam(defaultValue = "0") int before_mid) {
+        User visitor = UserUtils.getCurrentUser();
+        if (!visitor.isAnonym()) {
             int vuid = visitor.getUid();
             List<Integer> mids = messagesService.getMyFeed(vuid, before_mid);
 
@@ -76,14 +73,12 @@ public class Messages {
 
     @RequestMapping("/messages")
     public ResponseEntity<List<com.juick.Message>> getMessages(
-            Principal principal,
             @RequestParam(required = false) String uname,
             @RequestParam(defaultValue = "0") int before_mid,
             @RequestParam(required = false) String popular,
             @RequestParam(required = false) String media,
             @RequestParam(required = false) String tag) {
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
+        User visitor = UserUtils.getCurrentUser();
         int vuid = visitor.getUid();
 
         List<Integer> mids;
@@ -126,10 +121,8 @@ public class Messages {
 
     @RequestMapping("/thread")
     public ResponseEntity<List<com.juick.Message>> getThread(
-            Principal principal,
             @RequestParam(defaultValue = "0") int mid) {
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
+        User visitor = UserUtils.getCurrentUser();
         int vuid = visitor.getUid();
         com.juick.Message msg = messagesService.getMessage(mid);
         if (msg != null) {
@@ -146,10 +139,8 @@ public class Messages {
 
     @RequestMapping("/messages/recommended")
     public ResponseEntity<List<com.juick.Message>> doGetRecommended(
-            Principal principal,
             @RequestParam(defaultValue = "0") int before_mid) {
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
+        User visitor = UserUtils.getCurrentUser();
         int vuid = visitor.getUid();
         if (vuid == 0) {
             return FORBIDDEN;
@@ -169,10 +160,8 @@ public class Messages {
     @RequestMapping("/messages/set_privacy")
     @ResponseBody
     public ResponseEntity<Status> doSetPrivacy(
-            Principal principal,
             @RequestParam(defaultValue = "0") int mid) {
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
+        User visitor = UserUtils.getCurrentUser();
         int vuid = visitor.getUid();
         if (vuid == 0) {
             throw new HttpForbiddenException();