From f2454d531e9e99c406a513d92702858510fef4b9 Mon Sep 17 00:00:00 2001
From: Alexander Alexeev
Date: Sun, 11 Dec 2016 13:56:26 +0700
Subject: i18n, using SecurityContextHolder for get currentUser (user always
 not null)

---
 .../src/main/java/com/juick/www/controllers/SettingsController.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/juick-spring-www/src/main/java/com/juick/www/controllers/SettingsController.java b/juick-spring-www/src/main/java/com/juick/www/controllers/SettingsController.java
index a038389f..ceccdbb7 100644
--- a/juick-spring-www/src/main/java/com/juick/www/controllers/SettingsController.java
+++ b/juick-spring-www/src/main/java/com/juick/www/controllers/SettingsController.java
@@ -36,13 +36,11 @@ public class SettingsController {
 
     @RequestMapping("settings")
     public String showSettings(
-            Principal principal,
             @RequestParam(required = false) String page,
             @RequestParam(required = false) String code,
             ModelMap context
     ) throws ServletException, IOException {
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
+        User visitor = UserUtils.getCurrentUser();
         if (visitor.getUid() == 0) {
             return "redirect:/login";
         }
-- 
cgit v1.2.3