From 44762775ada9d5803223a5054bffcf12c3c471df Mon Sep 17 00:00:00 2001
From: kandrusyak <kandrusyak@inno.tech>
Date: Mon, 7 Aug 2023 23:18:58 +0300
Subject: [PATCH] update headers

---
 main.go              | 10 +++++-----
 mw/filter_headers.go | 10 +++++-----
 mw/jwt.go            | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/main.go b/main.go
index 15c7a95..1d79fe5 100644
--- a/main.go
+++ b/main.go
@@ -90,11 +90,11 @@ func main() {
 }
 
 func checkAuth(c echo.Context) error {
-	result := c.Request().Header.Get("UserId") + ", " +
-		c.Request().Header.Get("UserRole") + ", " +
-		c.Request().Header.Get("UserOrganizationId") + ", " +
-		c.Request().Header.Get("UserRightMask") + ", " +
-		c.Request().Header.Get("UserPosition")
+	result := c.Request().Header.Get("X-User-Id") + ", " +
+		c.Request().Header.Get("X-User-Role") + ", " +
+		c.Request().Header.Get("X-User-Organization-Id") + ", " +
+		c.Request().Header.Get("X-User-Right-Mask") + ", " +
+		c.Request().Header.Get("X-User-Position")
 
 	return c.HTML(http.StatusOK, result)
 }
diff --git a/mw/filter_headers.go b/mw/filter_headers.go
index b88f747..84adeaf 100644
--- a/mw/filter_headers.go
+++ b/mw/filter_headers.go
@@ -5,12 +5,12 @@ import (
 )
 
 var NOT_ALLOWED_HEADERS = [6]string{
-	"UserId",
+	"X-User-Id",
 	"Authorization",
-	"UserRole",
-	"UserOrganizationId",
-	"UserRightMask",
-	"UserPosition",
+	"X-User-Role",
+	"X-User-Organization-Id",
+	"X-User-Right-Mask",
+	"X-User-Position",
 }
 
 func FilterHeaders(next echo.HandlerFunc) echo.HandlerFunc {
diff --git a/mw/jwt.go b/mw/jwt.go
index 4d3c2e9..cccac0c 100644
--- a/mw/jwt.go
+++ b/mw/jwt.go
@@ -25,11 +25,11 @@ var JWT_MW = echojwt.WithConfig(echojwt.Config{
 	SuccessHandler: func(c echo.Context) {
 		user := c.Get("user").(*jwt.Token)
 		claims := user.Claims.(jwt.MapClaims)
-		c.Request().Header.Set("UserId", claims["id"].(string))
-		c.Request().Header.Set("UserRole", claims["role"].(string))
-		c.Request().Header.Set("UserOrganizationId", claims["position_org_id"].(string))
-		c.Request().Header.Set("UserRightMask", claims["position_rm"].(string))
-		c.Request().Header.Set("UserPosition", claims["position_name"].(string))
+		c.Request().Header.Set("X-User-Id", claims["id"].(string))
+		c.Request().Header.Set("X-User-Role", claims["role"].(string))
+		c.Request().Header.Set("X-User-Organization-Id", claims["position_org_id"].(string))
+		c.Request().Header.Set("X-User-Right-Mask", claims["position_rm"].(string))
+		c.Request().Header.Set("X-User-Position", claims["position_name"].(string))
 		c.Request().Header.Del("Authorization")
 	},
 })