X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=e0b42b14464b9976734ef815a34207cd32eb854d;hb=215d3044366e1b594a907b66291a34224c1d7b3e;hp=67c529357da7c091ca871d1426474ed8bb4aa0a9;hpb=2f68aaf6cfc4b5665436bebdd560cad472ce79d7;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java index 67c5293..e0b42b1 100644 --- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java +++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java @@ -19,6 +19,7 @@ package net.pterodactylus.sone.web; import java.util.Arrays; import java.util.Collection; +import java.util.UUID; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.page.Page; @@ -60,7 +61,8 @@ public class SoneTemplatePage extends TemplatePage { // /** - * Returns the current session. + * Returns the current session, creating a new session if there is no + * current session. * * @param request * The request to extract the session information from @@ -68,8 +70,28 @@ public class SoneTemplatePage extends TemplatePage { * session */ protected Session getCurrentSession(Request request) { + return getCurrentSession(request, true); + } + + /** + * Returns the current session, creating a new session if there is no + * current session and {@code create} is {@code true}. + * + * @param request + * The request to extract the session information from + * @param create + * {@code true} to create a new session if there is no current + * session, {@code false} otherwise + * @return The current session, or {@code null} if there is no current + * session + */ + protected Session getCurrentSession(Request request, boolean create) { try { - return webInterface.sessionManager().useSession(request.getToadletContext()); + Session session = webInterface.sessionManager().useSession(request.getToadletContext()); + if (create && (session == null)) { + session = webInterface.sessionManager().createSession(UUID.randomUUID().toString(), request.getToadletContext()); + } + return session; } catch (RedirectException re1) { return null; } @@ -91,6 +113,19 @@ public class SoneTemplatePage extends TemplatePage { return (Sone) session.getAttribute("Sone.CurrentSone"); } + /** + * Sets the currently logged in Sone. + * + * @param request + * The request + * @param sone + * The Sone to set as currently logged in + */ + protected void setCurrentSone(Request request, Sone sone) { + Session session = getCurrentSession(request); + session.setAttribute("Sone.CurrentSone", sone); + } + // // TEMPLATEPAGE METHODS //