latest

internal/server/http.go

@@ -7,7 +7,7 @@ import (
 )
 
 func (s *Server) serveUntilShutdown() {
-	listenAddr := fmt.Sprintf(":%d", s.port)
+	listenAddr := fmt.Sprintf(":%d", s.params.Config.Port)
 	s.httpServer = &http.Server{
 		Addr:           listenAddr,
 		ReadTimeout:    10 * time.Second,

internal/server/routes.go

@@ -23,16 +23,16 @@ func (s *Server) SetupRoutes() {
 
 	s.router.Use(middleware.Recoverer)
 	s.router.Use(middleware.RequestID)
-	s.router.Use(s.mw.LoggingMiddleware())
+	s.router.Use(s.mw.Logging())
 
 	// add metrics middleware only if we can serve them behind auth
 	if viper.GetString("METRICS_USERNAME") != "" {
-		s.router.Use(s.mw.MetricsMiddleware())
+		s.router.Use(s.mw.Metrics())
 	}
 
 	// set up CORS headers. you'll probably want to configure that
 	// in middlewares.go.
-	s.router.Use(s.mw.CORSMiddleware())
+	s.router.Use(s.mw.CORS())
 
 	// CHANGEME to suit your needs, or pull from config.
 	// timeout for request context; your handlers must finish within
@@ -68,12 +68,21 @@ func (s *Server) SetupRoutes() {
 	// if you want to use a general purpose middleware (http.Handler
 	// wrapper) on a specific HandleFunc route, you need to take the
 	// .ServeHTTP of the http.Handler to get its HandleFunc, viz:
-	authMiddleware := s.mw.AuthMiddleware()
+	auth := s.mw.Auth()
 	s.router.Get(
 		"/login",
-		authMiddleware(s.h.HandleLogin()).ServeHTTP,
+		auth(s.h.HandleLoginGET()).ServeHTTP,
 	)
 
+	s.router.Get(
+		"/signup",
+		auth(s.h.HandleSignupGET()).ServeHTTP,
+	)
+
+	s.router.Post(
+		"/signup",
+		auth(s.h.HandleSignupPOST()).ServeHTTP,
+	)
 	// route that panics for testing
 	// CHANGEME remove this
 	s.router.Get(
@@ -89,7 +98,7 @@ func (s *Server) SetupRoutes() {
 	// set up authenticated /metrics route:
 	if viper.GetString("METRICS_USERNAME") != "" {
 		s.router.Group(func(r chi.Router) {
-			r.Use(s.mw.MetricsAuthMiddleware())
+			r.Use(s.mw.MetricsAuth())
 			r.Get("/metrics", http.HandlerFunc(promhttp.Handler().ServeHTTP))
 		})
 	}

internal/server/server.go

@@ -64,7 +64,7 @@ func New(lc fx.Lifecycle, params ServerParams) (*Server, error) {
 	lc.Append(fx.Hook{
 		OnStart: func(ctx context.Context) error {
 			s.startupTime = time.Now()
-			s.Run() // background FIXME
+			go s.Run() // background FIXME
 			return nil
 		},
 		OnStop: func(ctx context.Context) error {