installed gin

internal/server/api/auth/router.go

@@ -3,53 +3,36 @@ package auth
 import (
 	"context"
 	"fmt"
-	"net/http"
 	"ruben/inventory2/internal/domains/authentication"
 	"ruben/inventory2/internal/logging"
 	"ruben/inventory2/internal/server/cookies"
 	"ruben/inventory2/internal/server/response"
-	"ruben/inventory2/internal/server/router"
+
+	"github.com/gin-gonic/gin"
 )
 
 type loginSubrouter struct {
 	log  *logging.Logger
 	auth *authentication.Authenticator
-	router.Subrouter
 }
 
-func NewLoginSubrouter(logger *logging.Logger, auth *authentication.Authenticator) *loginSubrouter {
-	mux := router.NewSubMux(logger)
-
+func Routes(
+	r *gin.RouterGroup,
+	logger *logging.Logger,
+	auth *authentication.Authenticator,
+) {
 	ls := &loginSubrouter{
-		log:       logger,
-		auth:      auth,
-		Subrouter: mux,
+		log:  logger,
+		auth: auth,
 	}
 
-	mux.Handle("GET /login", ls.loginPage)
-	mux.Handle("GET /login/callback", ls.loginCallback)
-	mux.Handle("GET /logout", ls.logoutPage)
-
-	return ls
+	r.GET("/login", response.Handler(ls.loginPage))
+	r.GET("/login/callback", response.Handler(ls.loginCallback))
+	r.GET("/logout", response.Handler(ls.logoutPage))
 }
 
-func (s *loginSubrouter) newLoginSubrouter(logger *logging.Logger) router.Subrouter {
-	mux := router.NewSubMux(logger)
-
-	ls := &loginSubrouter{
-		log:       s.log,
-		auth:      s.auth,
-		Subrouter: mux,
-	}
-
-	mux.Handle("GET /login", ls.loginPage)
-	mux.Handle("GET /login/callback", ls.loginCallback)
-	mux.Handle("GET /logout", ls.logoutPage)
-
-	return ls
-}
-
-func (s *loginSubrouter) loginPage(r *http.Request) (response.Response, error) {
+func (s *loginSubrouter) loginPage(c *gin.Context) (response.Response, error) {
+	r := c.Request
 	ctx := r.Context()
 
 	u, err := NewLoginURL(ctx, s.auth, "/")
@@ -71,7 +54,8 @@ func NewLoginURL(ctx context.Context, auth *authentication.Authenticator, target
 	return auth.AuthCodeURL(base64EncodedState), nil
 }
 
-func (s *loginSubrouter) loginCallback(r *http.Request) (response.Response, error) {
+func (s *loginSubrouter) loginCallback(c *gin.Context) (response.Response, error) {
+	r := c.Request
 	ctx := r.Context()
 	q := r.URL.Query()
 
@@ -90,7 +74,9 @@ func (s *loginSubrouter) loginCallback(r *http.Request) (response.Response, erro
 		Cookie(cookies.AccessToken(accessToken, expiration)), nil
 }
 
-func (s *loginSubrouter) logoutPage(r *http.Request) (response.Response, error) {
+func (s *loginSubrouter) logoutPage(c *gin.Context) (response.Response, error) {
+	r := c.Request
+
 	host := r.Header.Get("X-Forwarded-Host")
 	if host == "" {
 		host = r.Host