Skip to content
Snippets Groups Projects
Commit 19764642 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Bugfix in remote login

parent 50d5dbc4
Branches
Tags
No related merge requests found
...@@ -120,7 +120,7 @@ public class LoginController extends HttpServlet { ...@@ -120,7 +120,7 @@ public class LoginController extends HttpServlet {
if(user != null) if(user != null)
{ {
request.getSession().setAttribute("user", user); request.getSession().setAttribute("user", user);
UUID uUUID = this.handleRememberUser(request, response, user); UUID uUUID = this.handleRememberUser(request, response, user, returnUUID);
if(returnUUID) if(returnUUID)
{ {
nextPage += (nextPage.contains("?") ? "&": "?") + "returnUUID=" + uUUID.toString(); nextPage += (nextPage.contains("?") ? "&": "?") + "returnUUID=" + uUUID.toString();
...@@ -193,7 +193,7 @@ public class LoginController extends HttpServlet { ...@@ -193,7 +193,7 @@ public class LoginController extends HttpServlet {
if(user != null && user.getUserStatusId().equals(Globals.USER_STATUS_APPROVED)) if(user != null && user.getUserStatusId().equals(Globals.USER_STATUS_APPROVED))
{ {
request.getSession().setAttribute("user", user); request.getSession().setAttribute("user", user);
UUID uUUID = this.handleRememberUser(request, response, user); UUID uUUID = this.handleRememberUser(request, response, user, returnUUID);
if(returnUUID) if(returnUUID)
{ {
nextPage += (nextPage.contains("?") ? "&": "?") + "returnUUID=" + uUUID.toString(); nextPage += (nextPage.contains("?") ? "&": "?") + "returnUUID=" + uUUID.toString();
...@@ -282,7 +282,7 @@ public class LoginController extends HttpServlet { ...@@ -282,7 +282,7 @@ public class LoginController extends HttpServlet {
if(user != null && user.getUserStatusId().equals(Globals.USER_STATUS_APPROVED)) if(user != null && user.getUserStatusId().equals(Globals.USER_STATUS_APPROVED))
{ {
request.getSession().setAttribute("user", user); request.getSession().setAttribute("user", user);
UUID uUUID = this.handleRememberUser(request, response, user); UUID uUUID = this.handleRememberUser(request, response, user, returnUUID);
// All is well, return object // All is well, return object
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
user.setUserUuid(uUUID); user.setUserUuid(uUUID);
...@@ -362,20 +362,23 @@ public class LoginController extends HttpServlet { ...@@ -362,20 +362,23 @@ public class LoginController extends HttpServlet {
* @param response * @param response
* @param user * @param user
*/ */
private UUID handleRememberUser(HttpServletRequest request, HttpServletResponse response, VipsLogicUser user) private UUID handleRememberUser(HttpServletRequest request, HttpServletResponse response, VipsLogicUser user, Boolean returnUUID)
{ {
String rememberUser = request.getParameter("rememberUser") != null ? String rememberUser = request.getParameter("rememberUser") != null ?
request.getParameter("rememberUser") request.getParameter("rememberUser")
: (String) request.getSession().getAttribute("rememberUser"); : (String) request.getSession().getAttribute("rememberUser");
request.getSession().removeAttribute("rememberUser"); request.getSession().removeAttribute("rememberUser");
if(rememberUser != null && rememberUser.equals("on")) if(returnUUID || (rememberUser != null && rememberUser.equals("on")))
{ {
UserUuid uUUID = SessionControllerGetter.getUserBean().createAndPersistUserUuid(user); UserUuid uUUID = SessionControllerGetter.getUserBean().createAndPersistUserUuid(user);
Cookie rememberedUser = new Cookie("rememberedUser", uUUID.getUserUuidPK().getUserUuid().toString()); if(rememberUser != null && rememberUser.equals("on"))
rememberedUser.setPath("/"); {
rememberedUser.setMaxAge(Globals.DEFAULT_UUID_VALIDITY_DURATION_DAYS * 24 * 60 * 60); Cookie rememberedUser = new Cookie("rememberedUser", uUUID.getUserUuidPK().getUserUuid().toString());
response.addCookie(rememberedUser); rememberedUser.setPath("/");
rememberedUser.setMaxAge(Globals.DEFAULT_UUID_VALIDITY_DURATION_DAYS * 24 * 60 * 60);
response.addCookie(rememberedUser);
}
return uUUID.getUserUuidPK().getUserUuid(); return uUUID.getUserUuidPK().getUserUuid();
} }
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment