From f4a7f77926c0e0502ebe5d4f7d4f37d20d40b37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=BE=D0=BB=D0=B8=D0=BA=D0=BE=D0=B2=20Maximillian?= =?UTF-8?q?=20=D0=90=D0=BD=D1=82=D0=BE=D0=BD?= Date: Thu, 1 Oct 2026 18:02:51 +0300 Subject: [PATCH] refactor(middleware): lab2 put CurrentUser/CurrentToken from auth to context.go --- backend/internal/httpapi/middleware/auth.go | 11 ------- .../internal/httpapi/middleware/context.go | 30 +++++++++++++++++++ 2 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 backend/internal/httpapi/middleware/context.go diff --git a/backend/internal/httpapi/middleware/auth.go b/backend/internal/httpapi/middleware/auth.go index 44e3f19..e3192da 100644 --- a/backend/internal/httpapi/middleware/auth.go +++ b/backend/internal/httpapi/middleware/auth.go @@ -9,8 +9,6 @@ import ( "high-loud-apps-labs/internal/httpapi/dto" ) -const CurrentUserKey = "current_user" - func Auth(users domain.UserRepository) gin.HandlerFunc { return func(c *gin.Context) { id := c.GetHeader("X-User-Id") @@ -30,15 +28,6 @@ func Auth(users domain.UserRepository) gin.HandlerFunc { } } -func CurrentUser(c *gin.Context) *domain.User { - if v, ok := c.Get(CurrentUserKey); ok { - if u, ok := v.(*domain.User); ok { - return u - } - } - return nil -} - func abortUnauthorized(c *gin.Context, msg string) { reqID := GetRequestID(c) body := dto.ErrorFromDomain( diff --git a/backend/internal/httpapi/middleware/context.go b/backend/internal/httpapi/middleware/context.go new file mode 100644 index 0000000..f467d36 --- /dev/null +++ b/backend/internal/httpapi/middleware/context.go @@ -0,0 +1,30 @@ +package middleware + +import ( + "github.com/gin-gonic/gin" + + "high-loud-apps-labs/internal/domain" +) + +const ( + CurrentUserKey = "current_user" + CurrentTokenKey = "current_token" +) + +func CurrentUser(c *gin.Context) *domain.User { + if v, ok := c.Get(CurrentUserKey); ok { + if u, ok := v.(*domain.User); ok { + return u + } + } + return nil +} + +func CurrentToken(c *gin.Context) string { + if v, ok := c.Get(CurrentTokenKey); ok { + if s, ok := v.(string); ok { + return s + } + } + return "" +}