X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=40785856460d1904391a379d0a1018e4c38a3f33;hb=00adeb7e4a42365d0b5feb4e38338285e91a2301;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..4078585 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -19,13 +19,14 @@ 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;
 import net.pterodactylus.sone.web.page.TemplatePage;
 import net.pterodactylus.util.template.Template;
-import freenet.clients.http.RedirectException;
 import freenet.clients.http.SessionManager.Session;
+import freenet.clients.http.ToadletContext;
 
 /**
  * Base page for the Freetalk web interface.
@@ -60,17 +61,38 @@ 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
+	 * @param toadletContenxt
+	 *            The toadlet context
 	 * @return The current session, or {@code null} if there is no current
 	 *         session
 	 */
-	protected Session getCurrentSession(Request request) {
+	protected Session getCurrentSession(ToadletContext toadletContenxt) {
+		return getCurrentSession(toadletContenxt, true);
+	}
+
+	/**
+	 * Returns the current session, creating a new session if there is no
+	 * current session and {@code create} is {@code true}.
+	 *
+	 * @param toadletContenxt
+	 *            The toadlet context
+	 * @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(ToadletContext toadletContenxt, boolean create) {
 		try {
-			return webInterface.sessionManager().useSession(request.getToadletContext());
-		} catch (RedirectException re1) {
+			Session session = webInterface.sessionManager().useSession(toadletContenxt);
+			if (create && (session == null)) {
+				session = webInterface.sessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
+			}
+			return session;
+		} catch (freenet.clients.http.RedirectException re1) {
 			return null;
 		}
 	}
@@ -78,17 +100,36 @@ public class SoneTemplatePage extends TemplatePage {
 	/**
 	 * Returns the currently logged in Sone.
 	 *
-	 * @param request
-	 *            The request to extract the session information from
+	 * @param toadletContenxt
+	 *            The toadlet context
 	 * @return The currently logged in Sone, or {@code null} if no Sone is
 	 *         currently logged in
 	 */
-	protected Sone getCurrentSone(Request request) {
-		Session session = getCurrentSession(request);
+	protected Sone getCurrentSone(ToadletContext toadletContenxt) {
+		Session session = getCurrentSession(toadletContenxt);
 		if (session == null) {
 			return null;
 		}
-		return (Sone) session.getAttribute("Sone.CurrentSone");
+		String soneId = (String) session.getAttribute("Sone.CurrentSone");
+		for (Sone sone : webInterface.core().localSones()) {
+			if (sone.getId().equals(soneId)) {
+				return sone;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Sets the currently logged in Sone.
+	 *
+	 * @param toadletContext
+	 *            The toadlet context
+	 * @param sone
+	 *            The Sone to set as currently logged in
+	 */
+	protected void setCurrentSone(ToadletContext toadletContext, Sone sone) {
+		Session session = getCurrentSession(toadletContext);
+		session.setAttribute("Sone.CurrentSone", sone.getId());
 	}
 
 	//
@@ -118,10 +159,21 @@ public class SoneTemplatePage extends TemplatePage {
 	 */
 	@Override
 	protected String getRedirectTarget(Page.Request request) {
-		if (requiresLogin() && (getCurrentSone(request) == null)) {
+		if (requiresLogin() && (getCurrentSone(request.getToadletContext()) == null)) {
 			return "login.html";
 		}
 		return null;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isEnabled(ToadletContext toadletContext) {
+		if (requiresLogin()) {
+			return getCurrentSone(toadletContext) != null;
+		}
+		return true;
+	}
+
 }