From 959eeda35f92adf7a82c5f8938f8d5a588a38403 Mon Sep 17 00:00:00 2001
From: mikestefanello <mike.stefanello@gmail.com>
Date: Wed, 8 Dec 2021 22:21:07 -0500
Subject: [PATCH] Include secure middleware.

---
 controllers/router.go | 3 ++-
 middleware/log.go     | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/controllers/router.go b/controllers/router.go
index 0f04559..02bc361 100644
--- a/controllers/router.go
+++ b/controllers/router.go
@@ -31,8 +31,9 @@ func BuildRouter(c *container.Container) {
 		echomw.RemoveTrailingSlashWithConfig(echomw.TrailingSlashConfig{
 			RedirectCode: http.StatusMovedPermanently,
 		}),
-		echomw.RequestID(),
 		echomw.Recover(),
+		echomw.Secure(),
+		echomw.RequestID(),
 		echomw.Gzip(),
 		echomw.Logger(),
 		middleware.LogRequestID(),
diff --git a/middleware/log.go b/middleware/log.go
index 620709a..0bd0be7 100644
--- a/middleware/log.go
+++ b/middleware/log.go
@@ -10,9 +10,9 @@ import (
 func LogRequestID() echo.MiddlewareFunc {
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
-			rid := c.Response().Header().Get(echo.HeaderXRequestID)
-			format := fmt.Sprintf(`{"time":"${time_rfc3339_nano}","id":"%s","level":"${level}","prefix":"${prefix}","file":"${short_file}","line":"${line}"}`, rid)
-			c.Logger().SetHeader(format)
+			rID := c.Response().Header().Get(echo.HeaderXRequestID)
+			format := `{"time":"${time_rfc3339_nano}","id":"%s","level":"${level}","prefix":"${prefix}","file":"${short_file}","line":"${line}"}`
+			c.Logger().SetHeader(fmt.Sprintf(format, rID))
 			return next(c)
 		}
 	}