Use mapstruct

.env.dist

@@ -1,6 +1,10 @@
-# mariadb
-MYSQL_ROOT_PASSWORD=
-MYSQL_PASSWORD=
-# simplenotes
-DB_PASSWORD=
+## can be generated with `openssl rand -base64 32`
 JWT_SECRET=
+#
+## can be generated with `openssl rand -base64 32`
+MYSQL_ROOT_PASSWORD=
+#
+## can be generated with `openssl rand -base64 32`
+MYSQL_PASSWORD=
+# password should be the same as mysql_password
+PASSWORD=

.gitignore

@@ -1,6 +1,24 @@
-# Gradle
-build/
-.gradle
+# Java
+.mtj.tmp/
+*.class
+*.jar
+*.war
+*.ear
+*.nar
+hs_err_pid*
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+pom.xml.bak
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
 
 # IntelliJ
 out/
@@ -10,8 +28,11 @@ out/
 *.ipr
 *.iws
 
+# Vue
+node_modules
+/dist
+
 # Local env files
-.env
 .env.local
 .env.*.local
 
@@ -28,13 +49,85 @@ pids
 *.seed
 *.pid.lock
 
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
 # Dependency directories
 node_modules/
 jspm_packages/
 
+# TypeScript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
 # Yarn Integrity file
 .yarn-integrity
 
+# dotenv environment variables file
+.env
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# Nuxt generate
+dist
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless
+
+# IDE / Editor
+.idea
+
+# Service worker
+sw.*
+*.private.env.json
+
+# Certificates
+data/
+letsencrypt/
+
+# generated resources
+app/src/main/resources/css-manifest.json
+app/src/main/resources/static/styles*
+
 # h2 db
 *.db
 
@@ -43,4 +136,3 @@ jspm_packages/
 
 # python
 __pycache__
-

.sdkmanrc

@@ -1,5 +0,0 @@
-# Enable auto-env through the sdkman_auto_env config
-# Add key=value pairs of SDKs to use below
-java=15-open
-gradle=6.8-rc-1
-kotlin=1.4.20

Dockerfile

@@ -1,4 +1,26 @@
-FROM openjdk:15-alpine as jdkbuilder
+FROM maven:3.6.3-jdk-14 as builder
+
+WORKDIR /tmp
+
+# Cache dependencies
+COPY pom.xml .
+COPY app/pom.xml app/pom.xml
+COPY domain/pom.xml domain/pom.xml
+COPY persistance/pom.xml persistance/pom.xml
+COPY shared/pom.xml shared/pom.xml
+COPY search/pom.xml search/pom.xml
+
+RUN mvn verify clean --fail-never
+
+COPY app/src app/src
+COPY domain/src domain/src
+COPY persistance/src persistance/src
+COPY shared/src shared/src
+COPY search/src search/src
+
+RUN mvn -Dstyle.color=always package
+
+FROM openjdk:14-alpine as jdkbuilder
 
 RUN apk add --no-cache binutils
 
@@ -20,21 +42,8 @@ RUN chown -R $APPLICATION_USER /app
 
 USER $APPLICATION_USER
 
+COPY --from=builder /tmp/app/target/app-*.jar /app/app.jar
 COPY --from=jdkbuilder /myjdk /myjdk
-COPY app/build/libs/app-with-dependencies*.jar /app/simplenotes.jar
 WORKDIR /app
 
-CMD [ \
-    "/myjdk/bin/java", \
-    "--add-opens", \
-    "java.base/java.nio=ALL-UNNAMED", \
-    "-server", \
-    "-XX:+UnlockExperimentalVMOptions", \
-    "-Xms64m", \
-    "-Xmx256m", \
-    "-XX:+UseG1GC", \
-    "-XX:MaxGCPauseMillis=100", \
-    "-XX:+UseStringDeduplication", \
-    "-jar", \
-    "simplenotes.jar" \
-]
+CMD ["/myjdk/bin/java", "-server", "-XX:+UnlockExperimentalVMOptions", "-Xms64m", "-Xmx256m", "-XX:+UseG1GC", "-XX:MaxGCPauseMillis=100", "-XX:+UseStringDeduplication", "-jar", "app.jar"]

README.md

@@ -15,4 +15,5 @@
 ## Configuration
 
 The app is configured with environments variables.
-If no match is found within the env, a default value is read from a yaml file in simplenotes-app/src/main/resources/application.yaml.
+If no match is found within the env, a default value is read from a properties file in /app/src/main/resources/application.properties.
+Don't use the default values for secrets ! Every value inside *.env.dist* should be changed.

app/build.gradle.kts

@@ -1,36 +0,0 @@
-import be.simplenotes.Libs
-import be.simplenotes.micronaut
-
-plugins {
-    id("be.simplenotes.base")
-    id("be.simplenotes.kotlinx-serialization")
-    id("be.simplenotes.app-shadow")
-    id("be.simplenotes.docker")
-    id("be.simplenotes.micronaut")
-}
-
-dependencies {
-    implementation(project(":domain"))
-    implementation(project(":views"))
-    implementation(project(":css"))
-
-    implementation(Libs.Http4k.core)
-    implementation(Libs.Jetty.server)
-    implementation(Libs.Jetty.servlet)
-    implementation(Libs.javaxServlet)
-    implementation(Libs.Kotlinx.Serialization.json)
-
-    implementation(Libs.Slf4J.api)
-    runtimeOnly(Libs.Slf4J.logback)
-
-    micronaut()
-
-    testImplementation(Libs.Test.junit)
-    testImplementation(Libs.Test.assertJ)
-    testImplementation(Libs.Http4k.testingHamkrest)
-}
-
-docker {
-    image = "hubv/simplenotes"
-    tag = "latest"
-}

app/pom.xml

@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>parent</artifactId>
+        <groupId>be.simplenotes</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>app</artifactId>
+
+    <properties>
+        <http4k.version>3.268.0</http4k.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>be.simplenotes</groupId>
+            <artifactId>persistance</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>be.simplenotes</groupId>
+            <artifactId>search</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>be.simplenotes</groupId>
+            <artifactId>domain</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>be.simplenotes</groupId>
+            <artifactId>shared</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.http4k</groupId>
+            <artifactId>http4k-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.http4k</groupId>
+            <artifactId>http4k-server-jetty</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.websocket</groupId>
+                    <artifactId>javax-websocket-server-impl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-html-jvm</artifactId>
+            <version>0.7.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-serialization-json-jvm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ocpsoft.prettytime</groupId>
+            <artifactId>prettytime</artifactId>
+            <version>4.0.5.Final</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>be.simplenotes</groupId>
+            <artifactId>shared</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.http4k</groupId>
+            <artifactId>http4k-testing-hamkrest</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>me.liuwj.ktorm</groupId>
+            <artifactId>ktorm-core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.http4k</groupId>
+                <artifactId>http4k-bom</artifactId>
+                <version>${http4k.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <minimizeJar>true</minimizeJar>
+                            <transformers>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>be.simplenotes.app.SimpleNotesKt</mainClass>
+                                </transformer>
+                            </transformers>
+                            <filters>
+                                <filter>
+                                    <artifact>com.h2database:h2</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.mariadb.jdbc:mariadb-java-client</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.jetbrains.kotlin:kotlin-reflect</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.eclipse.jetty:*</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.apache.lucene:*</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.ocpsoft.prettytime:prettytime</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/maven/**</exclude>
+                                        <exclude>META-INF/proguard/**</exclude>
+                                        <exclude>META-INF/*.kotlin_module</exclude>
+                                        <exclude>META-INF/DEPENDENCIES*</exclude>
+                                        <exclude>META-INF/NOTICE*</exclude>
+                                        <exclude>META-INF/LICENSE*</exclude>
+                                        <exclude>LICENSE*</exclude>
+                                        <exclude>META-INF/README*</exclude>
+                                        <exclude>META-INF/native-image/**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

app/src/SimpleNotes.kt

@@ -1,10 +0,0 @@
-package be.simplenotes.app
-
-import io.micronaut.context.ApplicationContext
-import java.lang.Runtime.getRuntime
-
-fun main() {
-    val ctx = ApplicationContext.run()
-    ctx.createBean(Server::class.java)
-    getRuntime().addShutdownHook(Thread { ctx.stop() })
-}

app/src/api/ApiNoteController.kt

@@ -1,79 +0,0 @@
-package be.simplenotes.app.api
-
-import be.simplenotes.app.extensions.auto
-import be.simplenotes.domain.usecases.NoteService
-import be.simplenotes.types.LoggedInUser
-import be.simplenotes.types.PersistedNote
-import be.simplenotes.types.PersistedNoteMetadata
-import kotlinx.serialization.Contextual
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import org.http4k.core.Request
-import org.http4k.core.Response
-import org.http4k.core.Status.Companion.BAD_REQUEST
-import org.http4k.core.Status.Companion.NOT_FOUND
-import org.http4k.core.Status.Companion.OK
-import org.http4k.lens.Path
-import org.http4k.lens.uuid
-import java.util.*
-import javax.inject.Singleton
-
-@Singleton
-class ApiNoteController(
-    json: Json,
-    private val noteService: NoteService,
-) {
-
-    fun createNote(request: Request, loggedInUser: LoggedInUser): Response {
-        val content = noteContentLens(request)
-        return noteService.create(loggedInUser, content).fold(
-            { Response(BAD_REQUEST) },
-            { uuidContentLens(UuidContent(it.uuid), Response(OK)) }
-        )
-    }
-
-    fun notes(@Suppress("UNUSED_PARAMETER") request: Request, loggedInUser: LoggedInUser): Response {
-        val notes = noteService.paginatedNotes(loggedInUser.userId, page = 1).notes
-        return persistedNotesMetadataLens(notes, Response(OK))
-    }
-
-    fun note(request: Request, loggedInUser: LoggedInUser): Response =
-        noteService.find(loggedInUser.userId, uuidLens(request))
-            ?.let { persistedNoteLens(it, Response(OK)) }
-            ?: Response(NOT_FOUND)
-
-    fun update(request: Request, loggedInUser: LoggedInUser): Response {
-        val content = noteContentLens(request)
-        return noteService.update(loggedInUser, uuidLens(request), content).fold(
-            {
-                Response(BAD_REQUEST)
-            },
-            {
-                if (it == null) Response(NOT_FOUND)
-                else Response(OK)
-            }
-        )
-    }
-
-    fun search(request: Request, loggedInUser: LoggedInUser): Response {
-        val query = searchContentLens(request)
-        val notes = noteService.search(loggedInUser.userId, query)
-        return persistedNotesMetadataLens(notes, Response(OK))
-    }
-
-    private val uuidContentLens = json.auto<UuidContent>().toLens()
-    private val noteContentLens = json.auto<NoteContent>().map { it.content }.toLens()
-    private val searchContentLens = json.auto<SearchContent>().map { it.query }.toLens()
-    private val persistedNotesMetadataLens = json.auto<List<PersistedNoteMetadata>>().toLens()
-    private val persistedNoteLens = json.auto<PersistedNote>().toLens()
-    private val uuidLens = Path.uuid().of("uuid")
-}
-
-@Serializable
-data class NoteContent(val content: String)
-
-@Serializable
-data class UuidContent(@Contextual val uuid: UUID)
-
-@Serializable
-data class SearchContent(@Contextual val query: String)

app/src/api/ApiUserController.kt

@@ -1,31 +0,0 @@
-package be.simplenotes.app.api
-
-import be.simplenotes.app.extensions.auto
-import be.simplenotes.domain.usecases.UserService
-import be.simplenotes.domain.usecases.users.login.LoginForm
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import org.http4k.core.Request
-import org.http4k.core.Response
-import org.http4k.core.Status.Companion.BAD_REQUEST
-import org.http4k.core.Status.Companion.OK
-import javax.inject.Singleton
-
-@Singleton
-class ApiUserController(
-    json: Json,
-    private val userService: UserService,
-) {
-    private val tokenLens = json.auto<Token>().toLens()
-    private val loginFormLens = json.auto<LoginForm>().toLens()
-
-    fun login(request: Request) = userService
-        .login(loginFormLens(request))
-        .fold(
-            { Response(BAD_REQUEST) },
-            { tokenLens(Token(it), Response(OK)) }
-        )
-}
-
-@Serializable
-data class Token(val token: String)

app/src/controllers/BaseController.kt

@@ -1,15 +0,0 @@
-package be.simplenotes.app.controllers
-
-import be.simplenotes.app.extensions.html
-import be.simplenotes.types.LoggedInUser
-import be.simplenotes.views.BaseView
-import org.http4k.core.Request
-import org.http4k.core.Response
-import org.http4k.core.Status.Companion.OK
-import javax.inject.Singleton
-
-@Singleton
-class BaseController(private val view: BaseView) {
-    fun index(@Suppress("UNUSED_PARAMETER") request: Request, loggedInUser: LoggedInUser?) =
-        Response(OK).html(view.renderHome(loggedInUser))
-}

app/src/controllers/HealthCheckController.kt

@@ -1,14 +0,0 @@
-package be.simplenotes.app.controllers
-
-import be.simplenotes.domain.usecases.HealthCheckService
-import org.http4k.core.Request
-import org.http4k.core.Response
-import org.http4k.core.Status.Companion.OK
-import org.http4k.core.Status.Companion.SERVICE_UNAVAILABLE
-import javax.inject.Singleton
-
-@Singleton
-class HealthCheckController(private val healthCheckService: HealthCheckService) {
-    fun healthCheck(@Suppress("UNUSED_PARAMETER") request: Request) =
-        if (healthCheckService.isOk()) Response(OK) else Response(SERVICE_UNAVAILABLE)
-}

app/src/extensions/Http4kExtensions.kt

@@ -1,36 +0,0 @@
-package be.simplenotes.app.extensions
-
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import org.http4k.asString
-import org.http4k.core.Body
-import org.http4k.core.ContentType
-import org.http4k.core.Request
-import org.http4k.core.Response
-import org.http4k.core.Status.Companion.FOUND
-import org.http4k.core.Status.Companion.MOVED_PERMANENTLY
-import org.http4k.lens.*
-
-fun Response.html(html: String) = body(html)
-    .header("Content-Type", "text/html; charset=utf-8")
-    .header("Cache-Control", "no-cache")
-
-fun Response.Companion.redirect(url: String, permanent: Boolean = false) =
-    Response(if (permanent) MOVED_PERMANENTLY else FOUND).header("Location", url)
-
-fun Request.isSecure() = header("X-Forwarded-Proto")?.contains("https") ?: false
-
-val bodyLens = httpBodyRoot(
-    listOf(Meta(true, "body", ParamMeta.ObjectParam, "body")),
-    ContentType.APPLICATION_JSON.withNoDirectives(),
-    ContentNegotiation.StrictNoDirective
-).map(
-    { it.payload.asString() },
-    { Body(it) }
-)
-
-inline fun <reified T> Json.auto(): BiDiBodyLensSpec<T> = bodyLens.map(
-    { decodeFromString(it) },
-    { encodeToString(it) }
-)

app/src/filters/auth/AuthFilter.kt

@@ -1,24 +0,0 @@
-package be.simplenotes.app.filters.auth
-
-import be.simplenotes.types.LoggedInUser
-import org.http4k.core.Request
-import org.http4k.core.cookie.cookie
-import org.http4k.lens.BiDiLens
-
-typealias OptionalAuthLens = BiDiLens<@JvmSuppressWildcards Request, @JvmSuppressWildcards LoggedInUser?>
-typealias RequiredAuthLens = BiDiLens<@JvmSuppressWildcards Request, @JvmSuppressWildcards LoggedInUser>
-
-enum class JwtSource {
-    Header, Cookie
-}
-
-fun Request.bearerTokenCookie(): String? = cookie("Bearer")
-    ?.value
-    ?.trim()
-
-fun Request.bearerTokenHeader(): String? =
-    header("Authorization")
-        ?.trim()
-        ?.takeIf { it.startsWith("Bearer") }
-        ?.substringAfter("Bearer")
-        ?.trim()

app/src/filters/auth/OptionalAuthFilter.kt

@@ -1,23 +0,0 @@
-package be.simplenotes.app.filters.auth
-
-import be.simplenotes.app.filters.auth.JwtSource.Cookie
-import be.simplenotes.domain.security.SimpleJwt
-import be.simplenotes.types.LoggedInUser
-import org.http4k.core.Filter
-import org.http4k.core.HttpHandler
-import org.http4k.core.with
-
-class OptionalAuthFilter(
-    private val simpleJwt: SimpleJwt<LoggedInUser>,
-    private val lens: OptionalAuthLens,
-    private val source: JwtSource = Cookie,
-) : Filter {
-    override fun invoke(next: HttpHandler): HttpHandler = {
-        val token = when (source) {
-            JwtSource.Header -> it.bearerTokenHeader()
-            Cookie -> it.bearerTokenCookie()
-        }
-
-        next(it.with(lens of token?.let { simpleJwt.extract(it) }))
-    }
-}

app/src/filters/auth/RequiredAuthFilter.kt

@@ -1,31 +0,0 @@
-package be.simplenotes.app.filters.auth
-
-import be.simplenotes.app.extensions.redirect
-import be.simplenotes.domain.security.SimpleJwt
-import be.simplenotes.types.LoggedInUser
-import org.http4k.core.Filter
-import org.http4k.core.HttpHandler
-import org.http4k.core.Response
-import org.http4k.core.Status.Companion.UNAUTHORIZED
-import org.http4k.core.with
-
-class RequiredAuthFilter(
-    private val simpleJwt: SimpleJwt<LoggedInUser>,
-    private val lens: RequiredAuthLens,
-    private val source: JwtSource = JwtSource.Cookie,
-    private val redirect: Boolean = true,
-) : Filter {
-    override fun invoke(next: HttpHandler): HttpHandler = {
-        val token = when (source) {
-            JwtSource.Header -> it.bearerTokenHeader()
-            JwtSource.Cookie -> it.bearerTokenCookie()
-        }
-        val jwtPayload = token?.let { simpleJwt.extract(token) }
-
-        if (jwtPayload != null) next(it.with(lens of jwtPayload))
-        else {
-            if (redirect) Response.redirect("/login")
-            else Response(UNAUTHORIZED)
-        }
-    }
-}

app/src/jetty/Jetty.kt

@@ -1,40 +0,0 @@
-package be.simplenotes.app.jetty
-
-import org.eclipse.jetty.server.Server
-import org.eclipse.jetty.server.ServerConnector
-import org.eclipse.jetty.servlet.ServletContextHandler
-import org.eclipse.jetty.servlet.ServletContextHandler.SESSIONS
-import org.eclipse.jetty.servlet.ServletHolder
-import org.http4k.core.HttpHandler
-import org.http4k.server.Http4kServer
-import org.http4k.server.ServerConfig
-import org.http4k.servlet.asServlet
-
-class Jetty(private val port: Int, private val server: Server) : ServerConfig {
-    constructor(port: Int, vararg inConnectors: ConnectorBuilder) : this(
-        port,
-        Server().apply {
-            inConnectors.forEach { addConnector(it(this)) }
-        }
-    )
-
-    override fun toServer(http: HttpHandler): Http4kServer {
-        server.insertHandler(http.toJettyHandler())
-
-        return object : Http4kServer {
-            override fun start(): Http4kServer = apply {
-                server.start()
-            }
-
-            override fun stop(): Http4kServer = apply { server.stop() }
-
-            override fun port(): Int = if (port > 0) port else server.uri.port
-        }
-    }
-}
-
-fun HttpHandler.toJettyHandler() = ServletContextHandler(SESSIONS).apply {
-    addServlet(ServletHolder(this@toJettyHandler.asServlet()), "/*")
-}
-
-typealias ConnectorBuilder = (Server) -> ServerConnector

app/src/main/kotlin/Config.kt

@@ -0,0 +1,48 @@
+package be.simplenotes.app
+
+import be.simplenotes.shared.config.DataSourceConfig
+import be.simplenotes.shared.config.JwtConfig
+import be.simplenotes.shared.config.ServerConfig
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+class Config {
+    //region Config loading
+    private val properties: Properties = javaClass
+        .getResource("/application.properties")
+        .openStream()
+        .use {
+            Properties().apply { load(it) }
+        }
+
+    private val env = System.getenv()
+
+    private fun value(key: String): String =
+        env[key.toUpperCase().replace(".", "_")]
+            ?: properties.getProperty(key)
+            ?: error("Missing config key $key")
+    //endregion
+
+    val jwtConfig
+        get() = JwtConfig(
+            secret = value("jwt.secret"),
+            validity = value("jwt.validity").toLong(),
+            timeUnit = TimeUnit.HOURS,
+        )
+
+    val dataSourceConfig
+        get() = DataSourceConfig(
+            jdbcUrl = value("jdbcUrl"),
+            driverClassName = value("driverClassName"),
+            username = value("username"),
+            password = value("password"),
+            maximumPoolSize = value("maximumPoolSize").toInt(),
+            connectionTimeout = value("connectionTimeout").toLong()
+        )
+
+    val serverConfig
+        get() = ServerConfig(
+            host = value("host"),
+            port = value("port").toInt(),
+        )
+}

app/src/main/kotlin/Server.kt

@@ -2,26 +2,20 @@ package be.simplenotes.app
 
 import org.http4k.server.Http4kServer
 import org.slf4j.LoggerFactory
-import javax.annotation.PostConstruct
-import javax.annotation.PreDestroy
-import javax.inject.Singleton
-import be.simplenotes.config.ServerConfig as SimpleNotesServerConfig
+import be.simplenotes.shared.config.ServerConfig as SimpleNotesServerConfig
 
-@Singleton
 class Server(
     private val config: SimpleNotesServerConfig,
     private val http4kServer: Http4kServer,
 ) {
     private val logger = LoggerFactory.getLogger(javaClass)
 
-    @PostConstruct
     fun start(): Server {
         http4kServer.start()
-        logger.info("Listening on http://${config.host}:${http4kServer.port()}")
+        logger.info("Listening on http://${config.host}:${config.port}")
         return this
     }
 
-    @PreDestroy
     fun stop() {
         logger.info("Stopping server")
         http4kServer.close()

app/src/main/kotlin/SimpleNotes.kt

@@ -0,0 +1,31 @@
+package be.simplenotes.app
+
+import be.simplenotes.app.extensions.addShutdownHook
+import be.simplenotes.app.modules.*
+import be.simplenotes.domain.domainModule
+import be.simplenotes.persistance.migrationModule
+import be.simplenotes.persistance.persistanceModule
+import be.simplenotes.search.searchModule
+import org.koin.core.context.startKoin
+import org.koin.core.context.unloadKoinModules
+
+fun main() {
+    startKoin {
+        modules(
+            serverModule,
+            persistanceModule,
+            migrationModule,
+            configModule,
+            baseModule,
+            userModule,
+            noteModule,
+            settingsModule,
+            domainModule,
+            searchModule,
+            apiModule,
+            jsonModule
+        )
+    }.addShutdownHook()
+
+    unloadKoinModules(listOf(migrationModule, configModule))
+}

app/src/main/kotlin/api/ApiNoteController.kt

@@ -0,0 +1,77 @@
+package be.simplenotes.app.api
+
+import be.simplenotes.app.extensions.json
+import be.simplenotes.app.utils.parseSearchTerms
+import be.simplenotes.domain.model.PersistedNote
+import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.domain.security.JwtPayload
+import be.simplenotes.domain.usecases.NoteService
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.json.Json
+import org.http4k.core.Request
+import org.http4k.core.Response
+import org.http4k.core.Status.Companion.BAD_REQUEST
+import org.http4k.core.Status.Companion.NOT_FOUND
+import org.http4k.core.Status.Companion.OK
+import org.http4k.routing.path
+import java.util.*
+
+class ApiNoteController(private val noteService: NoteService, private val json: Json) {
+
+    fun createNote(request: Request, jwtPayload: JwtPayload): Response {
+        val content = json.decodeFromString(NoteContent.serializer(), request.bodyString()).content
+        return noteService.create(jwtPayload.userId, content).fold(
+            {
+                Response(BAD_REQUEST)
+            },
+            {
+                Response(OK).json(json.encodeToString(UuidContent.serializer(), UuidContent(it.uuid)))
+            }
+        )
+    }
+
+    fun notes(request: Request, jwtPayload: JwtPayload): Response {
+        val notes = noteService.paginatedNotes(jwtPayload.userId, page = 1).notes
+        val json = json.encodeToString(ListSerializer(PersistedNoteMetadata.serializer()), notes)
+        return Response(OK).json(json)
+    }
+
+    fun note(request: Request, jwtPayload: JwtPayload): Response {
+        val uuid = request.path("uuid")!!
+
+        return noteService.find(jwtPayload.userId, UUID.fromString(uuid))
+            ?.let { Response(OK).json(json.encodeToString(PersistedNote.serializer(), it)) }
+            ?: Response(NOT_FOUND)
+    }
+
+    fun update(request: Request, jwtPayload: JwtPayload): Response {
+        val uuid = UUID.fromString(request.path("uuid")!!)
+        val content = json.decodeFromString(NoteContent.serializer(), request.bodyString()).content
+        return noteService.update(jwtPayload.userId, uuid, content).fold({
+            Response(BAD_REQUEST)
+        }, {
+            if (it == null) Response(NOT_FOUND)
+            else Response(OK)
+        })
+    }
+
+    fun search(request: Request, jwtPayload: JwtPayload): Response {
+        val query = json.decodeFromString(SearchContent.serializer(), request.bodyString()).query
+        val terms = parseSearchTerms(query)
+        val notes = noteService.search(jwtPayload.userId, terms)
+        val json = json.encodeToString(ListSerializer(PersistedNoteMetadata.serializer()), notes)
+        return Response(OK).json(json)
+    }
+
+}
+
+@Serializable
+data class NoteContent(val content: String)
+
+@Serializable
+data class UuidContent(@Contextual val uuid: UUID)
+
+@Serializable
+data class SearchContent(@Contextual val query: String)

app/src/main/kotlin/api/ApiUserController.kt

@@ -0,0 +1,26 @@
+package be.simplenotes.app.api
+
+import be.simplenotes.app.extensions.json
+import be.simplenotes.domain.usecases.UserService
+import be.simplenotes.domain.usecases.users.login.LoginForm
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import org.http4k.core.Request
+import org.http4k.core.Response
+import org.http4k.core.Status
+
+class ApiUserController(private val userService: UserService, private val json: Json) {
+
+    fun login(request: Request): Response {
+        val form = json.decodeFromString(LoginForm.serializer(), request.bodyString())
+        val result = userService.login(form)
+        return result.fold({
+            Response(Status.BAD_REQUEST)
+        }, {
+            Response(Status.OK).json(json.encodeToString(Token.serializer(), Token(it)))
+        })
+    }
+}
+
+@Serializable
+data class Token(val token: String)

app/src/main/kotlin/controllers/BaseController.kt

@@ -0,0 +1,13 @@
+package be.simplenotes.app.controllers
+
+import be.simplenotes.app.extensions.html
+import be.simplenotes.app.views.BaseView
+import be.simplenotes.domain.security.JwtPayload
+import org.http4k.core.Request
+import org.http4k.core.Response
+import org.http4k.core.Status.Companion.OK
+
+class BaseController(private val view: BaseView) {
+    fun index(@Suppress("UNUSED_PARAMETER") request: Request, jwtPayload: JwtPayload?) =
+        Response(OK).html(view.renderHome(jwtPayload))
+}

app/src/main/kotlin/controllers/HealthCheckController.kt

@@ -0,0 +1,12 @@
+package be.simplenotes.app.controllers
+
+import be.simplenotes.persistance.DbHealthCheck
+import org.http4k.core.Request
+import org.http4k.core.Response
+import org.http4k.core.Status.Companion.OK
+import org.http4k.core.Status.Companion.SERVICE_UNAVAILABLE
+
+class HealthCheckController(private val dbHealthCheck: DbHealthCheck) {
+    fun healthCheck(request: Request) =
+        if (dbHealthCheck.isOk()) Response(OK) else Response(SERVICE_UNAVAILABLE)
+}

app/src/main/kotlin/controllers/NoteController.kt

@@ -2,12 +2,13 @@ package be.simplenotes.app.controllers
 
 import be.simplenotes.app.extensions.html
 import be.simplenotes.app.extensions.redirect
+import be.simplenotes.app.utils.parseSearchTerms
+import be.simplenotes.app.views.NoteView
+import be.simplenotes.domain.security.JwtPayload
 import be.simplenotes.domain.usecases.NoteService
 import be.simplenotes.domain.usecases.markdown.InvalidMeta
 import be.simplenotes.domain.usecases.markdown.MissingMeta
 import be.simplenotes.domain.usecases.markdown.ValidationError
-import be.simplenotes.types.LoggedInUser
-import be.simplenotes.views.NoteView
 import org.http4k.core.Method
 import org.http4k.core.Request
 import org.http4k.core.Response
@@ -17,35 +18,25 @@ import org.http4k.core.Status.Companion.OK
 import org.http4k.core.body.form
 import org.http4k.routing.path
 import java.util.*
-import javax.inject.Singleton
 import kotlin.math.abs
 
-@Singleton
 class NoteController(
     private val view: NoteView,
     private val noteService: NoteService,
 ) {
 
-    fun new(request: Request, loggedInUser: LoggedInUser): Response {
-        if (request.method == Method.GET) return Response(OK).html(view.noteEditor(loggedInUser))
+    fun new(request: Request, jwtPayload: JwtPayload): Response {
+        if (request.method == Method.GET) return Response(OK).html(view.noteEditor(jwtPayload))
 
         val markdownForm = request.form("markdown") ?: ""
 
-        return noteService.create(loggedInUser, markdownForm).fold(
+        return noteService.create(jwtPayload.userId, markdownForm).fold(
             {
                 val html = when (it) {
-                    MissingMeta -> view.noteEditor(
-                        loggedInUser,
-                        error = "Missing note metadata",
-                        textarea = markdownForm
-                    )
-                    InvalidMeta -> view.noteEditor(
-                        loggedInUser,
-                        error = "Invalid note metadata",
-                        textarea = markdownForm
-                    )
+                    MissingMeta -> view.noteEditor(jwtPayload, error = "Missing note metadata", textarea = markdownForm)
+                    InvalidMeta -> view.noteEditor(jwtPayload, error = "Invalid note metadata", textarea = markdownForm)
                     is ValidationError -> view.noteEditor(
-                        loggedInUser,
+                        jwtPayload,
                         validationErrors = it.validationErrors,
                         textarea = markdownForm
                     )
@@ -58,73 +49,66 @@ class NoteController(
         )
     }
 
-    fun list(request: Request, loggedInUser: LoggedInUser): Response {
+    fun list(request: Request, jwtPayload: JwtPayload): Response {
         val currentPage = request.query("page")?.toIntOrNull()?.let(::abs) ?: 1
         val tag = request.query("tag")
-        val (pages, notes) = noteService.paginatedNotes(loggedInUser.userId, currentPage, tag = tag)
-        val deletedCount = noteService.countDeleted(loggedInUser.userId)
-        return Response(OK).html(view.notes(loggedInUser, notes, currentPage, pages, deletedCount, tag = tag))
+        val (pages, notes) = noteService.paginatedNotes(jwtPayload.userId, currentPage, tag = tag)
+        val deletedCount = noteService.countDeleted(jwtPayload.userId)
+        return Response(OK).html(view.notes(jwtPayload, notes, currentPage, pages, deletedCount, tag = tag))
     }
 
-    fun search(request: Request, loggedInUser: LoggedInUser): Response {
+    fun search(request: Request, jwtPayload: JwtPayload): Response {
         val query = request.form("search") ?: ""
-        val notes = noteService.search(loggedInUser.userId, query)
-        val deletedCount = noteService.countDeleted(loggedInUser.userId)
-        return Response(OK).html(view.search(loggedInUser, notes, query, deletedCount))
+        val terms = parseSearchTerms(query)
+        val notes = noteService.search(jwtPayload.userId, terms)
+        val deletedCount = noteService.countDeleted(jwtPayload.userId)
+        return Response(OK).html(view.search(jwtPayload, notes, query, deletedCount))
     }
 
-    fun note(request: Request, loggedInUser: LoggedInUser): Response {
+    fun note(request: Request, jwtPayload: JwtPayload): Response {
         val noteUuid = request.uuidPath() ?: return Response(NOT_FOUND)
 
         if (request.method == Method.POST) {
             if (request.form("delete") != null) {
-                return if (noteService.trash(loggedInUser.userId, noteUuid))
+                return if (noteService.trash(jwtPayload.userId, noteUuid))
                     Response.redirect("/notes") // TODO: flash cookie to show success ?
                 else
                     Response(NOT_FOUND) // TODO: show an error
             }
             if (request.form("public") != null) {
-                if (!noteService.makePublic(loggedInUser.userId, noteUuid)) return Response(NOT_FOUND)
+                if (!noteService.makePublic(jwtPayload.userId, noteUuid)) return Response(NOT_FOUND)
             } else if (request.form("private") != null) {
-                if (!noteService.makePrivate(loggedInUser.userId, noteUuid)) return Response(NOT_FOUND)
+                if (!noteService.makePrivate(jwtPayload.userId, noteUuid)) return Response(NOT_FOUND)
             }
         }
 
-        val note = noteService.find(loggedInUser.userId, noteUuid) ?: return Response(NOT_FOUND)
-        return Response(OK).html(view.renderedNote(loggedInUser, note, shared = false))
+        val note = noteService.find(jwtPayload.userId, noteUuid) ?: return Response(NOT_FOUND)
+        return Response(OK).html(view.renderedNote(jwtPayload, note, shared = false))
     }
 
-    fun public(request: Request, loggedInUser: LoggedInUser?): Response {
+    fun public(request: Request, jwtPayload: JwtPayload?): Response {
         val noteUuid = request.uuidPath() ?: return Response(NOT_FOUND)
         val note = noteService.findPublic(noteUuid) ?: return Response(NOT_FOUND)
-        return Response(OK).html(view.renderedNote(loggedInUser, note, shared = true))
+        return Response(OK).html(view.renderedNote(jwtPayload, note, shared = true))
     }
 
-    fun edit(request: Request, loggedInUser: LoggedInUser): Response {
+    fun edit(request: Request, jwtPayload: JwtPayload): Response {
         val noteUuid = request.uuidPath() ?: return Response(NOT_FOUND)
-        val note = noteService.find(loggedInUser.userId, noteUuid) ?: return Response(NOT_FOUND)
+        val note = noteService.find(jwtPayload.userId, noteUuid) ?: return Response(NOT_FOUND)
 
         if (request.method == Method.GET) {
-            return Response(OK).html(view.noteEditor(loggedInUser, textarea = note.markdown))
+            return Response(OK).html(view.noteEditor(jwtPayload, textarea = note.markdown))
         }
 
         val markdownForm = request.form("markdown") ?: ""
 
-        return noteService.update(loggedInUser, note.uuid, markdownForm).fold(
+        return noteService.update(jwtPayload.userId, note.uuid, markdownForm).fold(
             {
                 val html = when (it) {
-                    MissingMeta -> view.noteEditor(
-                        loggedInUser,
-                        error = "Missing note metadata",
-                        textarea = markdownForm
-                    )
-                    InvalidMeta -> view.noteEditor(
-                        loggedInUser,
-                        error = "Invalid note metadata",
-                        textarea = markdownForm
-                    )
+                    MissingMeta -> view.noteEditor(jwtPayload, error = "Missing note metadata", textarea = markdownForm)
+                    InvalidMeta -> view.noteEditor(jwtPayload, error = "Invalid note metadata", textarea = markdownForm)
                     is ValidationError -> view.noteEditor(
-                        loggedInUser,
+                        jwtPayload,
                         validationErrors = it.validationErrors,
                         textarea = markdownForm
                     )
@@ -137,21 +121,21 @@ class NoteController(
         )
     }
 
-    fun trash(request: Request, loggedInUser: LoggedInUser): Response {
+    fun trash(request: Request, jwtPayload: JwtPayload): Response {
         val currentPage = request.query("page")?.toIntOrNull()?.let(::abs) ?: 1
         val tag = request.query("tag")
-        val (pages, notes) = noteService.paginatedNotes(loggedInUser.userId, currentPage, tag = tag, deleted = true)
-        return Response(OK).html(view.trash(loggedInUser, notes, currentPage, pages))
+        val (pages, notes) = noteService.paginatedNotes(jwtPayload.userId, currentPage, tag = tag, deleted = true)
+        return Response(OK).html(view.trash(jwtPayload, notes, currentPage, pages))
     }
 
-    fun deleted(request: Request, loggedInUser: LoggedInUser): Response {
+    fun deleted(request: Request, jwtPayload: JwtPayload): Response {
         val uuid = request.uuidPath() ?: return Response(NOT_FOUND)
         return if (request.form("delete") != null)
-            if (noteService.delete(loggedInUser.userId, uuid))
+            if (noteService.delete(jwtPayload.userId, uuid))
                 Response.redirect("/notes/trash")
             else
                 Response(NOT_FOUND)
-        else if (noteService.restore(loggedInUser.userId, uuid))
+        else if (noteService.restore(jwtPayload.userId, uuid))
             Response.redirect("/notes/$uuid")
         else
             Response(NOT_FOUND)

app/src/main/kotlin/controllers/SettingsController.kt

@@ -2,26 +2,24 @@ package be.simplenotes.app.controllers
 
 import be.simplenotes.app.extensions.html
 import be.simplenotes.app.extensions.redirect
+import be.simplenotes.app.views.SettingView
+import be.simplenotes.domain.security.JwtPayload
 import be.simplenotes.domain.usecases.UserService
 import be.simplenotes.domain.usecases.users.delete.DeleteError
 import be.simplenotes.domain.usecases.users.delete.DeleteForm
-import be.simplenotes.types.LoggedInUser
-import be.simplenotes.views.SettingView
 import org.http4k.core.*
 import org.http4k.core.body.form
 import org.http4k.core.cookie.invalidateCookie
-import javax.inject.Singleton
 
-@Singleton
 class SettingsController(
     private val userService: UserService,
     private val settingView: SettingView,
 ) {
-    fun settings(request: Request, loggedInUser: LoggedInUser): Response {
+    fun settings(request: Request, jwtPayload: JwtPayload): Response {
         if (request.method == Method.GET)
-            return Response(Status.OK).html(settingView.settings(loggedInUser))
+            return Response(Status.OK).html(settingView.settings(jwtPayload))
 
-        val deleteForm = request.deleteForm(loggedInUser)
+        val deleteForm = request.deleteForm(jwtPayload)
         val result = userService.delete(deleteForm)
 
         return result.fold(
@@ -30,13 +28,13 @@ class SettingsController(
                     DeleteError.Unregistered -> Response.redirect("/").invalidateCookie("Bearer")
                     DeleteError.WrongPassword -> Response(Status.OK).html(
                         settingView.settings(
-                            loggedInUser,
+                            jwtPayload,
                             error = "Wrong password"
                         )
                     )
                     is DeleteError.InvalidForm -> Response(Status.OK).html(
                         settingView.settings(
-                            loggedInUser,
+                            jwtPayload,
                             validationErrors = it.validationErrors
                         )
                     )
@@ -55,26 +53,23 @@ class SettingsController(
             .header("Content-Type", contentType)
     }
 
-    fun export(request: Request, loggedInUser: LoggedInUser): Response {
+    fun export(request: Request, jwtPayload: JwtPayload): Response {
         val isDownload = request.form("download") != null
 
         return if (isDownload) {
-            val filename = "simplenotes-export-${loggedInUser.username}"
+            val filename = "simplenotes-export-${jwtPayload.username}"
             if (request.form("format") == "zip") {
-                val zip = userService.exportAsZip(loggedInUser.userId)
+                val zip = userService.exportAsZip(jwtPayload.userId)
                 Response(Status.OK)
                     .with(attachment("$filename.zip", "application/zip"))
                     .body(zip)
             } else
                 Response(Status.OK)
                     .with(attachment("$filename.json", "application/json"))
-                    .body(userService.exportAsJson(loggedInUser.userId))
-        } else Response(Status.OK).body(userService.exportAsJson(loggedInUser.userId)).header(
-            "Content-Type",
-            "application/json"
-        )
+                    .body(userService.exportAsJson(jwtPayload.userId))
+        } else Response(Status.OK).body(userService.exportAsJson(jwtPayload.userId)).header("Content-Type", "application/json")
     }
 
-    private fun Request.deleteForm(loggedInUser: LoggedInUser) =
-        DeleteForm(loggedInUser.username, form("password"), form("checked") != null)
+    private fun Request.deleteForm(jwtPayload: JwtPayload) =
+        DeleteForm(jwtPayload.username, form("password"), form("checked") != null)
 }

app/src/main/kotlin/controllers/UserController.kt

@@ -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.config.JwtConfig
+import be.simplenotes.app.views.UserView
+import be.simplenotes.domain.security.JwtPayload
 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.types.LoggedInUser
-import be.simplenotes.views.UserView
+import be.simplenotes.shared.config.JwtConfig
 import org.http4k.core.Method.GET
 import org.http4k.core.Request
 import org.http4k.core.Response
@@ -21,17 +21,15 @@ import org.http4k.core.cookie.SameSite
 import org.http4k.core.cookie.cookie
 import org.http4k.core.cookie.invalidateCookie
 import java.util.concurrent.TimeUnit
-import javax.inject.Singleton
 
-@Singleton
 class UserController(
     private val userService: UserService,
     private val userView: UserView,
     private val jwtConfig: JwtConfig,
 ) {
-    fun register(request: Request, loggedInUser: LoggedInUser?): Response {
+    fun register(request: Request, jwtPayload: JwtPayload?): Response {
         if (request.method == GET) return Response(OK).html(
-            userView.register(loggedInUser)
+            userView.register(jwtPayload)
         )
 
         val result = userService.register(request.registerForm())
@@ -40,12 +38,12 @@ class UserController(
             {
                 val html = when (it) {
                     UserExists -> userView.register(
-                        loggedInUser,
+                        jwtPayload,
                         error = "User already exists"
                     )
                     is InvalidRegisterForm ->
                         userView.register(
-                            loggedInUser,
+                            jwtPayload,
                             validationErrors = it.validationErrors
                         )
                 }
@@ -60,9 +58,9 @@ class UserController(
     private fun Request.registerForm() = RegisterForm(form("username"), form("password"))
     private fun Request.loginForm(): LoginForm = registerForm()
 
-    fun login(request: Request, loggedInUser: LoggedInUser?): Response {
+    fun login(request: Request, jwtPayload: JwtPayload?): Response {
         if (request.method == GET) return Response(OK).html(
-            userView.login(loggedInUser)
+            userView.login(jwtPayload)
         )
 
         val result = userService.login(request.loginForm())
@@ -72,17 +70,17 @@ class UserController(
                 val html = when (it) {
                     Unregistered ->
                         userView.login(
-                            loggedInUser,
+                            jwtPayload,
                             error = "User does not exist"
                         )
                     WrongPassword ->
                         userView.login(
-                            loggedInUser,
+                            jwtPayload,
                             error = "Wrong password"
                         )
                     is InvalidLoginForm ->
                         userView.login(
-                            loggedInUser,
+                            jwtPayload,
                             validationErrors = it.validationErrors
                         )
                 }

app/src/main/kotlin/extensions/Http4kExtensions.kt

@@ -0,0 +1,17 @@
+package be.simplenotes.app.extensions
+
+import org.http4k.core.Request
+import org.http4k.core.Response
+import org.http4k.core.Status.Companion.FOUND
+import org.http4k.core.Status.Companion.MOVED_PERMANENTLY
+
+fun Response.html(html: String) = body(html)
+    .header("Content-Type", "text/html; charset=utf-8")
+    .header("Cache-Control", "no-cache")
+
+fun Response.json(json: String) = body(json).header("Content-Type", "application/json")
+
+fun Response.Companion.redirect(url: String, permanent: Boolean = false) =
+    Response(if (permanent) MOVED_PERMANENTLY else FOUND).header("Location", url)
+
+fun Request.isSecure() = header("X-Forwarded-Proto")?.contains("https") ?: false

app/src/main/kotlin/extensions/KoinExtensions.kt

@@ -0,0 +1,12 @@
+package be.simplenotes.app.extensions
+
+import org.koin.core.KoinApplication
+import kotlin.concurrent.thread
+
+fun KoinApplication.addShutdownHook() {
+    Runtime.getRuntime().addShutdownHook(
+        thread(start = false) {
+            close()
+        }
+    )
+}

app/src/main/kotlin/extensions/KotlinxHtmlExtensions.kt

@@ -0,0 +1,15 @@
+package be.simplenotes.app.extensions
+
+import kotlinx.html.*
+
+class SUMMARY(consumer: TagConsumer<*>) :
+    HTMLTag(
+        "summary", consumer, emptyMap(),
+        inlineTag = true,
+        emptyTag = false
+    ),
+    HtmlInlineTag
+
+fun DETAILS.summary(block: SUMMARY.() -> Unit = {}) {
+    SUMMARY(consumer).visit(block)
+}

app/src/main/kotlin/filters/AuthFilter.kt

@@ -0,0 +1,58 @@
+package be.simplenotes.app.filters
+
+import be.simplenotes.app.extensions.redirect
+import be.simplenotes.domain.security.JwtPayload
+import be.simplenotes.domain.security.JwtPayloadExtractor
+import org.http4k.core.*
+import org.http4k.core.Status.Companion.UNAUTHORIZED
+import org.http4k.core.cookie.cookie
+
+enum class AuthType {
+    Optional, Required
+}
+
+private const val authKey = "auth"
+
+class AuthFilter(
+    private val extractor: JwtPayloadExtractor,
+    private val authType: AuthType,
+    private val ctx: RequestContexts,
+    private val source: JwtSource = JwtSource.Cookie,
+    private val redirect: Boolean = true,
+) : Filter {
+    override fun invoke(next: HttpHandler): HttpHandler = {
+        val token = when (source) {
+            JwtSource.Header -> it.bearerTokenHeader()
+            JwtSource.Cookie -> it.bearerTokenCookie()
+        }
+        val jwtPayload = token?.let { token -> extractor(token) }
+        when {
+            jwtPayload != null -> {
+                ctx[it][authKey] = jwtPayload
+                next(it)
+            }
+            authType == AuthType.Required -> {
+                if (redirect) Response.redirect("/login")
+                else Response(UNAUTHORIZED)
+            }
+            else -> next(it)
+        }
+    }
+}
+
+fun Request.jwtPayload(ctx: RequestContexts): JwtPayload? = ctx[this][authKey]
+
+enum class JwtSource {
+    Header, Cookie
+}
+
+private fun Request.bearerTokenCookie(): String? = cookie("Bearer")
+    ?.value
+    ?.trim()
+
+private fun Request.bearerTokenHeader(): String? =
+    header("Authorization")
+        ?.trim()
+        ?.takeIf { it.startsWith("Bearer") }
+        ?.substringAfter("Bearer")
+        ?.trim()

app/src/main/kotlin/filters/ErrorFilter.kt

@@ -1,8 +1,8 @@
 package be.simplenotes.app.filters
 
 import be.simplenotes.app.extensions.html
-import be.simplenotes.views.ErrorView
-import be.simplenotes.views.ErrorView.Type.*
+import be.simplenotes.app.views.ErrorView
+import be.simplenotes.app.views.ErrorView.Type.*
 import org.http4k.core.*
 import org.http4k.core.Status.Companion.INTERNAL_SERVER_ERROR
 import org.http4k.core.Status.Companion.NOT_FOUND
@@ -10,9 +10,7 @@ import org.http4k.core.Status.Companion.NOT_IMPLEMENTED
 import org.http4k.core.Status.Companion.SERVICE_UNAVAILABLE
 import org.slf4j.LoggerFactory
 import java.sql.SQLTransientException
-import javax.inject.Singleton
 
-@Singleton
 class ErrorFilter(private val errorView: ErrorView) : Filter {
 
     private val logger = LoggerFactory.getLogger(javaClass)

app/src/main/kotlin/filters/ImmutableFilter.kt

@@ -3,13 +3,9 @@ package be.simplenotes.app.filters
 import org.http4k.core.Filter
 import org.http4k.core.HttpHandler
 import org.http4k.core.Request
-import org.http4k.core.Status.Companion.OK
 
 object ImmutableFilter : Filter {
     override fun invoke(next: HttpHandler) = { request: Request ->
-        val res = next(request)
-        if (res.status == OK)
-            res.header("Cache-Control", "public, max-age=31536000, immutable")
-        else res
+        next(request).header("Cache-Control", "public, max-age=31536000, immutable")
     }
 }

app/src/main/kotlin/filters/TransactionFilter.kt

@@ -0,0 +1,13 @@
+package be.simplenotes.app.filters
+
+import me.liuwj.ktorm.database.Database
+import org.http4k.core.Filter
+import org.http4k.core.HttpHandler
+
+class TransactionFilter(private val db: Database) : Filter {
+    override fun invoke(next: HttpHandler): HttpHandler = { request ->
+        db.useTransaction {
+            next(request)
+        }
+    }
+}

app/src/main/kotlin/modules/ApiModule.kt

@@ -0,0 +1,24 @@
+package be.simplenotes.app.modules
+
+import be.simplenotes.app.api.ApiNoteController
+import be.simplenotes.app.api.ApiUserController
+import be.simplenotes.app.filters.AuthFilter
+import be.simplenotes.app.filters.AuthType
+import be.simplenotes.app.filters.JwtSource
+import org.http4k.core.Filter
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
+
+val apiModule = module {
+    single { ApiUserController(get(), get()) }
+    single { ApiNoteController(get(), get()) }
+    single<Filter>(named("apiAuthFilter")) {
+        AuthFilter(
+            extractor = get(),
+            authType = AuthType.Required,
+            ctx = get(),
+            source = JwtSource.Header,
+            redirect = false
+        )
+    }
+}

app/src/main/kotlin/modules/ConfigModule.kt

@@ -0,0 +1,11 @@
+package be.simplenotes.app.modules
+
+import be.simplenotes.app.Config
+import org.koin.dsl.module
+
+val configModule = module {
+    single { Config() }
+    single { get<Config>().dataSourceConfig }
+    single { get<Config>().jwtConfig }
+    single { get<Config>().serverConfig }
+}

app/src/main/kotlin/modules/CoreModules.kt

@@ -0,0 +1,29 @@
+package be.simplenotes.app.modules
+
+import be.simplenotes.app.controllers.*
+import be.simplenotes.app.views.BaseView
+import be.simplenotes.app.views.NoteView
+import be.simplenotes.app.views.SettingView
+import be.simplenotes.app.views.UserView
+import org.koin.dsl.module
+
+val userModule = module {
+    single { UserController(get(), get(), get()) }
+    single { UserView(get()) }
+}
+
+val baseModule = module {
+    single { HealthCheckController(get()) }
+    single { BaseController(get()) }
+    single { BaseView(get()) }
+}
+
+val noteModule = module {
+    single { NoteController(get(), get()) }
+    single { NoteView(get()) }
+}
+
+val settingsModule = module {
+    single { SettingsController(get(), get()) }
+    single { SettingView(get()) }
+}

app/src/main/kotlin/modules/JsonModule.kt

@@ -2,20 +2,21 @@ package be.simplenotes.app.modules
 
 import be.simplenotes.app.serialization.LocalDateTimeSerializer
 import be.simplenotes.app.serialization.UuidSerializer
-import io.micronaut.context.annotation.Factory
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.SerializersModule
+import org.koin.dsl.module
 import java.time.LocalDateTime
 import java.util.*
-import javax.inject.Singleton
 
-@Factory
-class JsonModule {
-
-    @Singleton
-    fun json() = Json {
+val jsonModule = module {
+    single {
+        Json {
             prettyPrint = true
-        serializersModule = SerializersModule {
+            serializersModule = get()
+        }
+    }
+    single {
+        SerializersModule {
             contextual(LocalDateTime::class, LocalDateTimeSerializer())
             contextual(UUID::class, UuidSerializer())
         }

app/src/main/kotlin/modules/ServerModule.kt

@@ -0,0 +1,63 @@
+package be.simplenotes.app.modules
+
+import be.simplenotes.app.Server
+import be.simplenotes.app.filters.AuthFilter
+import be.simplenotes.app.filters.AuthType
+import be.simplenotes.app.filters.ErrorFilter
+import be.simplenotes.app.filters.TransactionFilter
+import be.simplenotes.app.routes.Router
+import be.simplenotes.app.utils.StaticFileResolver
+import be.simplenotes.app.utils.StaticFileResolverImpl
+import be.simplenotes.app.views.ErrorView
+import be.simplenotes.shared.config.ServerConfig
+import org.eclipse.jetty.server.ServerConnector
+import org.http4k.core.Filter
+import org.http4k.core.RequestContexts
+import org.http4k.routing.RoutingHttpHandler
+import org.http4k.server.ConnectorBuilder
+import org.http4k.server.Jetty
+import org.http4k.server.asServer
+import org.koin.core.qualifier.named
+import org.koin.core.qualifier.qualifier
+import org.koin.dsl.module
+import org.koin.dsl.onClose
+import org.http4k.server.ServerConfig as Http4kServerConfig
+
+val serverModule = module {
+    single(createdAtStart = true) { Server(get(), get()).start() } onClose { it?.stop() }
+    single { get<RoutingHttpHandler>().asServer(get()) }
+    single<Http4kServerConfig> {
+        val config = get<ServerConfig>()
+        val builder: ConnectorBuilder = { server: org.eclipse.jetty.server.Server ->
+            ServerConnector(server).apply {
+                port = config.port
+                host = config.host
+            }
+        }
+        Jetty(config.port, builder)
+    }
+    single<StaticFileResolver> { StaticFileResolverImpl(get()) }
+    single {
+        Router(
+            get(),
+            get(),
+            get(),
+            get(),
+            get(),
+            get(),
+            get(),
+            requiredAuth = get(AuthType.Required.qualifier),
+            optionalAuth = get(AuthType.Optional.qualifier),
+            apiAuth = get(named("apiAuthFilter")),
+            get(),
+            get(),
+            get(),
+        )()
+    }
+    single { RequestContexts() }
+    single<Filter>(AuthType.Optional.qualifier) { AuthFilter(get(), AuthType.Optional, get()) }
+    single<Filter>(AuthType.Required.qualifier) { AuthFilter(get(), AuthType.Required, get()) }
+    single { ErrorFilter(get()) }
+    single { TransactionFilter(get()) }
+    single { ErrorView(get()) }
+}

app/src/main/kotlin/routes/Router.kt

@@ -0,0 +1,106 @@
+package be.simplenotes.app.routes
+
+import be.simplenotes.app.api.ApiNoteController
+import be.simplenotes.app.api.ApiUserController
+import be.simplenotes.app.controllers.*
+import be.simplenotes.app.filters.*
+import be.simplenotes.domain.security.JwtPayload
+import org.http4k.core.*
+import org.http4k.core.Method.*
+import org.http4k.filter.ResponseFilters.GZip
+import org.http4k.filter.ServerFilters.InitialiseRequestContext
+import org.http4k.routing.*
+import org.http4k.routing.ResourceLoader.Companion.Classpath
+
+class Router(
+    private val baseController: BaseController,
+    private val userController: UserController,
+    private val noteController: NoteController,
+    private val settingsController: SettingsController,
+    private val apiUserController: ApiUserController,
+    private val apiNoteController: ApiNoteController,
+    private val healthCheckController: HealthCheckController,
+    private val requiredAuth: Filter,
+    private val optionalAuth: Filter,
+    private val apiAuth: Filter,
+    private val errorFilter: ErrorFilter,
+    private val transactionFilter: TransactionFilter,
+    private val contexts: RequestContexts,
+) {
+    operator fun invoke(): RoutingHttpHandler {
+
+        val basicRoutes =
+            routes(
+                "/health" bind GET to healthCheckController::healthCheck,
+                ImmutableFilter.then(static(Classpath("/static"), "woff2" to ContentType("font/woff2")))
+            )
+
+        val publicRoutes = routes(
+            "/" bind GET public baseController::index,
+            "/register" bind GET public userController::register,
+            "/register" bind POST `public transactional` userController::register,
+            "/login" bind GET public userController::login,
+            "/login" bind POST public userController::login,
+            "/logout" bind POST to userController::logout,
+            "/notes/public/{uuid}" bind GET public noteController::public,
+        )
+
+        val protectedRoutes = routes(
+            "/settings" bind GET protected settingsController::settings,
+            "/settings" bind POST transactional settingsController::settings,
+            "/export" bind POST protected settingsController::export,
+            "/notes" bind GET protected noteController::list,
+            "/notes" bind POST protected noteController::search,
+            "/notes/new" bind GET protected noteController::new,
+            "/notes/new" bind POST transactional noteController::new,
+            "/notes/trash" bind GET protected noteController::trash,
+            "/notes/{uuid}" bind GET protected noteController::note,
+            "/notes/{uuid}" bind POST transactional noteController::note,
+            "/notes/{uuid}/edit" bind GET protected noteController::edit,
+            "/notes/{uuid}/edit" bind POST transactional noteController::edit,
+            "/notes/deleted/{uuid}" bind POST transactional noteController::deleted,
+        )
+
+        val apiRoutes = routes(
+            "/api/login" bind POST to apiUserController::login,
+        )
+
+        val protectedApiRoutes = routes(
+            "/api/notes" bind GET protected apiNoteController::notes,
+            "/api/notes" bind POST transactional apiNoteController::createNote,
+            "/api/notes/search" bind POST transactional apiNoteController::search,
+            "/api/notes/{uuid}" bind GET protected apiNoteController::note,
+            "/api/notes/{uuid}" bind PUT transactional apiNoteController::update,
+        )
+
+        val routes = routes(
+            basicRoutes,
+            optionalAuth.then(publicRoutes),
+            requiredAuth.then(protectedRoutes),
+            apiAuth.then(protectedApiRoutes),
+            apiRoutes,
+        )
+
+        val globalFilters = errorFilter
+            .then(InitialiseRequestContext(contexts))
+            .then(SecurityFilter)
+            .then(GZip())
+
+        return globalFilters.then(routes)
+    }
+
+    private inline infix fun PathMethod.public(crossinline handler: PublicHandler) =
+        this to { handler(it, it.jwtPayload(contexts)) }
+
+    private inline infix fun PathMethod.protected(crossinline handler: ProtectedHandler) =
+        this to { handler(it, it.jwtPayload(contexts)!!) }
+
+    private inline infix fun PathMethod.transactional(crossinline handler: ProtectedHandler) =
+        this to transactionFilter.then { handler(it, it.jwtPayload(contexts)!!) }
+
+    private inline infix fun PathMethod.`public transactional`(crossinline handler: PublicHandler) =
+        this to transactionFilter.then { handler(it, it.jwtPayload(contexts)) }
+}
+
+private typealias PublicHandler = (Request, JwtPayload?) -> Response
+private typealias ProtectedHandler = (Request, JwtPayload) -> Response

app/src/main/kotlin/serialization/UuidSerializer.kt

@@ -10,7 +10,7 @@ import java.util.*
 
 internal class UuidSerializer : KSerializer<UUID> {
     override val descriptor: SerialDescriptor
-        get() = PrimitiveSerialDescriptor("UUID", PrimitiveKind.STRING)
+        get() = PrimitiveSerialDescriptor("LocalDateTime", PrimitiveKind.STRING)
 
     override fun serialize(encoder: Encoder, value: UUID) {
         encoder.encodeString(value.toString())

app/src/main/kotlin/utils/PrettyDate.kt

@@ -0,0 +1,10 @@
+package be.simplenotes.app.utils
+
+import org.ocpsoft.prettytime.PrettyTime
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.util.*
+
+private val prettyTime = PrettyTime()
+
+fun LocalDateTime.toTimeAgo(): String = prettyTime.format(Date.from(atZone(ZoneId.systemDefault()).toInstant()))

app/src/main/kotlin/utils/SearchTermsParser.kt

@@ -1,6 +1,6 @@
-package be.simplenotes.domain.usecases.search
+package be.simplenotes.app.utils
 
-import be.simplenotes.search.SearchTerms
+import be.simplenotes.domain.usecases.search.SearchTerms
 
 private fun innerRegex(name: String) =
     """$name:['"](.*?)['"]""".toRegex()
@@ -16,7 +16,7 @@ private val outerTagRe = outerRegex("tag")
 private val contentRe = innerRegex("content")
 private val outerContentRe = outerRegex("content")
 
-internal fun parseSearchTerms(input: String): SearchTerms {
+fun parseSearchTerms(input: String): SearchTerms {
     var c: String = input
 
     fun extract(innerRegex: Regex, outerRegex: Regex): String? {

app/src/main/kotlin/utils/StaticFilesResolver.kt

@@ -3,13 +3,11 @@ package be.simplenotes.app.utils
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
-import javax.inject.Singleton
 
 interface StaticFileResolver {
     fun resolve(name: String): String?
 }
 
-@Singleton
 class StaticFileResolverImpl(json: Json) : StaticFileResolver {
     private val mappings: Map<String, String>
 

app/src/main/kotlin/views/BaseView.kt

@@ -1,21 +1,19 @@
-package be.simplenotes.views
+package be.simplenotes.app.views
 
-import be.simplenotes.types.LoggedInUser
+import be.simplenotes.app.utils.StaticFileResolver
+import be.simplenotes.domain.security.JwtPayload
 import kotlinx.html.*
 import kotlinx.html.ThScope.col
-import javax.inject.Named
-import javax.inject.Singleton
 
-@Singleton
-class BaseView(@Named("styles") styles: String) : View(styles) {
-    fun renderHome(loggedInUser: LoggedInUser?) = renderPage(
+class BaseView(staticFileResolver: StaticFileResolver) : View(staticFileResolver) {
+    fun renderHome(jwtPayload: JwtPayload?) = renderPage(
         title = "Home",
         description = "A fast and simple note taking website",
-        loggedInUser = loggedInUser
+        jwtPayload = jwtPayload
     ) {
         section("text-center my-2 p-2") {
             h1("text-5xl casual") {
-                span("text-teal-300") { +"SimpleNotes " }
+                span("text-teal-300") { +"Simplenotes " }
                 +"- access your notes anywhere"
             }
         }

app/src/main/kotlin/views/ErrorView.kt

@@ -1,14 +1,12 @@
-package be.simplenotes.views
+package be.simplenotes.app.views
 
-import be.simplenotes.views.components.Alert
-import be.simplenotes.views.components.alert
+import be.simplenotes.app.utils.StaticFileResolver
+import be.simplenotes.app.views.components.Alert
+import be.simplenotes.app.views.components.alert
 import kotlinx.html.a
 import kotlinx.html.div
-import javax.inject.Named
-import javax.inject.Singleton
 
-@Singleton
-class ErrorView(@Named("styles") styles: String) : View(styles) {
+class ErrorView(staticFileResolver: StaticFileResolver) : View(staticFileResolver) {
 
     enum class Type(val title: String) {
         SqlTransientError("Database unavailable"),
@@ -16,7 +14,7 @@ class ErrorView(@Named("styles") styles: String) : View(styles) {
         Other("Error"),
     }
 
-    fun error(errorType: Type) = renderPage(errorType.title, loggedInUser = null) {
+    fun error(errorType: Type) = renderPage(errorType.title, jwtPayload = null) {
         div("container mx-auto p-4") {
             when (errorType) {
                 Type.SqlTransientError -> alert(

app/src/main/kotlin/views/NoteView.kt

@@ -1,23 +1,21 @@
-package be.simplenotes.views
+package be.simplenotes.app.views
 
-import be.simplenotes.types.LoggedInUser
-import be.simplenotes.types.PersistedNote
-import be.simplenotes.types.PersistedNoteMetadata
-import be.simplenotes.views.components.*
+import be.simplenotes.app.utils.StaticFileResolver
+import be.simplenotes.app.views.components.*
+import be.simplenotes.domain.model.PersistedNote
+import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.domain.security.JwtPayload
 import io.konform.validation.ValidationError
 import kotlinx.html.*
-import javax.inject.Named
-import javax.inject.Singleton
 
-@Singleton
-class NoteView(@Named("styles") styles: String) : View(styles) {
+class NoteView(staticFileResolver: StaticFileResolver) : View(staticFileResolver) {
 
     fun noteEditor(
-        loggedInUser: LoggedInUser,
+        jwtPayload: JwtPayload,
         error: String? = null,
         textarea: String? = null,
         validationErrors: List<ValidationError> = emptyList(),
-    ) = renderPage(title = "New note", loggedInUser = loggedInUser) {
+    ) = renderPage(title = "New note", jwtPayload = jwtPayload) {
         div("container mx-auto p-4") {
             error?.let { alert(Alert.Warning, error) }
             validationErrors.forEach {
@@ -40,9 +38,7 @@ class NoteView(@Named("styles") styles: String) : View(styles) {
                         |tags: []
                         |---
                         |
-                    """.trimMargin(
-                        "|"
-                    )
+                    """.trimMargin("|")
                 }
                 submitButton("Save")
             }
@@ -50,13 +46,13 @@ class NoteView(@Named("styles") styles: String) : View(styles) {
     }
 
     fun notes(
-        loggedInUser: LoggedInUser,
+        jwtPayload: JwtPayload,
         notes: List<PersistedNoteMetadata>,
         currentPage: Int,
         numberOfPages: Int,
         numberOfDeletedNotes: Int,
         tag: String?,
-    ) = renderPage(title = "Notes", loggedInUser = loggedInUser) {
+    ) = renderPage(title = "Notes", jwtPayload = jwtPayload) {
         div("container mx-auto p-4") {
             noteListHeader(numberOfDeletedNotes)
             if (notes.isNotEmpty())
@@ -72,11 +68,11 @@ class NoteView(@Named("styles") styles: String) : View(styles) {
     }
 
     fun search(
-        loggedInUser: LoggedInUser,
+        jwtPayload: JwtPayload,
         notes: List<PersistedNoteMetadata>,
         query: String,
         numberOfDeletedNotes: Int,
-    ) = renderPage("Notes", loggedInUser = loggedInUser) {
+    ) = renderPage("Notes", jwtPayload = jwtPayload) {
         div("container mx-auto p-4") {
             noteListHeader(numberOfDeletedNotes, query)
             noteTable(notes)
@@ -84,11 +80,11 @@ class NoteView(@Named("styles") styles: String) : View(styles) {
     }
 
     fun trash(
-        loggedInUser: LoggedInUser,
+        jwtPayload: JwtPayload,
         notes: List<PersistedNoteMetadata>,
         currentPage: Int,
         numberOfPages: Int,
-    ) = renderPage(title = "Notes", loggedInUser = loggedInUser) {
+    ) = renderPage(title = "Notes", jwtPayload = jwtPayload) {
         div("container mx-auto p-4") {
             div("flex justify-between mb-4") {
                 h1("text-2xl underline") { +"Deleted notes" }
@@ -120,9 +116,9 @@ class NoteView(@Named("styles") styles: String) : View(styles) {
         }
     }
 
-    fun renderedNote(loggedInUser: LoggedInUser?, note: PersistedNote, shared: Boolean) = renderPage(
+    fun renderedNote(jwtPayload: JwtPayload?, note: PersistedNote, shared: Boolean) = renderPage(
         note.meta.title,
-        loggedInUser = loggedInUser,
+        jwtPayload = jwtPayload,
         scripts = listOf("/highlight.10.1.2.js", "/init-highlight.0.0.1.js")
     ) {
         div("container mx-auto p-4") {
@@ -147,6 +143,7 @@ class NoteView(@Named("styles") styles: String) : View(styles) {
             }
             if (!shared) {
                 noteActionForm(note)
+                publicPrivateForm(note)
 
                 if (note.public) {
                     p("my-4") {
@@ -169,30 +166,12 @@ class NoteView(@Named("styles") styles: String) : View(styles) {
     }
 
     private fun DIV.noteActionForm(note: PersistedNote) {
-        form(method = FormMethod.post, classes = "inline flex space-x-2 justify-end mb-4") {
+        span("flex space-x-2 justify-end mb-4") {
             a(
                 href = "/notes/${note.uuid}/edit",
-                classes = "btn btn-green"
+                classes = "btn btn-teal"
             ) { +"Edit" }
-            span {
-                button(
-                    type = ButtonType.submit,
-                    name = if (note.public) "private" else "public",
-                    classes = "font-semibold border-b-4 ${if (note.public) "border-teal-200" else "border-green-500"}" +
-                        " p-2 rounded-l bg-teal-200 text-gray-800"
-                ) {
-                    +"Private"
-                }
-                button(
-                    type = ButtonType.submit,
-                    name = if (note.public) "private" else "public",
-                    classes = "font-semibold border-b-4 " +
-                        (if (!note.public) "border-teal-200" else "border-green-500") +
-                        " p-2 rounded-r bg-teal-200 text-gray-800"
-                ) {
-                    +"Public"
-                }
-            }
+            form(method = FormMethod.post, classes = "inline") {
                 button(
                     type = ButtonType.submit,
                     name = "delete",
@@ -201,3 +180,22 @@ class NoteView(@Named("styles") styles: String) : View(styles) {
             }
         }
     }
+
+    private fun DIV.publicPrivateForm(note: PersistedNote) {
+        span("flex space-x-2 justify-end mb-4") {
+
+            form(method = FormMethod.post, classes = "ml-auto ") {
+                button(
+                    type = ButtonType.submit,
+                    name = if (note.public) "private" else "public",
+                    classes = "btn btn-teal"
+                ) {
+                    if (note.public)
+                        +"This note is public, do you want to make it private ?"
+                    else
+                        +"This note is private, do you want to make it public ?"
+                }
+            }
+        }
+    }
+}

app/src/main/kotlin/views/SettingView.kt

@@ -1,52 +1,47 @@
-package be.simplenotes.views
+package be.simplenotes.app.views
 
-import be.simplenotes.types.LoggedInUser
-import be.simplenotes.views.components.Alert
-import be.simplenotes.views.components.alert
-import be.simplenotes.views.components.input
-import be.simplenotes.views.extensions.summary
+import be.simplenotes.app.extensions.summary
+import be.simplenotes.app.utils.StaticFileResolver
+import be.simplenotes.app.views.components.Alert
+import be.simplenotes.app.views.components.alert
+import be.simplenotes.app.views.components.input
+import be.simplenotes.domain.security.JwtPayload
 import io.konform.validation.ValidationError
 import kotlinx.html.*
 import kotlinx.html.ButtonType.submit
-import javax.inject.Named
-import javax.inject.Singleton
 
-@Singleton
-class SettingView(@Named("styles") styles: String) : View(styles) {
+class SettingView(staticFileResolver: StaticFileResolver) : View(staticFileResolver) {
 
     fun settings(
-        loggedInUser: LoggedInUser,
+        jwtPayload: JwtPayload,
         error: String? = null,
         validationErrors: List<ValidationError> = emptyList(),
-    ) = renderPage("Settings", loggedInUser = loggedInUser) {
+    ) = renderPage("Settings", jwtPayload = jwtPayload) {
         div("container mx-auto") {
 
             section("m-4 p-4 bg-gray-800 rounded") {
                 h1("text-xl") {
                     +"Welcome "
-                    span("text-teal-200 font-semibold") { +loggedInUser.username }
+                    span("text-teal-200 font-semibold") { +jwtPayload.username }
                 }
             }
 
-            section("m-4 p-2 bg-gray-800 rounded flex flex-wrap justify-around items-end") {
+            section("m-4 p-4 bg-gray-800 rounded flex justify-around") {
 
-                form(classes = "m-2", method = FormMethod.post, action = "/export") {
-                    button(
-                        name = "display",
+                form(method = FormMethod.post, action = "/export") {
+                    button(name = "display",
                         classes = "inline btn btn-teal block",
-                        type = submit
-                    ) { +"Display my data" }
+                        type = submit) { +"Display my data" }
                 }
 
-                form(classes = "m-2", method = FormMethod.post, action = "/export") {
+                form(method = FormMethod.post, action = "/export") {
 
-                    div {
                     listOf("json", "zip").forEach { format ->
+                        div {
                             radioInput(name = "format") {
                                 id = format
                                 attributes["value"] = format
                                 if(format == "json") attributes["checked"] = ""
-                                else attributes["class"] = "ml-4"
                             }
                             label(classes = "ml-2") {
                                 attributes["for"] = format

app/src/main/kotlin/views/UserView.kt

@@ -1,25 +1,23 @@
-package be.simplenotes.views
+package be.simplenotes.app.views
 
-import be.simplenotes.types.LoggedInUser
-import be.simplenotes.views.components.Alert
-import be.simplenotes.views.components.alert
-import be.simplenotes.views.components.input
-import be.simplenotes.views.components.submitButton
+import be.simplenotes.app.utils.StaticFileResolver
+import be.simplenotes.app.views.components.Alert
+import be.simplenotes.app.views.components.alert
+import be.simplenotes.app.views.components.input
+import be.simplenotes.app.views.components.submitButton
+import be.simplenotes.domain.security.JwtPayload
 import io.konform.validation.ValidationError
 import kotlinx.html.*
-import javax.inject.Named
-import javax.inject.Singleton
 
-@Singleton
-class UserView(@Named("styles") styles: String) : View(styles) {
+class UserView(staticFileResolver: StaticFileResolver) : View(staticFileResolver) {
     fun register(
-        loggedInUser: LoggedInUser?,
+        jwtPayload: JwtPayload?,
         error: String? = null,
         validationErrors: List<ValidationError> = emptyList(),
     ) = accountForm(
         "Register",
         "Registration page",
-        loggedInUser,
+        jwtPayload,
         error,
         validationErrors,
         "Create an account",
@@ -30,11 +28,11 @@ class UserView(@Named("styles") styles: String) : View(styles) {
     }
 
     fun login(
-        loggedInUser: LoggedInUser?,
+        jwtPayload: JwtPayload?,
         error: String? = null,
         validationErrors: List<ValidationError> = emptyList(),
         new: Boolean = false,
-    ) = accountForm("Login", "Login page", loggedInUser, error, validationErrors, "Sign In", "Sign In", new) {
+    ) = accountForm("Login", "Login page", jwtPayload, error, validationErrors, "Sign In", "Sign In", new) {
         +"Don't have an account yet? "
         a(href = "/register", classes = "no-underline text-blue-500 hover:text-blue-400 font-bold") {
             +"Create an account"
@@ -44,14 +42,14 @@ class UserView(@Named("styles") styles: String) : View(styles) {
     private fun accountForm(
         title: String,
         description: String,
-        loggedInUser: LoggedInUser?,
+        jwtPayload: JwtPayload?,
         error: String? = null,
         validationErrors: List<ValidationError> = emptyList(),
         h1: String,
         submit: String,
         new: Boolean = false,
         footer: FlowContent.() -> Unit,
-    ) = renderPage(title = title, description, loggedInUser = loggedInUser) {
+    ) = renderPage(title = title, description, jwtPayload = jwtPayload) {
         div("centered container mx-auto flex justify-center items-center") {
             div("w-full md:w-1/2 lg:w-1/3 m-4") {
                 div("p-8 mb-6") {

app/src/main/kotlin/views/View.kt

@@ -1,16 +1,19 @@
-package be.simplenotes.views
+package be.simplenotes.app.views
 
-import be.simplenotes.types.LoggedInUser
-import be.simplenotes.views.components.navbar
+import be.simplenotes.app.utils.StaticFileResolver
+import be.simplenotes.app.views.components.navbar
+import be.simplenotes.domain.security.JwtPayload
 import kotlinx.html.*
 import kotlinx.html.stream.appendHTML
 
-abstract class View(private val styles: String) {
+abstract class View(staticFileResolver: StaticFileResolver) {
+
+    private val styles = staticFileResolver.resolve("styles.css")!!
 
     fun renderPage(
         title: String,
         description: String? = null,
-        loggedInUser: LoggedInUser?,
+        jwtPayload: JwtPayload?,
         scripts: List<String> = emptyList(),
         body: MAIN.() -> Unit = {},
     ) = buildString {
@@ -34,7 +37,7 @@ abstract class View(private val styles: String) {
                 }
             }
             body("bg-gray-900 text-white") {
-                navbar(loggedInUser)
+                navbar(jwtPayload)
                 main { body() }
             }
         }

app/src/main/kotlin/views/components/Alerts.kt

@@ -1,8 +1,8 @@
-package be.simplenotes.views.components
+package be.simplenotes.app.views.components
 
 import kotlinx.html.*
 
-internal fun FlowContent.alert(type: Alert, title: String, details: String? = null, multiline: Boolean = false) {
+fun FlowContent.alert(type: Alert, title: String, details: String? = null, multiline: Boolean = false) {
     val colors = when (type) {
         Alert.Success -> "bg-green-500 border border-green-400 text-gray-800"
         Alert.Warning -> "bg-red-500 border border-red-400 text-red-200"
@@ -17,6 +17,6 @@ internal fun FlowContent.alert(type: Alert, title: String, details: String? = nu
     }
 }
 
-internal enum class Alert {
+enum class Alert {
     Success, Warning
 }

app/src/main/kotlin/views/components/DeletedNoteTable.kt

@@ -1,13 +1,13 @@
-package be.simplenotes.views.components
+package be.simplenotes.app.views.components
 
-import be.simplenotes.types.PersistedNoteMetadata
-import be.simplenotes.views.utils.toTimeAgo
+import be.simplenotes.app.utils.toTimeAgo
+import be.simplenotes.domain.model.PersistedNoteMetadata
 import kotlinx.html.*
 import kotlinx.html.ButtonType.submit
 import kotlinx.html.FormMethod.post
 import kotlinx.html.ThScope.col
 
-internal fun FlowContent.deletedNoteTable(notes: List<PersistedNoteMetadata>) = div("overflow-x-auto") {
+fun FlowContent.deletedNoteTable(notes: List<PersistedNoteMetadata>) = div("overflow-x-auto") {
     table {
         id = "notes"
         thead {
@@ -25,8 +25,8 @@ internal fun FlowContent.deletedNoteTable(notes: List<PersistedNoteMetadata>) =
                     td("text-center") { +updatedAt.toTimeAgo() }
                     td { tags(tags) }
                     td("text-center") {
-                        form(method = post, action = "/notes/deleted/$uuid") {
-                            button(classes = "btn btn-red mb-2", type = submit, name = "delete") {
+                        form(classes = "inline", method = post, action = "/notes/deleted/$uuid") {
+                            button(classes = "btn btn-red", type = submit, name = "delete") {
                                 +"Delete permanently"
                             }
                             button(classes = "ml-2 btn btn-green", type = submit, name = "restore") {

app/src/main/kotlin/views/components/Forms.kt

@@ -1,9 +1,9 @@
-package be.simplenotes.views.components
+package be.simplenotes.app.views.components
 
 import kotlinx.html.*
 import kotlinx.html.ButtonType.submit
 
-internal fun FlowContent.input(
+fun FlowContent.input(
     type: InputType = InputType.text,
     placeholder: String,
     id: String,
@@ -26,7 +26,7 @@ internal fun FlowContent.input(
     }
 }
 
-internal fun FlowContent.submitButton(text: String) {
+fun FlowContent.submitButton(text: String) {
     div("flex items-center mt-6") {
         button(
             type = submit,

app/src/main/kotlin/views/components/Navbar.kt

@@ -1,9 +1,9 @@
-package be.simplenotes.views.components
+package be.simplenotes.app.views.components
 
-import be.simplenotes.types.LoggedInUser
+import be.simplenotes.domain.security.JwtPayload
 import kotlinx.html.*
 
-internal fun BODY.navbar(loggedInUser: LoggedInUser?) {
+fun BODY.navbar(jwtPayload: JwtPayload?) {
     nav {
         id = "navbar"
         a("/") {
@@ -12,7 +12,7 @@ internal fun BODY.navbar(loggedInUser: LoggedInUser?) {
         }
         ul("space-x-2") {
             id = "navigation"
-            if (loggedInUser != null) {
+            if (jwtPayload != null) {
                 val links = listOf(
                     "/notes" to "Notes",
                     "/settings" to "Settings",

app/src/main/kotlin/views/components/NoteListHeader.kt

@@ -1,10 +1,10 @@
-package be.simplenotes.views.components
+package be.simplenotes.app.views.components
 
 import kotlinx.html.*
 import kotlinx.html.ButtonType.submit
 import kotlinx.html.FormMethod.post
 
-internal fun DIV.noteListHeader(numberOfDeletedNotes: Int, query: String = "") {
+fun DIV.noteListHeader(numberOfDeletedNotes: Int, query: String = "") {
     div("flex justify-between mb-4") {
         h1("text-2xl underline") { +"Notes" }
         span {

app/src/main/kotlin/views/components/NoteTable.kt

@@ -1,11 +1,11 @@
-package be.simplenotes.views.components
+package be.simplenotes.app.views.components
 
-import be.simplenotes.types.PersistedNoteMetadata
-import be.simplenotes.views.utils.toTimeAgo
+import be.simplenotes.app.utils.toTimeAgo
+import be.simplenotes.domain.model.PersistedNoteMetadata
 import kotlinx.html.*
 import kotlinx.html.ThScope.col
 
-internal fun FlowContent.noteTable(notes: List<PersistedNoteMetadata>) = div("overflow-x-auto") {
+fun FlowContent.noteTable(notes: List<PersistedNoteMetadata>) = div("overflow-x-auto") {
     table {
         id = "notes"
         thead {

app/src/main/resources/application.properties

@@ -0,0 +1,12 @@
+host=localhost
+port=8080
+#
+jdbcUrl=jdbc:h2:./notes-db;
+driverClassName=org.h2.Driver
+username=h2
+password=
+maximumPoolSize=10
+connectionTimeout=3000
+#
+jwt.secret=PliLvfk7l4WF+cZJk66LR5Mpnh+ocbvJ2wfUCK2UCms=
+jwt.validity=24

app/src/modules/AuthModule.kt

@@ -1,47 +0,0 @@
-package be.simplenotes.app.modules
-
-import be.simplenotes.app.filters.auth.*
-import be.simplenotes.domain.security.SimpleJwt
-import be.simplenotes.types.LoggedInUser
-import io.micronaut.context.annotation.Factory
-import io.micronaut.context.annotation.Primary
-import org.http4k.core.RequestContexts
-import org.http4k.lens.RequestContextKey
-import javax.inject.Named
-import javax.inject.Singleton
-
-@Factory
-class AuthModule {
-
-    @Singleton
-    @Named("optional")
-    fun optionalAuthLens(ctx: RequestContexts): OptionalAuthLens = RequestContextKey.optional(ctx)
-
-    @Singleton
-    @Named("required")
-    fun requiredAuthLens(ctx: RequestContexts): RequiredAuthLens = RequestContextKey.required(ctx)
-
-    @Singleton
-    fun optionalAuth(simpleJwt: SimpleJwt<LoggedInUser>, @Named("optional") lens: OptionalAuthLens) =
-        OptionalAuthFilter(simpleJwt, lens)
-
-    @Primary
-    @Singleton
-    fun requiredAuth(simpleJwt: SimpleJwt<LoggedInUser>, @Named("required") lens: RequiredAuthLens) =
-        RequiredAuthFilter(simpleJwt, lens)
-
-    @Singleton
-    @Named("api")
-    internal fun apiAuthFilter(
-        simpleJwt: SimpleJwt<LoggedInUser>,
-        @Named("required") lens: RequiredAuthLens,
-    ) = RequiredAuthFilter(
-        simpleJwt = simpleJwt,
-        lens = lens,
-        source = JwtSource.Header,
-        redirect = false
-    )
-
-    @Singleton
-    fun requestContexts() = RequestContexts()
-}

app/src/modules/ServerModule.kt

@@ -1,38 +0,0 @@
-package be.simplenotes.app.modules
-
-import be.simplenotes.app.jetty.ConnectorBuilder
-import be.simplenotes.app.jetty.Jetty
-import be.simplenotes.app.routes.Router
-import be.simplenotes.app.utils.StaticFileResolver
-import be.simplenotes.config.ServerConfig
-import io.micronaut.context.annotation.Factory
-import org.eclipse.jetty.server.ServerConnector
-import org.http4k.server.Http4kServer
-import org.http4k.server.asServer
-import javax.inject.Named
-import javax.inject.Singleton
-import org.eclipse.jetty.server.Server as JettyServer
-import org.http4k.server.ServerConfig as Http4kServerConfig
-
-@Factory
-class ServerModule {
-
-    @Singleton
-    @Named("styles")
-    fun styles(resolver: StaticFileResolver) = resolver.resolve("styles.css")!!
-
-    @Singleton
-    fun http4kServer(router: Router, serverConfig: Http4kServerConfig): Http4kServer =
-        router().asServer(serverConfig)
-
-    @Singleton
-    fun http4kServerConfig(config: ServerConfig): Http4kServerConfig {
-        val builder: ConnectorBuilder = { server: JettyServer ->
-            ServerConnector(server).apply {
-                port = config.port
-                host = config.host
-            }
-        }
-        return Jetty(config.port, builder)
-    }
-}

app/src/routes/ApiRoutes.kt

@@ -1,47 +0,0 @@
-package be.simplenotes.app.routes
-
-import be.simplenotes.app.api.ApiNoteController
-import be.simplenotes.app.api.ApiUserController
-import be.simplenotes.app.filters.auth.RequiredAuthFilter
-import be.simplenotes.app.filters.auth.RequiredAuthLens
-import org.http4k.core.Method.*
-import org.http4k.core.Request
-import org.http4k.core.then
-import org.http4k.routing.PathMethod
-import org.http4k.routing.RoutingHttpHandler
-import org.http4k.routing.bind
-import org.http4k.routing.routes
-import java.util.function.Supplier
-import javax.inject.Named
-import javax.inject.Singleton
-
-@Singleton
-class ApiRoutes(
-    private val apiUserController: ApiUserController,
-    private val apiNoteController: ApiNoteController,
-    @Named("api") private val auth: RequiredAuthFilter,
-    @Named("required") private val authLens: RequiredAuthLens,
-) : Supplier<RoutingHttpHandler> {
-    override fun get(): RoutingHttpHandler {
-
-        infix fun PathMethod.to(action: ProtectedHandler) =
-            this to { req: Request -> action(req, authLens(req)) }
-
-        return routes(
-            "/login" bind POST to apiUserController::login,
-
-            with(apiNoteController) {
-                auth.then(
-                    routes(
-                        "/" bind GET to ::notes,
-                        "/" bind POST to ::createNote,
-                        "/search" bind POST to ::search,
-                        "/{uuid}" bind GET to ::note,
-                        "/{uuid}" bind PUT to ::update,
-                    )
-                ).withBasePath("/notes")
-            }
-
-        ).withBasePath("/api")
-    }
-}

app/src/routes/BasicRoutes.kt

@@ -1,60 +0,0 @@
-package be.simplenotes.app.routes
-
-import be.simplenotes.app.controllers.BaseController
-import be.simplenotes.app.controllers.HealthCheckController
-import be.simplenotes.app.controllers.NoteController
-import be.simplenotes.app.controllers.UserController
-import be.simplenotes.app.filters.ImmutableFilter
-import be.simplenotes.app.filters.auth.OptionalAuthFilter
-import be.simplenotes.app.filters.auth.OptionalAuthLens
-import org.http4k.core.ContentType
-import org.http4k.core.Method.GET
-import org.http4k.core.Method.POST
-import org.http4k.core.Request
-import org.http4k.core.then
-import org.http4k.routing.*
-import java.util.function.Supplier
-import javax.inject.Named
-import javax.inject.Singleton
-
-@Singleton
-class BasicRoutes(
-    private val healthCheckController: HealthCheckController,
-    private val baseCtrl: BaseController,
-    private val userCtrl: UserController,
-    private val noteCtrl: NoteController,
-    @Named("optional") private val authLens: OptionalAuthLens,
-    private val auth: OptionalAuthFilter,
-) : Supplier<RoutingHttpHandler> {
-
-    override fun get(): RoutingHttpHandler {
-
-        infix fun PathMethod.to(action: PublicHandler) =
-            this to { req: Request -> action(req, authLens(req)) }
-
-        val staticHandler = ImmutableFilter.then(
-            static(
-                ResourceLoader.Classpath("/static"),
-                "woff2" to ContentType("font/woff2"),
-                "webmanifest" to ContentType("application/manifest+json")
-            )
-        )
-
-        return routes(
-            auth.then(
-                routes(
-                    "/" bind GET to baseCtrl::index,
-                    "/register" bind GET to userCtrl::register,
-                    "/register" bind POST to userCtrl::register,
-                    "/login" bind GET to userCtrl::login,
-                    "/login" bind POST to userCtrl::login,
-                    "/logout" bind POST to userCtrl::logout,
-                    "/notes/public/{uuid}" bind GET to noteCtrl::public,
-                )
-            ),
-
-            "/health" bind GET to healthCheckController::healthCheck,
-            staticHandler
-        )
-    }
-}

app/src/routes/NoteRoutes.kt

@@ -1,46 +0,0 @@
-package be.simplenotes.app.routes
-
-import be.simplenotes.app.controllers.NoteController
-import be.simplenotes.app.filters.auth.RequiredAuthFilter
-import be.simplenotes.app.filters.auth.RequiredAuthLens
-import org.http4k.core.Method.GET
-import org.http4k.core.Method.POST
-import org.http4k.core.Request
-import org.http4k.core.then
-import org.http4k.routing.PathMethod
-import org.http4k.routing.RoutingHttpHandler
-import org.http4k.routing.bind
-import org.http4k.routing.routes
-import java.util.function.Supplier
-import javax.inject.Named
-import javax.inject.Singleton
-
-@Singleton
-class NoteRoutes(
-    private val noteCtrl: NoteController,
-    private val auth: RequiredAuthFilter,
-    @Named("required") private val authLens: RequiredAuthLens,
-) : Supplier<RoutingHttpHandler> {
-    override fun get(): RoutingHttpHandler {
-
-        infix fun PathMethod.to(action: ProtectedHandler) =
-            this to { req: Request -> action(req, authLens(req)) }
-
-        return auth.then(
-            with(noteCtrl) {
-                routes(
-                    "/" bind GET to ::list,
-                    "/" bind POST to ::search,
-                    "/new" bind GET to ::new,
-                    "/new" bind POST to ::new,
-                    "/trash" bind GET to ::trash,
-                    "/{uuid}" bind GET to ::note,
-                    "/{uuid}" bind POST to ::note,
-                    "/{uuid}/edit" bind GET to ::edit,
-                    "/{uuid}/edit" bind POST to ::edit,
-                    "/deleted/{uuid}" bind POST to ::deleted,
-                ).withBasePath("/notes")
-            }
-        )
-    }
-}

app/src/routes/RouteUtils.kt

@@ -1,8 +0,0 @@
-package be.simplenotes.app.routes
-
-import be.simplenotes.types.LoggedInUser
-import org.http4k.core.Request
-import org.http4k.core.Response
-
-internal typealias PublicHandler = (Request, LoggedInUser?) -> Response
-internal typealias ProtectedHandler = (Request, LoggedInUser) -> Response

app/src/routes/Router.kt

@@ -1,32 +0,0 @@
-package be.simplenotes.app.routes
-
-import be.simplenotes.app.filters.ErrorFilter
-import be.simplenotes.app.filters.SecurityFilter
-import org.http4k.core.RequestContexts
-import org.http4k.core.then
-import org.http4k.filter.ResponseFilters.GZip
-import org.http4k.filter.ServerFilters.InitialiseRequestContext
-import org.http4k.routing.RoutingHttpHandler
-import org.http4k.routing.routes
-import java.util.function.Supplier
-import javax.inject.Singleton
-
-@Singleton
-class Router(
-    private val errorFilter: ErrorFilter,
-    private val contexts: RequestContexts,
-    private val subRouters: List<Supplier<RoutingHttpHandler>>,
-) {
-    operator fun invoke(): RoutingHttpHandler {
-
-        val routes = routes(
-            *subRouters.map { it.get() }.toTypedArray()
-        )
-
-        return errorFilter
-            .then(InitialiseRequestContext(contexts))
-            .then(SecurityFilter)
-            .then(GZip())
-            .then(routes)
-    }
-}

app/src/routes/SettingsRoutes.kt

@@ -1,37 +0,0 @@
-package be.simplenotes.app.routes
-
-import be.simplenotes.app.controllers.SettingsController
-import be.simplenotes.app.filters.auth.RequiredAuthFilter
-import be.simplenotes.app.filters.auth.RequiredAuthLens
-import org.http4k.core.Method.GET
-import org.http4k.core.Method.POST
-import org.http4k.core.Request
-import org.http4k.core.then
-import org.http4k.routing.PathMethod
-import org.http4k.routing.RoutingHttpHandler
-import org.http4k.routing.bind
-import org.http4k.routing.routes
-import java.util.function.Supplier
-import javax.inject.Named
-import javax.inject.Singleton
-
-@Singleton
-class SettingsRoutes(
-    private val settingsController: SettingsController,
-    private val auth: RequiredAuthFilter,
-    @Named("required") private val authLens: RequiredAuthLens,
-) : Supplier<RoutingHttpHandler> {
-    override fun get(): RoutingHttpHandler {
-
-        infix fun PathMethod.to(action: ProtectedHandler) =
-            this to { req: Request -> action(req, authLens(req)) }
-
-        return auth.then(
-            routes(
-                "/settings" bind GET to settingsController::settings,
-                "/settings" bind POST to settingsController::settings,
-                "/export" bind POST to settingsController::export,
-            )
-        )
-    }
-}

app/src/test/kotlin/filters/AuthFilterTest.kt

@@ -1,24 +1,15 @@
 package be.simplenotes.app.filters
 
-import be.simplenotes.app.filters.auth.OptionalAuthFilter
-import be.simplenotes.app.filters.auth.OptionalAuthLens
-import be.simplenotes.app.filters.auth.RequiredAuthFilter
-import be.simplenotes.app.filters.auth.RequiredAuthLens
-import be.simplenotes.config.JwtConfig
+import be.simplenotes.domain.security.JwtPayload
+import be.simplenotes.domain.security.JwtPayloadExtractor
 import be.simplenotes.domain.security.SimpleJwt
-import be.simplenotes.domain.security.UserJwtMapper
-import be.simplenotes.types.LoggedInUser
+import be.simplenotes.shared.config.JwtConfig
 import com.natpryce.hamkrest.assertion.assertThat
-import io.micronaut.context.BeanContext
-import io.micronaut.inject.qualifiers.Qualifiers
+import org.http4k.core.*
 import org.http4k.core.Method.GET
-import org.http4k.core.Request
-import org.http4k.core.RequestContexts
-import org.http4k.core.Response
 import org.http4k.core.Status.Companion.FOUND
 import org.http4k.core.Status.Companion.OK
 import org.http4k.core.cookie.cookie
-import org.http4k.core.then
 import org.http4k.filter.ServerFilters
 import org.http4k.hamkrest.hasBody
 import org.http4k.hamkrest.hasHeader
@@ -29,36 +20,22 @@ import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import java.util.concurrent.TimeUnit
 
-internal class RequiredAuthFilterTest {
+internal class AuthFilterTest {
 
     // region setup
     private val jwtConfig = JwtConfig("secret", 1, TimeUnit.HOURS)
-    private val simpleJwt = SimpleJwt(jwtConfig, UserJwtMapper())
+    private val simpleJwt = SimpleJwt(jwtConfig)
+    private val extractor = JwtPayloadExtractor(simpleJwt)
+    private val ctx = RequestContexts()
+    private val requiredAuth = AuthFilter(extractor, AuthType.Required, ctx)
+    private val optionalAuth = AuthFilter(extractor, AuthType.Optional, ctx)
 
-    private val beanCtx = BeanContext.build()
-        .registerSingleton(jwtConfig)
-        .start()
-
-    private inline fun <reified T> BeanContext.getBean(): T = getBean(T::class.java)
-    private inline fun <reified T> BeanContext.getBean(name: String): T =
-        getBean(T::class.java, Qualifiers.byName(name))
-
-    private val requiredAuth = beanCtx.getBean<RequiredAuthFilter>()
-    private val requiredLens = beanCtx.getBean<RequiredAuthLens>("required")
-
-    private val optionalAuth = beanCtx.getBean<OptionalAuthFilter>()
-    private val optionalLens = beanCtx.getBean<OptionalAuthLens>("optional")
-
-    private val ctx = beanCtx.getBean<RequestContexts>()
+    private val echoJwtPayloadHandler = { request: Request -> Response(OK).body(request.jwtPayload(ctx).toString()) }
 
     private val app = ServerFilters.InitialiseRequestContext(ctx).then(
         routes(
-            "/optional" bind GET to optionalAuth.then { request: Request ->
-                Response(OK).body(optionalLens(request).toString())
-            },
-            "/protected" bind GET to requiredAuth.then { request: Request ->
-                Response(OK).body(requiredLens(request).toString())
-            }
+            "/optional" bind GET to optionalAuth.then(echoJwtPayloadHandler),
+            "/protected" bind GET to requiredAuth.then(echoJwtPayloadHandler)
         )
     )
     // endregion
@@ -81,7 +58,7 @@ internal class RequiredAuthFilterTest {
 
         @Test
         fun `it should allow a valid token`() {
-            val jwtPayload = LoggedInUser(1, "user")
+            val jwtPayload = JwtPayload(1, "user")
             val token = simpleJwt.sign(jwtPayload)
             val response = app(Request(GET, "/optional").cookie("Bearer", token))
             assertThat(response, hasStatus(OK))
@@ -106,8 +83,8 @@ internal class RequiredAuthFilterTest {
         }
 
         @Test
-        fun `it should allow a valid token`() {
-            val jwtPayload = LoggedInUser(1, "user")
+        fun `it should allow a valid token"`() {
+            val jwtPayload = JwtPayload(1, "user")
             val token = simpleJwt.sign(jwtPayload)
             val response = app(Request(GET, "/protected").cookie("Bearer", token))
             assertThat(response, hasStatus(OK))

app/src/test/kotlin/utils/SearchTermsParserKtTest.kt

@@ -1,8 +1,7 @@
-package be.simplenotes.domain.usecases.search
+package be.simplenotes.app.utils
 
-import be.simplenotes.search.SearchTerms
-import com.natpryce.hamkrest.assertion.assertThat
-import com.natpryce.hamkrest.equalTo
+import be.simplenotes.domain.usecases.search.SearchTerms
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 import java.util.stream.Stream
@@ -14,7 +13,7 @@ internal class SearchTermsParserKtTest {
         title: String? = null,
         tag: String? = null,
         content: String? = null,
-        all: String? = null,
+        all: String? = null
     ): Pair<String, SearchTerms> = input to SearchTerms(title, tag, content, all)
 
     @Suppress("Unused")
@@ -31,15 +30,13 @@ internal class SearchTermsParserKtTest {
         createResult("tag:'example' title:'other' end", title = "other", tag = "example", all = "end"),
         createResult(
             "tag:'example abc' title:'other with words' this is the end  ",
-            title = "other with words",
-            tag = "example abc",
-            all = "this is the end"
+            title = "other with words", tag = "example abc", all = "this is the end"
         ),
     )
 
     @ParameterizedTest
     @MethodSource("results")
     fun `valid search parser`(case: Pair<String, SearchTerms>) {
-        assertThat(parseSearchTerms(case.first), equalTo(case.second))
+        assertThat(parseSearchTerms(case.first)).isEqualTo(case.second)
     }
 }

build.gradle.kts

@@ -1,3 +0,0 @@
-plugins {
-    id("be.simplenotes.versions")
-}

buildSrc/build.gradle.kts

@@ -1,19 +0,0 @@
-plugins {
-    `kotlin-dsl`
-}
-
-kotlinDslPluginOptions {
-    experimentalWarning.set(false)
-}
-
-repositories {
-    gradlePluginPortal()
-}
-
-dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31")
-    implementation("org.jetbrains.kotlin:kotlin-serialization:1.4.31")
-    implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
-    implementation("org.jlleitschuh.gradle:ktlint-gradle:9.4.1")
-    implementation("com.github.ben-manes:gradle-versions-plugin:0.28.0")
-}

buildSrc/src/main/kotlin/be/simplenotes/DockerPlugin.kt

@@ -1,44 +0,0 @@
-package be.simplenotes
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.create
-
-open class DockerPluginExtension {
-    var image: String? = null
-    var tag = "latest"
-}
-
-class DockerPlugin : Plugin<Project> {
-    override fun apply(project: Project) {
-        val extension = project.extensions.create<DockerPluginExtension>("docker")
-
-        project.task("dockerBuild") {
-            dependsOn("package")
-
-            group = "docker"
-            description = "Build a docker image"
-
-            doLast {
-                project.exec {
-                    commandLine("docker", "build", "-t", "${extension.image}:${extension.tag}", ".")
-                    workingDir(project.rootProject.projectDir)
-                }
-            }
-        }
-
-        project.task("dockerPush") {
-            dependsOn("dockerBuild")
-
-            group = "docker"
-            description = "Push a docker image"
-
-            doLast {
-                project.exec {
-                    commandLine("docker", "push", "${extension.image}:${extension.tag}")
-                    workingDir(project.rootProject.projectDir)
-                }
-            }
-        }
-    }
-}

buildSrc/src/main/kotlin/be/simplenotes/Libs.kt

@@ -1,92 +0,0 @@
-@file:Suppress("SpellCheckingInspection")
-
-package be.simplenotes
-
-object Libs {
-
-    object Flexmark {
-        private const val version = "0.62.2"
-        const val core = "com.vladsch.flexmark:flexmark:$version"
-        const val tasklist = "com.vladsch.flexmark:flexmark-ext-gfm-tasklist:$version"
-    }
-
-    object Database {
-        const val flyway = "org.flywaydb:flyway-core:7.5.4"
-        const val hikariCP = "com.zaxxer:HikariCP:4.0.2"
-
-        object Drivers {
-            const val h2 = "com.h2database:h2:1.4.200"
-            const val mariadb = "org.mariadb.jdbc:mariadb-java-client:2.7.2"
-        }
-
-        object Ktorm {
-            private const val version = "3.0.0"
-            const val core = "me.liuwj.ktorm:ktorm-core:$version"
-            const val mysql = "me.liuwj.ktorm:ktorm-support-mysql:$version"
-        }
-    }
-
-    object Lucene {
-        private const val version = "8.8.1"
-        const val core = "org.apache.lucene:lucene-core:$version"
-        const val analyzersCommon = "org.apache.lucene:lucene-analyzers-common:$version"
-        const val queryParser = "org.apache.lucene:lucene-queryparser:$version"
-    }
-
-    object Http4k {
-        private const val version = "4.3.5.4"
-        const val core = "org.http4k:http4k-core:$version"
-        const val testingHamkrest = "org.http4k:http4k-testing-hamkrest:$version"
-    }
-
-    object Jetty {
-        private const val version = "10.0.1"
-        const val server = "org.eclipse.jetty:jetty-server:$version"
-        const val servlet = "org.eclipse.jetty:jetty-servlet:$version"
-    }
-
-    object Kotlinx {
-        const val html = "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2"
-
-        object Serialization {
-            const val json = "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.1.0"
-        }
-    }
-
-    object Slf4J {
-        const val api = "org.slf4j:slf4j-api:2.0.0-alpha1"
-        const val logback = "ch.qos.logback:logback-classic:1.3.0-alpha5"
-    }
-
-    object Mapstruct {
-        private const val version = "1.4.2.Final"
-        const val core = "org.mapstruct:mapstruct:$version"
-        const val processor = "org.mapstruct:mapstruct-processor:$version"
-    }
-
-    object Micronaut {
-        private const val version = "2.3.3"
-        const val inject = "io.micronaut:micronaut-inject:$version"
-        const val processor = "io.micronaut:micronaut-inject-java:$version"
-    }
-
-    const val arrowCoreData = "io.arrow-kt:arrow-core-data:0.11.0"
-    const val commonsCompress = "org.apache.commons:commons-compress:1.20"
-    const val javaJwt = "com.auth0:java-jwt:3.13.0"
-    const val javaxServlet = "javax.servlet:javax.servlet-api:4.0.1"
-    const val jbcrypt = "org.mindrot:jbcrypt:0.4"
-    const val konform = "io.konform:konform-jvm:0.2.0"
-    const val owaspHtmlSanitizer = "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20200713.1"
-    const val prettytime = "org.ocpsoft.prettytime:prettytime:5.0.0.Final"
-    const val snakeyaml = "org.yaml:snakeyaml:1.28"
-
-    object Test {
-        const val assertJ = "org.assertj:assertj-core:3.19.0"
-        const val hamkrest = "com.natpryce:hamkrest:1.8.0.1"
-        const val junit = "org.junit.jupiter:junit-jupiter:5.7.1"
-        const val mockk = "io.mockk:mockk:1.10.6"
-        const val faker = "com.github.javafaker:javafaker:1.0.2"
-        const val mariaTestContainer = "org.testcontainers:mariadb:1.15.2"
-    }
-
-}

buildSrc/src/main/kotlin/be/simplenotes/MicronautPlugin.kt

@@ -1,33 +0,0 @@
-package be.simplenotes
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.artifacts.dsl.DependencyHandler
-import org.jetbrains.kotlin.gradle.plugin.KaptExtension
-
-class MicronautPlugin : Plugin<Project> {
-    override fun apply(target: Project) {
-        target.plugins.apply("org.jetbrains.kotlin.kapt")
-        target.extensions.configure<KaptExtension>("kapt") {
-            arguments {
-                arg("micronaut.processing.incremental", true)
-            }
-        }
-    }
-}
-
-fun DependencyHandler.micronaut() {
-    add("kapt", Libs.Micronaut.processor)
-    add("implementation", Libs.Micronaut.inject)
-}
-
-fun DependencyHandler.micronautTest() {
-    add("kaptTest", Libs.Micronaut.processor)
-    add("testImplementation", Libs.Micronaut.inject)
-}
-
-fun DependencyHandler.micronautFixtures() {
-    add("kaptTestFixtures", Libs.Micronaut.inject)
-    add("testFixturesImplementation", Libs.Micronaut.processor)
-}
-

buildSrc/src/main/kotlin/be/simplenotes/PostcssPlugin.kt

@@ -1,24 +0,0 @@
-package be.simplenotes
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPluginConvention
-import org.gradle.kotlin.dsl.get
-import org.gradle.kotlin.dsl.register
-import java.io.File
-
-class PostcssPlugin : Plugin<Project> {
-    override fun apply(project: Project) {
-        with(project.tasks) {
-            register<PostcssTask>("postcss") {
-                group = "postcss"
-                description = "generate postcss resources"
-            }
-            getByName("processResources").dependsOn("postcss")
-        }
-
-        val sourceSets = project.convention.getPlugin(JavaPluginConvention::class.java).sourceSets
-        val root = File("${project.buildDir}/generated-resources/css")
-        sourceSets["main"].resources.srcDir(root)
-    }
-}

buildSrc/src/main/kotlin/be/simplenotes/PostcssTask.kt

@@ -1,75 +0,0 @@
-package be.simplenotes
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.GradleException
-import org.gradle.api.tasks.*
-import org.gradle.kotlin.dsl.getByType
-import java.io.File
-import java.lang.ProcessBuilder.Redirect.PIPE
-import java.util.concurrent.TimeUnit
-import kotlin.concurrent.thread
-
-open class PostcssTask : DefaultTask() {
-
-    private val viewsProject = project
-        .parent
-        ?.project(":views")
-        ?: error("Missing :views")
-
-    @get:InputDirectory
-    val templatesDir = viewsProject.extensions
-        .getByType<SourceSetContainer>()
-        .asMap.getOrElse("main") { error("main sources not found") }
-        .allSource.srcDirs
-        .find { it.endsWith("src") }
-        ?: error("kotlin sources not found")
-
-    private val yarnRoot = File(project.rootDir, "css")
-
-    @get:InputDirectory
-    val postCssDir = File(project.rootDir, "css/src")
-
-    @get:InputFiles
-    val postCssConfig = listOf(
-        "tailwind.config.js",
-        "postcss.config.js",
-        "package.json"
-    ).map { File(yarnRoot, it) }
-
-    @get:OutputDirectory
-    val outputRootDir = File(project.buildDir, "generated-resources/css")
-
-    private val cssIndex = File(postCssDir, "styles.pcss")
-
-    private val cssOutput = File(outputRootDir, "static/styles.css")
-    private val manifestOutput = File(outputRootDir, "css-manifest.json")
-
-    private val purgeGlob = "$templatesDir/**/*.kt"
-
-    @TaskAction
-    fun generateCss() {
-        // TODO: auto yarn install ?
-
-        outputRootDir.deleteRecursively()
-
-        ProcessBuilder("yarn", "run", "postcss", "$cssIndex", "--output", "$cssOutput")
-            .apply {
-                environment().let {
-                    it["MANIFEST"] = "$manifestOutput"
-                    it["NODE_ENV"] = "production"
-                    it["PURGE"] = purgeGlob
-                }
-            }
-            .redirectOutput(PIPE)
-            .redirectError(PIPE)
-            .directory(yarnRoot)
-            .start()
-            .apply {
-                thread { inputStream.use { it.copyTo(System.out) } }
-                thread { errorStream.use { it.copyTo(System.out) } }
-                waitFor(30, TimeUnit.SECONDS)
-                if (exitValue() != 0) throw GradleException(":/")
-            }
-    }
-
-}

buildSrc/src/main/kotlin/be/simplenotes/app-shadow.gradle.kts

@@ -1,37 +0,0 @@
-package be.simplenotes
-
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
-plugins {
-    id("com.github.johnrengelman.shadow")
-}
-
-tasks.withType<ShadowJar> {
-
-    archiveAppendix.set("with-dependencies")
-    manifest.attributes["Main-Class"] = "be.simplenotes.app.SimpleNotesKt"
-
-    mergeServiceFiles()
-
-    File(rootProject.projectDir, "buildSrc/src/main/resources/exclusions")
-        .listFiles()!!
-        .flatMap {
-            it.readLines()
-                .asSequence()
-                .map { it.trim() }
-                .filterNot { it.isBlank() }
-                .filterNot { it.startsWith("#") }
-                .asIterable()
-        }.forEach { exclude(it) }
-
-}
-
-tasks.create("package") {
-    tasks.getByName("build").dependsOn("package")
-
-    dependsOn("shadowJar")
-
-    doLast {
-        println("SimpleNotes Packaged !")
-    }
-}

buildSrc/src/main/kotlin/be/simplenotes/base.gradle.kts

@@ -1,8 +0,0 @@
-package be.simplenotes
-
-plugins {
-    id("be.simplenotes.java-convention")
-    id("be.simplenotes.kotlin-convention")
-    id("be.simplenotes.junit-convention")
-    id("org.jlleitschuh.gradle.ktlint")
-}

buildSrc/src/main/kotlin/be/simplenotes/java-convention.gradle.kts

@@ -1,29 +0,0 @@
-package be.simplenotes
-
-plugins {
-    `java-library`
-}
-
-repositories {
-    mavenCentral()
-    maven {
-        url = uri("https://kotlin.bintray.com/kotlinx")
-        // https://github.com/Kotlin/kotlinx.html/issues/173
-        content { includeModule("org.jetbrains.kotlinx", "kotlinx-html-jvm") }
-    }
-}
-
-group = "be.simplenotes"
-version = "1.0-SNAPSHOT"
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_15
-    targetCompatibility = JavaVersion.VERSION_15
-}
-
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
-}
-
-sourceSets["main"].resources.srcDirs("resources")
-sourceSets["test"].resources.srcDirs("testresources")

buildSrc/src/main/kotlin/be/simplenotes/junit-convention.gradle.kts

@@ -1,13 +0,0 @@
-package be.simplenotes
-
-plugins {
-    java apply false
-}
-
-tasks.withType<Test> {
-    useJUnitPlatform()
-}
-
-dependencies {
-    testRuntimeOnly(project(":junit-config"))
-}

buildSrc/src/main/kotlin/be/simplenotes/kotlin-convention.gradle.kts

@@ -1,29 +0,0 @@
-package be.simplenotes
-
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-plugins {
-    kotlin("jvm")
-}
-
-dependencies {
-    implementation(kotlin("stdlib-jdk8"))
-    implementation(platform(kotlin("bom")))
-    testImplementation(platform(kotlin("bom")))
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "15"
-        javaParameters = true
-        freeCompilerArgs = listOf(
-            "-Xinline-classes",
-            "-Xno-param-assertions",
-            "-Xno-call-assertions",
-            "-Xno-receiver-assertions"
-        )
-    }
-}
-
-kotlin.sourceSets["main"].kotlin.srcDirs("src")
-kotlin.sourceSets["test"].kotlin.srcDirs("test")