Add test for DI constructability of LoginPage

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / web / pages / UntrustPage.kt

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UntrustPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UntrustPage.kt
index a46b272..f522c34 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UntrustPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UntrustPage.kt
@@ -1,6 +1,6 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.utils.also
+import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.utils.isPOST
 import net.pterodactylus.sone.utils.parameters
 import net.pterodactylus.sone.web.WebInterface
@@ -12,16 +12,14 @@ import net.pterodactylus.util.template.TemplateContext
  * Page that lets the user untrust another Sone. This will remove all trust
  * assignments for an identity.
  */
-class UntrustPage(template: Template, webInterface: WebInterface):
-               SoneTemplatePage("untrust.html", template, "Page.Untrust.Title", webInterface, true) {
+class UntrustPage(template: Template, webInterface: WebInterface) :
+               LoggedInPage("untrust.html", template, "Page.Untrust.Title", webInterface) {
 
-       override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+       override fun handleRequest(freenetRequest: FreenetRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (freenetRequest.isPOST) {
-                       getCurrentSone(freenetRequest.toadletContext)!!.also { currentSone ->
-                               freenetRequest.parameters["sone", 44]
-                                               .let(webInterface.core::getSone)
-                                               .also { webInterface.core.untrustSone(currentSone, it) }
-                       }
+                       freenetRequest.parameters["sone", 44]!!
+                                       .let(webInterface.core::getSone)
+                                       ?.also { webInterface.core.untrustSone(currentSone, it) }
                        throw RedirectException(freenetRequest.parameters["returnPage", 256])
                }
        }