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)

---
 .../com/juick/www/controllers/IndexController.java | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

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

diff --git a/juick-spring-www/src/main/java/com/juick/www/controllers/IndexController.java b/juick-spring-www/src/main/java/com/juick/www/controllers/IndexController.java
index c6de2fbf..c56763b1 100644
--- a/juick-spring-www/src/main/java/com/juick/www/controllers/IndexController.java
+++ b/juick-spring-www/src/main/java/com/juick/www/controllers/IndexController.java
@@ -12,12 +12,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.MessageSource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.inject.Inject;
 import java.io.IOException;
 import java.net.URLEncoder;
-import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -39,9 +40,6 @@ public class IndexController {
 
     @RequestMapping(value = "/", method = RequestMethod.GET)
     public String indexPage(
-            Principal principal,
-            @CookieValue("ref") Optional<String> ref,
-            @RequestHeader("Referer") Optional<String> referer,
             @RequestParam("show") Optional<String> paramShow,
             @RequestParam("tag") Optional<String> paramTagStr,
             @RequestParam(value = "before") Optional<Integer> paramBefore,
@@ -49,16 +47,15 @@ public class IndexController {
             ModelMap model) throws IOException {
 
         if (paramTagStr.isPresent())
-            return  "redirect:/tag/" + URLEncoder.encode(paramTagStr.get(), "UTF-8");
+            return "redirect:/tag/" + URLEncoder.encode(paramTagStr.get(), "UTF-8");
 
         if (StringUtils.isNotEmpty(paramSearch) && paramSearch.length() > 64)
             paramSearch = "";
 
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
+        User visitor = UserUtils.getCurrentUser();
 
         String title;
-        if (visitor.getUid() > 0) {
+        if (!visitor.isAnonym()) {
             title = "Популярные";
         } else {
             title = "Микроблоги Juick: популярные записи";
@@ -121,4 +118,9 @@ public class IndexController {
         //model.addAttribute("isModerator", userService.getModerators().contains(visitor.getUid()));
         return "index";
     }
-}
+
+    @RequestMapping(value = "/login", method = RequestMethod.GET)
+    public String getLoginForm() {
+        return "views/login";
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3