juick-www: Spring Security

1 files changed, 2 insertions, 42 deletions

diff --git a/juick-www/src/main/java/com/juick/www/controllers/Login.java b/juick-www/src/main/java/com/juick/www/controllers/Login.java
index c9056f22..2d41d9b4 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/Login.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/Login.java
@@ -18,6 +18,7 @@
 package com.juick.www.controllers;
 
 import com.juick.service.UserService;
+import com.juick.util.UserUtils;
 import com.juick.www.Utils;
 import com.juick.www.WebApp;
 import org.springframework.stereotype.Controller;
@@ -60,7 +61,7 @@ public class Login {
                 response.sendError(HttpServletResponse.SC_FORBIDDEN);
             }
         }
-        com.juick.User visitor = webApp.getVisitorUser(request, response);
+        com.juick.User visitor = UserUtils.getCurrentUser();
         if (visitor.getUid() > 0) {
             Utils.sendTemporaryRedirect(response, "/");
             return;
@@ -209,45 +210,4 @@ public class Login {
             out.println("</html>");
         }
     }
-
-    @RequestMapping(value = "/login", method = RequestMethod.POST)
-    protected void doPostLogin(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        String username = request.getParameter("username");
-        String password = request.getParameter("password");
-        if (username == null || password == null || username.length() > 32 || password.isEmpty()) {
-            response.sendError(HttpServletResponse.SC_BAD_REQUEST);
-            return;
-        }
-
-        int uid = userService.checkPassword(username, password);
-        if (uid > 0) {
-            String hash = userService.getHashByUID(uid);
-            Cookie c = new Cookie("hash", hash);
-            c.setMaxAge(365 * 24 * 60 * 60);
-            response.addCookie(c);
-
-            String referer = request.getHeader("Referer");
-            if (referer != null && referer.startsWith("http://juick.com/") && !referer.equals("http://juick.com/login")) {
-                response.sendRedirect(referer);
-            } else {
-                response.sendRedirect("/");
-            }
-        } else {
-            response.sendError(HttpServletResponse.SC_FORBIDDEN);
-        }
-    }
-
-    @RequestMapping(value = "/logout", method = RequestMethod.GET)
-    protected void doGetLogout(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        com.juick.User visitor = webApp.getVisitorUser(request, response);
-        if (visitor.getUid() > 0) {
-            userService.logout(visitor.getUid());
-        }
-
-        Cookie c2 = new Cookie("hash", "-");
-        c2.setMaxAge(0);
-        response.addCookie(c2);
-
-        response.sendRedirect("/");
-    }
 }