UserUtils -> @Visitor

1 files changed, 7 insertions, 6 deletions

diff --git a/src/main/java/com/juick/server/www/controllers/Login.java b/src/main/java/com/juick/server/www/controllers/Login.java
index d933934e..9fca57e7 100644
--- a/src/main/java/com/juick/server/www/controllers/Login.java
+++ b/src/main/java/com/juick/server/www/controllers/Login.java
@@ -16,8 +16,9 @@
  */
 package com.juick.server.www.controllers;
 
-import com.juick.server.util.UserUtils;
+import com.juick.User;
 import com.juick.service.UserService;
+import com.juick.service.security.annotation.Visitor;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,17 +35,17 @@ public class Login {
     private UserService userService;
 
     @GetMapping("/login")
-    public String getloginForm(@RequestParam(required = false, defaultValue = "true") boolean redirect) {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-
+    public String getloginForm(
+            @Visitor User visitor,
+            @RequestParam(required = false, defaultValue = "true") boolean redirect) {
         if (!visitor.isAnonymous()) {
             return redirect ? "redirect:/" : "redirect:/login/success";
         }
         return "views/login";
     }
     @GetMapping("/login/success")
-    public String getSuccessLogin(ModelMap model) {
-        model.addAttribute("hash", userService.getHashByUID(UserUtils.getCurrentUser().getUid()));
+    public String getSuccessLogin(@Visitor User visitor, ModelMap model) {
+        model.addAttribute("hash", userService.getHashByUID(visitor.getUid()));
         return "views/login_success";
     }
 }