X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FUntrustAjaxPage.java;h=5ba66934600649013b13932fa7beefe4bcc8580c;hp=bd79b9831f10abc7cf4d0b584c61fc22cff89a05;hb=9e697ac643d11a2b7644a948732674eea195718a;hpb=128580ddb154ce7d4f12108a8a70a8fe12488ffe diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java index bd79b98..5ba6693 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java @@ -17,6 +17,8 @@ package net.pterodactylus.sone.web.ajax; +import javax.annotation.Nonnull; + import com.google.common.base.Optional; import net.pterodactylus.sone.core.Core; @@ -30,7 +32,7 @@ import net.pterodactylus.sone.web.page.FreenetRequest; * @see Core#untrustSone(Sone, Sone) * @author David ‘Bombe’ Roden */ -public class UntrustAjaxPage extends JsonPage { +public class UntrustAjaxPage extends LoggedInJsonPage { /** * Creates a new “untrust Sone” AJAX handler. @@ -45,12 +47,9 @@ public class UntrustAjaxPage extends JsonPage { /** * {@inheritDoc} */ + @Nonnull @Override - protected JsonReturnObject createJsonObject(FreenetRequest request) { - Sone currentSone = getCurrentSoneWithoutCreatingSession(request.getToadletContext()); - if (currentSone == null) { - return createErrorJsonObject("auth-required"); - } + protected JsonReturnObject createJsonObject(@Nonnull Sone currentSone, @Nonnull FreenetRequest request) { String soneId = request.getHttpRequest().getParam("sone"); Optional sone = webInterface.getCore().getSone(soneId); if (!sone.isPresent()) {