From ac6c86ddd482721e7011dcb727e4099b8cdf84b1 Mon Sep 17 00:00:00 2001
From: Alexander Alexeev
Date: Sun, 11 Dec 2016 00:52:57 +0700
Subject: anonymous user support

---
 juick-api/src/main/java/com/juick/api/controllers/PM.java | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'juick-api/src/main/java/com/juick/api/controllers/PM.java')

diff --git a/juick-api/src/main/java/com/juick/api/controllers/PM.java b/juick-api/src/main/java/com/juick/api/controllers/PM.java
index 478ca75e..1bf1646b 100644
--- a/juick-api/src/main/java/com/juick/api/controllers/PM.java
+++ b/juick-api/src/main/java/com/juick/api/controllers/PM.java
@@ -18,17 +18,14 @@ import rocks.xmpp.addr.Jid;
 import rocks.xmpp.core.stanza.model.Message;
 
 import javax.inject.Inject;
-import java.security.Principal;
 import java.util.List;
 
 /**
- *
  * @author ugnich
  */
 @Controller
 @ResponseBody
 public class PM {
-
     @Inject
     UserService userService;
     @Inject
@@ -38,10 +35,8 @@ public class PM {
 
     @RequestMapping(value = "/pm", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public List<com.juick.Message> doGetPM(
-            Principal principal,
             @RequestParam(required = false) String uname) {
-        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();
@@ -60,11 +55,9 @@ public class PM {
 
     @RequestMapping(value = "/pm", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public com.juick.Message doPostPM(
-            Principal principal,
             @RequestParam String uname,
             @RequestParam String body) {
-        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();
@@ -96,7 +89,7 @@ public class PM {
             apiServer.getXmpp().send(msg);
 
             List<String> jids = userService.getJIDsbyUID(uid);
-            for (String jid: jids) {
+            for (String jid : jids) {
                 Message mm = new Message();
                 mm.setTo(Jid.of(jid));
                 mm.setType(Message.Type.CHAT);
-- 
cgit v1.2.3