import net.pterodactylus.util.web.Response;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Optional;
import freenet.clients.http.ToadletContext;
// 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) {
+ protected Optional<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);
+ protected Optional<Sone> 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")));
}
}