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=d11cc0d2c8b65a01f6766796333511c445c5dcbc;hpb=e1b8776c14874e9ae59b614b542255f72290dff1;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 d11cc0d..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,6 +36,7 @@ import net.pterodactylus.util.web.Page;
 import net.pterodactylus.util.web.Response;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Optional;
 
 import freenet.clients.http.ToadletContext;
 
@@ -84,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);
 	}
 
@@ -99,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);
 	}
 
@@ -199,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")));
 			}
 		}