X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.java;h=605afafcd934229c0c6c65e7b71f886db3dd3ca4;hb=2288fe8a74e888e9d6a8b13ccbd322ca006c1cec;hp=6b5d614d6ca3027cb635757b25d5fdf9c3014437;hpb=896463c592837b09794fa9368accf105c0bb05be;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 6b5d614..605afaf 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
@@ -17,10 +17,13 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.Page;
 import net.pterodactylus.util.json.JsonObject;
 import net.pterodactylus.util.json.JsonUtils;
+import freenet.clients.http.SessionManager.Session;
+import freenet.clients.http.ToadletContext;
 
 /**
  * A JSON page is a specialized {@link Page} that will always return a JSON
@@ -50,6 +53,66 @@ public abstract class JsonPage implements Page {
 	}
 
 	//
+	// ACCESSORS
+	//
+
+	/**
+	 * 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
+	 *            The toadlet context
+	 * @return The currently logged in Sone, or {@code null} if no Sone is
+	 *         currently logged in
+	 */
+	protected Sone getCurrentSone(ToadletContext toadletContext) {
+		return webInterface.getCurrentSone(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);
+	}
+
+	//
 	// METHODS FOR SUBCLASSES TO OVERRIDE
 	//
 
@@ -75,6 +138,30 @@ public abstract class JsonPage implements Page {
 	}
 
 	//
+	// PROTECTED METHODS
+	//
+
+	/**
+	 * Creates a success reply.
+	 *
+	 * @return A reply signaling success
+	 */
+	protected JsonObject createSuccessJsonObject() {
+		return new JsonObject().put("success", true);
+	}
+
+	/**
+	 * Creates an error reply.
+	 *
+	 * @param error
+	 *            The error that has occured
+	 * @return The JSON object, signalling failure and the error code
+	 */
+	protected JsonObject createErrorJsonObject(String error) {
+		return new JsonObject().put("success", false).put("error", error);
+	}
+
+	//
 	// PAGE METHODS
 	//
 
@@ -93,8 +180,8 @@ public abstract class JsonPage implements Page {
 	public Response handleRequest(Request request) {
 		if (needsFormPassword()) {
 			String formPassword = request.getHttpRequest().getParam("formPassword");
-			if (!webInterface.formPassword().equals(formPassword)) {
-				return new Response(401, "Not authorized", "application/json", JsonUtils.format(new JsonObject().put("success", false)));
+			if (!webInterface.getFormPassword().equals(formPassword)) {
+				return new Response(401, "Not authorized", "application/json", JsonUtils.format(new JsonObject().put("success", false).put("error", "auth-required")));
 			}
 		}
 		JsonObject jsonObject = createJsonObject(request);