X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.java;fp=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.java;h=eee28ec7ac145bc9e52fa7d16b5c3e55d50e2555;hb=128580ddb154ce7d4f12108a8a70a8fe12488ffe;hp=1050eeefe7844a0f151730d8ee4bc1756c444ddc;hpb=b0e986537b3c2a4992bb28eee8682d1a0207b01a;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 1050eee..eee28ec 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
@@ -85,22 +85,11 @@ public abstract class JsonPage implements FreenetPage {
 	 *         currently logged in
 	 */
 	protected Sone getCurrentSone(ToadletContext toadletContext) {
-		return webInterface.getCurrentSone(toadletContext);
+		return webInterface.getCurrentSoneCreatingSession(toadletContext);
 	}
 
-	/**
-	 * Returns the currently logged in Sone.
-	 *
-	 * @param toadletContext
-	 *            The toadlet context
-	 * @param create
-	 *            {@code true} to create a new session if no session exists,
-	 *            {@code false} to not create a new session
-	 * @return The currently logged in Sone, or {@code null} if no Sone is
-	 *         currently logged in
-	 */
-	protected Sone getCurrentSone(ToadletContext toadletContext, boolean create) {
-		return webInterface.getCurrentSone(toadletContext, create);
+	protected Sone getCurrentSoneWithoutCreatingSession(ToadletContext toadletContext) {
+		return webInterface.getCurrentSoneWithoutCreatingSession(toadletContext);
 	}
 
 	//
@@ -199,7 +188,7 @@ public abstract class JsonPage implements FreenetPage {
 			}
 		}
 		if (requiresLogin()) {
-			if (getCurrentSone(request.getToadletContext(), false) == null) {
+			if (getCurrentSoneWithoutCreatingSession(request.getToadletContext()) == null) {
 				return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(objectMapper.writeValueAsString(new JsonErrorReturnObject("auth-required")));
 			}
 		}