From 6cf70981de33cee2d88e38e18f9fb33238fc4507 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Sun, 18 Feb 2024 22:10:08 +0100
Subject: [PATCH] Use chi

---
 go.mod  |  2 ++
 go.sum  |  2 ++
 main.go | 10 ++++++----

diff --git a/go.mod b/go.mod
index f018bc3bff05bbae305654ca776db0f94fa88ada..a08e4be9d9c3a1ee3188f72994751c0eae2271ec 100644
--- a/go.mod
+++ b/go.mod
@@ -7,3 +7,5 @@
 require github.com/mattn/go-sqlite3 v1.14.22
 
 require golang.org/x/crypto v0.19.0
+
+require github.com/go-chi/chi/v5 v5.0.12
diff --git a/go.sum b/go.sum
index 60037c555ec59aedaa4213ee86cc41a321570537..861090a14f9dc7f7147d39b5e4ffdd55057f35aa 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,7 @@
 git.sr.ht/~emersion/go-oauth2 v0.0.0-20240217160856-2e0d6e20b088 h1:KuPliLD8CQM1WbCHdjHR6mhadIzLaAJCNENmvB1y9gs=
 git.sr.ht/~emersion/go-oauth2 v0.0.0-20240217160856-2e0d6e20b088/go.mod h1:VHj0jSCLIkrfEwmOvJ4+ykpoVbD/YLN7BM523oKKBHc=
+github.com/go-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s=
+github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
diff --git a/main.go b/main.go
index e42c8098beaf5146b92e35a7127e9811eeb0fdb8..574b05d1dc9b13828af428d0dd67e95f01d4216d 100644
--- a/main.go
+++ b/main.go
@@ -18,6 +18,7 @@ 	"strings"
 	"time"
 
 	"git.sr.ht/~emersion/go-oauth2"
+	"github.com/go-chi/chi/v5"
 )
 
 var (
@@ -39,10 +40,11 @@ 	if err != nil {
 		log.Fatalf("Failed to open DB: %v", err)
 	}
 
-	mux := http.NewServeMux()
+	mux := chi.NewRouter()
+
 	mux.Handle("/static/*", http.FileServer(http.FS(staticFS)))
 
-	mux.HandleFunc("/", func(w http.ResponseWriter, req *http.Request) {
+	mux.Get("/", func(w http.ResponseWriter, req *http.Request) {
 		ctx := req.Context()
 
 		loginToken := loginTokenFromContext(ctx)
@@ -62,7 +64,7 @@ 			panic(err)
 		}
 	})
 
-	mux.HandleFunc("/client/new", func(w http.ResponseWriter, req *http.Request) {
+	mux.Post("/client/new", func(w http.ResponseWriter, req *http.Request) {
 		ctx := req.Context()
 
 		loginToken := loginTokenFromContext(ctx)
@@ -245,7 +247,7 @@ 		}
 		redirectClient(w, req, redirectURI, values)
 	})
 
-	mux.HandleFunc("/token", func(w http.ResponseWriter, req *http.Request) {
+	mux.Post("/token", func(w http.ResponseWriter, req *http.Request) {
 		ctx := req.Context()
 
 		values, err := parseRequestBody(req)

-- 
2.48.1