From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 14 Jan 2011 20:50:31 +0000 (+0100)
Subject: Require a login.
X-Git-Tag: 0.4^2~9^2~13
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=2b30e0060ba28dda9be8f85f2198d8daee9e153a;hp=043b045d6e3f3908597d789606368d0b08ef6a59;p=Sone.git

Require a login.
---

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 605afaf..8d48bce 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
@@ -137,6 +137,16 @@ public abstract class JsonPage implements Page {
 		return true;
 	}
 
+	/**
+	 * Returns whether this page requires the user to be logged in.
+	 *
+	 * @return {@code true} if the user needs to be logged in to use this page,
+	 *         {@code false} otherwise
+	 */
+	protected boolean requiresLogin() {
+		return true;
+	}
+
 	//
 	// PROTECTED METHODS
 	//
@@ -184,6 +194,11 @@ public abstract class JsonPage implements Page {
 				return new Response(401, "Not authorized", "application/json", JsonUtils.format(new JsonObject().put("success", false).put("error", "auth-required")));
 			}
 		}
+		if (requiresLogin()) {
+			if (getCurrentSone(request.getToadletContext(), false) == null) {
+				return new Response(401, "Not authorized", "application/json", JsonUtils.format(createErrorJsonObject("auth-required")));
+			}
+		}
 		JsonObject jsonObject = createJsonObject(request);
 		return new Response(200, "OK", "application/json", JsonUtils.format(jsonObject));
 	}