X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.java;h=bb32362276034cf14ac48d99774068ecc1012957;hb=53a71d1d6b91e4d56af49a06f2e06bc4d11bf3eb;hp=6d6d92a934f2b930b4bb070a3d46f3b06e0210b7;hpb=43740d6a1dfc686ab54d0aebd4a5b1bce75b9ed6;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
index 6d6d92a..bb32362 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
@@ -36,7 +36,8 @@ import net.pterodactylus.util.web.Page;
 import net.pterodactylus.util.web.Response;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import freenet.clients.http.SessionManager.Session;
+import com.google.common.base.Optional;
+
 import freenet.clients.http.ToadletContext;
 
 /**
@@ -77,35 +78,6 @@ public abstract class JsonPage implements FreenetPage {
 	//
 
 	/**
-	 * Returns the current session, creating a new session if there is no
-	 * current session.
-	 *
-	 * @param toadletContenxt
-	 *            The toadlet context
-	 * @return The current session, or {@code null} if there is no current
-	 *         session
-	 */
-	protected Session getCurrentSession(ToadletContext toadletContenxt) {
-		return webInterface.getCurrentSession(toadletContenxt);
-	}
-
-	/**
-	 * 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) {
-		return webInterface.getCurrentSession(toadletContenxt, create);
-	}
-
-	/**
 	 * Returns the currently logged in Sone.
 	 *
 	 * @param toadletContext
@@ -113,7 +85,7 @@ public abstract class JsonPage implements FreenetPage {
 	 * @return The currently logged in Sone, or {@code null} if no Sone is
 	 *         currently logged in
 	 */
-	protected Sone getCurrentSone(ToadletContext toadletContext) {
+	protected Optional<Sone> getCurrentSone(ToadletContext toadletContext) {
 		return webInterface.getCurrentSone(toadletContext);
 	}
 
@@ -128,7 +100,7 @@ public abstract class JsonPage implements FreenetPage {
 	 * @return The currently logged in Sone, or {@code null} if no Sone is
 	 *         currently logged in
 	 */
-	protected Sone getCurrentSone(ToadletContext toadletContext, boolean create) {
+	protected Optional<Sone> getCurrentSone(ToadletContext toadletContext, boolean create) {
 		return webInterface.getCurrentSone(toadletContext, create);
 	}
 
@@ -228,7 +200,7 @@ public abstract class JsonPage implements FreenetPage {
 			}
 		}
 		if (requiresLogin()) {
-			if (getCurrentSone(request.getToadletContext(), false) == null) {
+			if (!getCurrentSone(request.getToadletContext(), false).isPresent()) {
 				return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(objectMapper.writeValueAsString(new JsonErrorReturnObject("auth-required")));
 			}
 		}