fix admin login redirect

thwbh · Nov 7, 2024 · 63826f0 · 63826f0
1 parent dc308a3
commit 63826f0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/main/kotlin/io/tohuwabohu/kamifusen/AppAdminResource.kt b/src/main/kotlin/io/tohuwabohu/kamifusen/AppAdminResource.kt
@@ -48,19 +48,19 @@ class AppAdminResource(
             .onFailure().recoverWithHtmxResponse(Response.Status.INTERNAL_SERVER_ERROR)
 
     @Path("/logout")
-    @POST
-    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    @GET
     @Produces(MediaType.TEXT_PLAIN)
     fun logoutAdmin(@Context routingContext: RoutingContext): Uni<Response> =
         Uni.createFrom().item(
-            Response.noContent().header("hx-redirect", "/")
+            Response.status(Response.Status.FOUND)
                 .cookie(
                     NewCookie.Builder(cookieName)
                         .maxAge(0)
                         .expiry(Date.from(Instant.EPOCH))
                         .path("/")
                         .build()
                 )
+                .header("Location", "/index.html")
                 .build()
         )
 

diff --git a/src/main/kotlin/io/tohuwabohu/kamifusen/ssr/htmx-admin-page.kt b/src/main/kotlin/io/tohuwabohu/kamifusen/ssr/htmx-admin-page.kt
@@ -148,11 +148,9 @@ private fun FlowContent.renderNavigation(navId: String, isFirstTimeSetup: Boolea
 
                         div {
                             classes = setOf("ml-10", "flex", "items-baseline", "space-x-4")
-                            a(href = "#") {
+                            a(href = "/logout") {
                                 classes = navInactiveClasses
 
-                                attributes["hx-post"] = "/logout"
-
                                 +"Logout"
                             }
                         }

diff --git a/src/main/kotlin/io/tohuwabohu/kamifusen/ssr/htmx-components.kt b/src/main/kotlin/io/tohuwabohu/kamifusen/ssr/htmx-components.kt
@@ -118,11 +118,9 @@ fun FlowContent.passwordFlow(validation: PasswordValidation? = null) = div {
         p { +"Successfully updated password!" }
         div {
             div {
-                button {
+                a(href = "/logout") {
                     classes = passwordButtonStyles
 
-                    attributes["hx-post"] = "/logout"
-
                     +"Back to login"
                 }
             }

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -22,7 +22,7 @@ quarkus.http.auth.permission.basic.policy=authenticated
 
 quarkus.http.auth.form.enabled=true
 quarkus.http.auth.form.landing-page=/dashboard
-quarkus.http.auth.form.login-page=index.html
+quarkus.http.auth.form.login-page=/index.html
 quarkus.http.auth.form.error-page=
 quarkus.http.auth.form.post-location=/login
 quarkus.http.auth.form.username-parameter=username