Add test for DI constructability of LoginPage

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

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
index 695816f..37b1107 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
@@ -2,25 +2,26 @@ package net.pterodactylus.sone.web.pages
 
 import freenet.clients.http.ToadletContext
 import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.utils.emptyToNull
 import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
 import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
+import javax.inject.Inject
 
 /**
  * The login page lets the user log in.
  */
-class LoginPage(template: Template, webInterface: WebInterface):
-               SoneTemplatePage("login.html", template, "Page.Login.Title", webInterface) {
+class LoginPage @Inject constructor(template: Template, webInterface: WebInterface):
+               SoneTemplatePage("login.html", webInterface, template, "Page.Login.Title") {
 
-       override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
-               if (request.isPOST) {
-                       val soneId = request.httpRequest.getPartAsStringFailsafe("sone-id", 43)
+       override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+               if (freenetRequest.isPOST) {
+                       val soneId = freenetRequest.httpRequest.getPartAsStringFailsafe("sone-id", 43)
                        webInterface.core.getLocalSone(soneId)?.let { sone ->
-                               setCurrentSone(request.toadletContext, sone)
-                               val target = if (request.httpRequest.isParameterSet("target")) request.httpRequest.getPartAsStringFailsafe("target", 256) else "index.html"
+                               setCurrentSone(freenetRequest.toadletContext, sone)
+                               val target = freenetRequest.httpRequest.getParam("target").emptyToNull ?: "index.html"
                                throw RedirectException(target)
                        }
                }
@@ -28,12 +29,12 @@ class LoginPage(template: Template, webInterface: WebInterface):
                templateContext["identitiesWithoutSone"] = webInterface.core.identityManager.allOwnIdentities.filterNot { "Sone" in it.contexts }.sortedBy { "${it.nickname}@${it.id}" }
        }
 
-       override public fun getRedirectTarget(request: FreenetRequest) =
-                       getCurrentSone(request.toadletContext)?.let { "index.html" }
+       override public fun getRedirectTarget(freenetRequest: FreenetRequest) =
+                       getCurrentSone(freenetRequest.toadletContext)?.let { "index.html" }
 
        override fun isEnabled(toadletContext: ToadletContext) = when {
                webInterface.core.preferences.isRequireFullAccess && !toadletContext.isAllowedFullAccess -> false
-               else -> getCurrentSoneWithoutCreatingSession(toadletContext) == null
+               else -> getCurrentSone(toadletContext, false) == null
        }
 
 }