i18n, using SecurityContextHolder for get currentUser (user always not null)

1 files changed, 5 insertions, 11 deletions

diff --git a/juick-spring-www/src/main/java/com/juick/www/controllers/PMController.java b/juick-spring-www/src/main/java/com/juick/www/controllers/PMController.java
index 15a93684..41c6b33c 100644
--- a/juick-spring-www/src/main/java/com/juick/www/controllers/PMController.java
+++ b/juick-spring-www/src/main/java/com/juick/www/controllers/PMController.java
@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import rocks.xmpp.addr.Jid;
 
 import javax.inject.Inject;
-import java.security.Principal;
 import java.util.List;
 
 /**
@@ -41,9 +40,8 @@ public class PMController {
     WebApp webApp;
 
     @RequestMapping("/pm/inbox")
-    public String doGetInbox(Principal principal, ModelMap context) {
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
+    public String doGetInbox(ModelMap context) {
+        User visitor = UserUtils.getCurrentUser();
         String title = "PM: Inbox";
         List<Message> msgs = pmQueriesService.getLastPMInbox(visitor.getUid());
         msgs.forEach(m -> m.setText(MessageUtils.formatMessage(m.getText())));
@@ -56,12 +54,10 @@ public class PMController {
 
     @RequestMapping(value = "/pm/sent", method = RequestMethod.GET)
     public String doGetSent(
-            Principal principal,
             @RequestParam String uname,
             ModelMap context) {
         String title = "PM: Sent";
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
+        User visitor = UserUtils.getCurrentUser();
         List<com.juick.Message> msgs = pmQueriesService.getLastPMSent(visitor.getUid());
 
         if (WebUtils.isNotUserName(uname)) {
@@ -77,12 +73,10 @@ public class PMController {
 
     @RequestMapping(value = "/pm/sent", method = RequestMethod.POST)
     public String doPostPM(
-            Principal principal,
             @RequestParam String uname,
             @RequestParam String body,
             ModelMap context) {
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
+        User visitor = UserUtils.getCurrentUser();
         if (uname.startsWith("@")) {
             uname = uname.substring(1);
         }
@@ -132,6 +126,6 @@ public class PMController {
             }
             return "redirect:/pm/sent";
         }
-            throw new HttpBadRequestException();
+        throw new HttpBadRequestException();
     }
 }