package net.pterodactylus.sone.web.ajax;
+import static java.util.logging.Logger.getLogger;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.util.logging.Level;
import java.util.logging.Logger;
-import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.LocalSone;
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.logging.Logging;
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;
/**
public abstract class JsonPage implements FreenetPage {
/** The logger. */
- private static final Logger logger = Logging.getLogger(JsonPage.class);
+ private static final Logger logger = getLogger("Sone.Web.Ajax");
/** The JSON serializer. */
private static final ObjectMapper objectMapper = new ObjectMapper();
// 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) {
+ protected Optional<LocalSone> 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);
+ protected Optional<LocalSone> getCurrentSone(ToadletContext toadletContext, boolean createSession) {
+ return webInterface.getCurrentSone(toadletContext, createSession);
}
//
}
}
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")));
}
}