X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.java;h=95834371dff6db2602e5bf899eab96f2f9075301;hb=b62d273fccff37ea66c7160525c0ab6f99842e24;hp=70ecb2bcc9ca886a37b370688264ad1eff49e3fc;hpb=787aa8a7839dcb32c07a8e2b6d982c7e2cb67244;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 70ecb2b..9583437 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
@@ -23,22 +23,20 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.net.URI;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.Nonnull;
import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.web.SessionProvider;
import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.sone.web.page.FreenetPage;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.io.Closer;
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 freenet.clients.http.ToadletContext;
/**
@@ -47,7 +45,7 @@ import freenet.clients.http.ToadletContext;
*
* @author David âBombeâ Roden
*/
-public abstract class JsonPage implements FreenetPage {
+public abstract class JsonPage implements Page {
/** The logger. */
private static final Logger logger = getLogger(JsonPage.class.getName());
@@ -60,6 +58,7 @@ public abstract class JsonPage implements FreenetPage {
/** The Sone web interface. */
protected final WebInterface webInterface;
+ private final SessionProvider sessionProvider;
/**
* Creates a new JSON page at the given path.
@@ -72,26 +71,19 @@ public abstract class JsonPage implements FreenetPage {
public JsonPage(String path, WebInterface webInterface) {
this.path = path;
this.webInterface = webInterface;
+ this.sessionProvider = webInterface;
}
//
// ACCESSORS
//
- /**
- * 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.getCurrentSoneCreatingSession(toadletContext);
+ return sessionProvider.getCurrentSone(toadletContext, true);
}
- protected Sone getCurrentSoneWithoutCreatingSession(ToadletContext toadletContext) {
- return webInterface.getCurrentSoneWithoutCreatingSession(toadletContext);
+ protected Sone getCurrentSone(ToadletContext toadletContext, boolean createSession) {
+ return sessionProvider.getCurrentSone(toadletContext, createSession);
}
//
@@ -106,7 +98,8 @@ public abstract class JsonPage implements FreenetPage {
* The request to handle
* @return The created JSON object
*/
- protected abstract JsonReturnObject createJsonObject(FreenetRequest request);
+ @Nonnull
+ protected abstract JsonReturnObject createJsonObject(@Nonnull FreenetRequest request);
/**
* Returns whether this command needs the form password for authentication
@@ -192,7 +185,7 @@ public abstract class JsonPage implements FreenetPage {
}
}
if (requiresLogin()) {
- if (getCurrentSoneWithoutCreatingSession(request.getToadletContext()) == null) {
+ if (getCurrentSone(request.getToadletContext(), false) == null) {
return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(objectMapper.writeValueAsString(new JsonErrorReturnObject("auth-required")));
}
}
@@ -205,14 +198,6 @@ public abstract class JsonPage implements FreenetPage {
}
}
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isLinkExcepted(URI link) {
- return false;
- }
-
//
// PRIVATE METHODS
//
@@ -230,10 +215,10 @@ public abstract class JsonPage implements FreenetPage {
OutputStreamWriter writer = null;
PrintWriter printWriter = null;
try {
- writer = new OutputStreamWriter(byteArrayOutputStream, "uTF-8");
+ writer = new OutputStreamWriter(byteArrayOutputStream, "UTF-8");
printWriter = new PrintWriter(writer);
t.printStackTrace(printWriter);
- byteArrayOutputStream.flush();
+ printWriter.flush();
return byteArrayOutputStream.toByteArray();
} catch (IOException ioe1) {
/* quite not possible. */