Separate views into a maven module

This commit is contained in:
2020-10-24 01:25:25 +02:00
parent 536c6e7b79
commit 8b8dbd6fe5
37 changed files with 255 additions and 227 deletions
@@ -3,14 +3,14 @@ package be.simplenotes.app.controllers
import be.simplenotes.app.extensions.html
import be.simplenotes.app.extensions.isSecure
import be.simplenotes.app.extensions.redirect
import be.simplenotes.app.views.UserView
import be.simplenotes.domain.security.JwtPayload
import be.simplenotes.views.UserView
import be.simplenotes.domain.usecases.UserService
import be.simplenotes.domain.usecases.users.login.*
import be.simplenotes.domain.usecases.users.register.InvalidRegisterForm
import be.simplenotes.domain.usecases.users.register.RegisterForm
import be.simplenotes.domain.usecases.users.register.UserExists
import be.simplenotes.config.JwtConfig
import be.simplenotes.types.LoggedInUser
import org.http4k.core.Method.GET
import org.http4k.core.Request
import org.http4k.core.Response
@@ -27,9 +27,9 @@ class UserController(
private val userView: UserView,
private val jwtConfig: JwtConfig,
) {
fun register(request: Request, jwtPayload: JwtPayload?): Response {
fun register(request: Request, loggedInUser: LoggedInUser?): Response {
if (request.method == GET) return Response(OK).html(
userView.register(jwtPayload)
userView.register(loggedInUser)
)
val result = userService.register(request.registerForm())
@@ -38,12 +38,12 @@ class UserController(
{
val html = when (it) {
UserExists -> userView.register(
jwtPayload,
loggedInUser,
error = "User already exists"
)
is InvalidRegisterForm ->
userView.register(
jwtPayload,
loggedInUser,
validationErrors = it.validationErrors
)
}
@@ -58,9 +58,9 @@ class UserController(
private fun Request.registerForm() = RegisterForm(form("username"), form("password"))
private fun Request.loginForm(): LoginForm = registerForm()
fun login(request: Request, jwtPayload: JwtPayload?): Response {
fun login(request: Request, loggedInUser: LoggedInUser?): Response {
if (request.method == GET) return Response(OK).html(
userView.login(jwtPayload)
userView.login(loggedInUser)
)
val result = userService.login(request.loginForm())
@@ -70,17 +70,17 @@ class UserController(
val html = when (it) {
Unregistered ->
userView.login(
jwtPayload,
loggedInUser,
error = "User does not exist"
)
WrongPassword ->
userView.login(
jwtPayload,
loggedInUser,
error = "Wrong password"
)
is InvalidLoginForm ->
userView.login(
jwtPayload,
loggedInUser,
validationErrors = it.validationErrors
)
}