From 9f770c26d1e4f392d591bf35886e3dcc7371d64f Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 29 Mar 2017 14:11:46 +0300
Subject: juick-www: Spring Security

---
 juick-www/src/main/java/com/juick/www/controllers/User.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'juick-www/src/main/java/com/juick/www/controllers/User.java')

diff --git a/juick-www/src/main/java/com/juick/www/controllers/User.java b/juick-www/src/main/java/com/juick/www/controllers/User.java
index e84c8913..28a91298 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/User.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/User.java
@@ -21,6 +21,7 @@ import com.juick.server.helpers.TagStats;
 import com.juick.service.MessagesService;
 import com.juick.service.TagService;
 import com.juick.service.UserService;
+import com.juick.util.UserUtils;
 import com.juick.www.Utils;
 import com.juick.www.WebApp;
 import org.apache.commons.lang3.CharEncoding;
@@ -66,7 +67,7 @@ public class User {
                              @PathVariable String uname,
                              @RequestParam(required = false, defaultValue = "0") Integer before) throws IOException {
         com.juick.User user = userService.getUserByName(uname);
-        com.juick.User visitor = webApp.getVisitorUser(request, response);
+        com.juick.User visitor = UserUtils.getCurrentUser();
         if (user.isBanned()) {
             response.sendError(HttpServletResponse.SC_NOT_FOUND);
             return;
@@ -180,7 +181,7 @@ public class User {
     protected void doGetTags(HttpServletRequest request, HttpServletResponse response,
                              @PathVariable String uname) throws IOException {
         com.juick.User user = userService.getUserByName(uname);
-        com.juick.User visitor = webApp.getVisitorUser(request, response);
+        com.juick.User visitor = UserUtils.getCurrentUser();
         if (visitor.isBanned()) {
             response.sendError(HttpServletResponse.SC_NOT_FOUND);
             return;
@@ -206,7 +207,7 @@ public class User {
     protected void doGetFriends(HttpServletRequest request, HttpServletResponse response,
                                 @PathVariable String uname) throws ServletException, IOException {
         com.juick.User user = userService.getUserByName(uname);
-        com.juick.User visitor = webApp.getVisitorUser(request, response);
+        com.juick.User visitor = UserUtils.getCurrentUser();
         if (visitor.isBanned()) {
             response.sendError(HttpServletResponse.SC_NOT_FOUND);
             return;
@@ -244,7 +245,7 @@ public class User {
     protected void doGetReaders(HttpServletRequest request, HttpServletResponse response,
                                 @PathVariable String uname) throws ServletException, IOException {
         com.juick.User user = userService.getUserByName(uname);
-        com.juick.User visitor = webApp.getVisitorUser(request, response);
+        com.juick.User visitor = UserUtils.getCurrentUser();
         if (visitor.isBanned()) {
             response.sendError(HttpServletResponse.SC_NOT_FOUND);
             return;
-- 
cgit v1.2.3