Added some logging and moved cookie stuff to the manager
This commit is contained in:
parent
8e56ff406a
commit
a4eb5c613d
9 changed files with 255 additions and 244 deletions
|
|
@ -30,12 +30,13 @@ public class LoginServlet extends ZalleryServlet {
|
|||
|
||||
// Authenticate with cookies
|
||||
if (user == null)
|
||||
user = AuthenticationManager.authenticate(db, request);
|
||||
user = AuthenticationManager.authenticate(db, request, response);
|
||||
|
||||
// Forward user
|
||||
if (user != null) {
|
||||
include(JSP_FILE, request, response);
|
||||
} else {
|
||||
logger.fine("User(" + user.getEmail() + ") already authenticated, forwarding to gallery.");
|
||||
redirect(GalleryServlet.URI, request, response);
|
||||
}
|
||||
}
|
||||
|
|
@ -45,14 +46,13 @@ public class LoginServlet extends ZalleryServlet {
|
|||
UserMessage msgs = UserMessage.getUserMessage(request.getSession());
|
||||
User user = AuthenticationManager.authenticate(db,
|
||||
request.getParameter("email"),
|
||||
request.getParameter("password"));
|
||||
request.getParameter("password"),
|
||||
request, response);
|
||||
|
||||
// Successful login
|
||||
if (user != null) {
|
||||
user.registerOnHost(request, response, db, true );
|
||||
AuthenticationManager.setUserSession(user, request.getSession());
|
||||
|
||||
forward("/", request, response);
|
||||
logger.fine("Authenticated user(" + user.getEmail() + ") successfully, forwarding to gallery.");
|
||||
forward(GalleryServlet.URI, request, response);
|
||||
}
|
||||
// Failed login
|
||||
else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue