1 files changed, 10 insertions, 9 deletions
diff --git a/pkg/ext/router.go b/pkg/ext/router.go
index 434972b..bbbffa1 100644
--- a/pkg/ext/router.go
+++ b/pkg/ext/router.go
@@ -16,8 +16,9 @@ type (
 		middlewares []Middleware
 		router      *http.ServeMux
 	}
-	Middleware          func(next http.HandlerFunc) http.HandlerFunc
-	ErrorRequestHandler func(w http.ResponseWriter, r *http.Request) error
+	HandlerFunc         func(http.ResponseWriter, *Request)
+	Middleware          func(next HandlerFunc) HandlerFunc
+	ErrorRequestHandler func(w http.ResponseWriter, r *Request) error
 )
 
 func NewRouter() *Router {
@@ -34,15 +35,15 @@ func (r *Router) AddMiddleware(middleware Middleware) {
 	r.middlewares = append(r.middlewares, middleware)
 }
 
-func wrapError(next ErrorRequestHandler) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
+func wrapError(next ErrorRequestHandler) HandlerFunc {
+	return func(w http.ResponseWriter, r *Request) {
 		if err := next(w, r); err != nil {
 			if errors.Is(err, service.ErrRepositoryNotFound) ||
 				errors.Is(err, plumbing.ErrReferenceNotFound) {
 				NotFound(w, r)
 			} else {
 				slog.Error("Internal Server Error", "error", err)
-				InternalServerError(r, w, err)
+				InternalServerError(w, r, err)
 			}
 		}
 	}
@@ -54,7 +55,7 @@ func (r *Router) run(next ErrorRequestHandler) http.HandlerFunc {
 		for _, r := range r.middlewares {
 			req = r(req)
 		}
-		req(w, re)
+		req(w, &Request{Request: re})
 	}
 }
 
@@ -62,14 +63,14 @@ func (r *Router) HandleFunc(path string, handler ErrorRequestHandler) {
 	r.router.HandleFunc(path, r.run(handler))
 }
 
-func NotFound(w http.ResponseWriter, r *http.Request) {
+func NotFound(w http.ResponseWriter, r *Request) {
 	w.WriteHeader(http.StatusNotFound)
 	templates.WritePageTemplate(w, &templates.ErrorPage{
 		Message: "Not Found",
 	}, r.Context())
 }
 
-func BadRequest(w http.ResponseWriter, r *http.Request, msg string) {
+func BadRequest(w http.ResponseWriter, r *Request, msg string) {
 	w.WriteHeader(http.StatusBadRequest)
 	templates.WritePageTemplate(w, &templates.ErrorPage{
 		Message: msg,
@@ -81,7 +82,7 @@ func Redirect(w http.ResponseWriter, location string) {
 	w.WriteHeader(http.StatusTemporaryRedirect)
 }
 
-func InternalServerError(r *http.Request, w http.ResponseWriter, err error) {
+func InternalServerError(w http.ResponseWriter, r *Request, err error) {
 	w.WriteHeader(http.StatusInternalServerError)
 	templates.WritePageTemplate(w, &templates.ErrorPage{
 		Message: fmt.Sprintf("Internal Server Error:\n%s", err.Error()),