new response middleware functions to simplify middleware

internal/server/api/templates/router.go

@@ -96,7 +96,7 @@ func SetupRoutes(
 		authMiddleware: authMiddleware,
 	}
 
-	authAndServeTemplate := s.authMiddleware.AuthenticateAndAddIdentity(s.serveTemplate)
+	authenticate := s.authMiddleware.AuthenticateAndAddIdentityToRequest()
 
 	r.GET("/*rest", response.Handler(func(c *gin.Context) (response.Response, error) {
 		c.Request.URL.Path = c.Request.URL.Path[3:]
@@ -113,7 +113,10 @@ func SetupRoutes(
 			return s.serveTemplate(c)
 		}
 
-		return authAndServeTemplate(c)
+		if res, err := authenticate(c); res != nil || err != nil {
+			return res, err
+		}
+		return s.serveTemplate(c)
 	}))
 }
 
@@ -154,7 +157,7 @@ func (s *webpageRouter) serveTemplate(c *gin.Context) (response.Response, error)
 
 			nfb, nferr := s.templater.Execute("not-found", args...)
 			if nferr != nil {
-				s.log.Error("failed to render not-found page: %v", nferr)
+				s.log.Errorf("failed to render not-found page: %v", nferr)
 				return nil, werr
 			}