Author: bbrossaud Date: 2010-05-05 10:56:11 +0200 (Wed, 05 May 2010) New Revision: 7 Url: http://chorem.org/repositories/revision/bow/7 Log: registration and authentification work Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-05 07:45:26 UTC (rev 6) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-05-05 08:56:11 UTC (rev 7) @@ -21,7 +21,7 @@ public class ControllerServlet extends HttpServlet { private Model model = new Model(); - private UserImpl user = null; + private User user = null; public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { @@ -59,35 +59,39 @@ private void actionRegister(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - if (this.checkRegister(request, response)) { - request.getRequestDispatcher("register.jsp").forward(request, response); - } else { - UserImpl newUser = new UserImpl(); - newUser.setPassword(request.getParameter("email")); - newUser.setEmail(request.getParameter("password")); - try { - user = model.getProxy().store(newUser); + try { + if (this.checkRegister(request, response)) { + request.getRequestDispatcher("register.jsp").forward(request, response); + } else { + UserImpl newUser = new UserImpl(); + newUser.setPassword(request.getParameter("password")); + newUser.setEmail(request.getParameter("email")); + this.user = model.getProxy().store((User) newUser); request.getRequestDispatcher("search.jsp").forward(request, response); - } catch (WikittyException eee) { - request.getRequestDispatcher("error.jsp").forward(request, response); } + } catch (Exception eee) { + request.getRequestDispatcher("error.jsp").forward(request, response); } } private void actionLogin(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - UserImpl user = this.checkLogin(request, response); + try { + User user = this.checkLogin(request, response); - if (user != null) { - this.user = user; - request.getRequestDispatcher("search.jsp").forward(request, response); - } else { - request.getRequestDispatcher("home.jsp").forward(request, response); + if (user != null) { + this.user = user; + request.getRequestDispatcher("search.jsp").forward(request, response); + } else { + request.getRequestDispatcher("home.jsp").forward(request, response); + } + } catch (Exception eee) { + request.getRequestDispatcher("error.jsp").forward(request, response); } } - private UserImpl checkLogin(HttpServletRequest request, HttpServletResponse response) + private User checkLogin(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { String email = request.getParameter("email"); String password = request.getParameter("password"); @@ -96,7 +100,7 @@ WikittyProxy proxy = model.getProxy(); Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, email).eq(User.FQ_FIELD_PASSWORD, password).criteria(); - return proxy.findByCriteria(new UserImpl().getClass(), criteria); + return proxy.findByCriteria(User.class, criteria); } return null; } @@ -107,22 +111,21 @@ String password = request.getParameter("password"); if (!email.isEmpty() && !password.isEmpty()) { - UserImpl user = new UserImpl(); WikittyProxy proxy = model.getProxy(); - user.setEmail(email); - if (proxy.findByExample(user) == null) { + Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, email).criteria(); + if (proxy.findByCriteria(User.class, criteria) == null) { return false; } } return true; } - public void setUser(UserImpl user) { + public void setUser(User user) { this.user = user; } - public UserImpl getUser() { + public User getUser() { return user; } }