Allow custom auth middleware when initializing router (#57)

Author: stanleyphu

cmd/warrant/main.go

@@ -253,6 +253,6 @@ func main() {
 	}
 
 	log.Debug().Msgf("Listening on port %d", config.Port)
-	shutdownErr := http.ListenAndServe(fmt.Sprintf(":%d", config.Port), service.NewRouter(&config, "", routes))
+	shutdownErr := http.ListenAndServe(fmt.Sprintf(":%d", config.Port), service.NewRouter(&config, "", routes, nil))
 	log.Fatal().Err(shutdownErr).Msg("")
 }

pkg/service/auth.go

@@ -28,7 +28,9 @@ type AuthInfo struct {
 	TenantId string
 }
 
-func AuthMiddleware(next http.Handler, config *config.Config, enableSessionAuth bool) http.Handler {
+type AuthMiddlewareFunc func(next http.Handler, config *config.Config, enableSessionAuth bool) http.Handler
+
+func DefaultAuthMiddleware(next http.Handler, config *config.Config, enableSessionAuth bool) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		logger := hlog.FromRequest(r)
 

pkg/service/router.go

@@ -53,7 +53,7 @@ func (rh RouteHandler[T]) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func NewRouter(config *config.Config, pathPrefix string, routes []Route, additionalMiddlewares ...mux.MiddlewareFunc) *mux.Router {
+func NewRouter(config *config.Config, pathPrefix string, routes []Route, authMiddleware AuthMiddlewareFunc, additionalMiddlewares ...mux.MiddlewareFunc) *mux.Router {
 	router := mux.NewRouter()
 
 	// Setup default middleware
@@ -74,6 +74,10 @@ func NewRouter(config *config.Config, pathPrefix string, routes []Route, additio
 
 	router.Use(hlog.URLHandler("uri"))
 
+	if authMiddleware == nil {
+		authMiddleware = DefaultAuthMiddleware
+	}
+
 	// Setup supplied middleware
 	for _, additionalMiddleware := range additionalMiddlewares {
 		router.Use(additionalMiddleware)
@@ -85,7 +89,7 @@ func NewRouter(config *config.Config, pathPrefix string, routes []Route, additio
 		if route.DisableAuth || config.ApiKey == "" {
 			router.Handle(routePattern, route.Handler).Methods(route.Method)
 		} else {
-			router.Handle(routePattern, AuthMiddleware(route.Handler, config, route.EnableSessionAuth)).Methods(route.Method)
+			router.Handle(routePattern, authMiddleware(route.Handler, config, route.EnableSessionAuth)).Methods(route.Method)
 		}
 	}