clean code

Author: shohamroditimemphis

handlers/auth.go

@@ -19,8 +19,8 @@ var configuration = conf.GetConfig()
 var ConnectionsCacheLock sync.Mutex
 
 const (
-	errorMsgAuthorizationViolation = "authorization violation"
-	errorMsgMissionAccountId       = "account id"
+	ErrorMsgAuthorizationViolation = "authorization violation"
+	ErrorMsgMissionAccountId       = "account id"
 )
 
 type AuthHandler struct{}
@@ -37,7 +37,7 @@ type refreshTokenExpiration struct {
 
 var ConnectionsCache = map[string]map[string]Connection{}
 
-func connect(password, username, connectionToken string, accountId int) (*memphis.Conn, error) {
+func Connect(password, username, connectionToken string, accountId int) (*memphis.Conn, error) {
 	if configuration.USER_PASS_BASED_AUTH {
 		if accountId == 0 {
 			accountId = 1
@@ -75,10 +75,10 @@ func (ah AuthHandler) Authenticate(c *fiber.Ctx) error {
 		})
 	}
 
-	conn, err := connect(body.Password, body.Username, body.ConnectionToken, int(body.AccountId))
+	conn, err := Connect(body.Password, body.Username, body.ConnectionToken, int(body.AccountId))
 	if err != nil {
 		errMsg := strings.ToLower(err.Error())
-		if strings.Contains(errMsg, errorMsgAuthorizationViolation) || strings.Contains(errMsg, "token") || strings.Contains(errMsg, errorMsgMissionAccountId) {
+		if strings.Contains(errMsg, ErrorMsgAuthorizationViolation) || strings.Contains(errMsg, "token") || strings.Contains(errMsg, ErrorMsgMissionAccountId) {
 			log.Warnf("Authentication error")
 			return c.Status(401).JSON(fiber.Map{
 				"message": "Unauthorized",
@@ -186,10 +186,10 @@ func (ah AuthHandler) RefreshToken(c *fiber.Ctx) error {
 	password := userData.Password
 	connectionToken := userData.ConnectionToken
 
-	conn, err := connect(password, username, connectionToken, accountId)
+	conn, err := Connect(password, username, connectionToken, accountId)
 	if err != nil {
 		errMsg := strings.ToLower(err.Error())
-		if strings.Contains(errMsg, errorMsgAuthorizationViolation) || strings.Contains(errMsg, "token") || strings.Contains(errMsg, errorMsgMissionAccountId) {
+		if strings.Contains(errMsg, ErrorMsgAuthorizationViolation) || strings.Contains(errMsg, "token") || strings.Contains(errMsg, ErrorMsgMissionAccountId) {
 			log.Warnf("RefreshToken: Authentication error")
 			return c.Status(401).JSON(fiber.Map{
 				"message": "Unauthorized",

middlewares/auth.go

@@ -8,11 +8,9 @@ import (
 	"rest-gateway/logger"
 	"rest-gateway/models"
 	"strings"
-	"time"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/golang-jwt/jwt/v4"
-	"github.com/memphisdev/memphis.go"
 )
 
 var configuration = conf.GetConfig()
@@ -121,17 +119,17 @@ func Authenticate(c *fiber.Ctx) error {
 		// for backward compatability
 		if strings.HasSuffix(path, "/produce/single") || strings.HasSuffix(path, "/produce/batch") {
 			if user.Username == "" {
-				opts := []memphis.Option{memphis.Reconnect(true), memphis.MaxReconnect(10), memphis.ReconnectInterval(3 * time.Second)}
-				if configuration.USER_PASS_BASED_AUTH {
-					opts = append(opts, memphis.Password(configuration.ROOT_PASSWORD))
-				} else {
-					opts = append(opts, memphis.ConnectionToken(configuration.CONNECTION_TOKEN))
-				}
-				if configuration.CLIENT_CERT_PATH != "" && configuration.CLIENT_KEY_PATH != "" && configuration.ROOT_CA_PATH != "" {
-					opts = append(opts, memphis.Tls(configuration.CLIENT_CERT_PATH, configuration.CLIENT_KEY_PATH, configuration.ROOT_CA_PATH))
+				accountId := 1
+				conn, err := handlers.Connect(configuration.ROOT_PASSWORD, configuration.ROOT_USER, configuration.CONNECTION_TOKEN, accountId)
+				if err != nil {
+					errMsg := strings.ToLower(err.Error())
+					if strings.Contains(errMsg, handlers.ErrorMsgAuthorizationViolation) || strings.Contains(errMsg, "token") || strings.Contains(errMsg, handlers.ErrorMsgMissionAccountId) {
+						log.Warnf("Authentication error")
+						return c.Status(401).JSON(fiber.Map{
+							"message": "Unauthorized",
+						})
+					}
 				}
-				conn, _ := memphis.Connect(configuration.MEMPHIS_HOST, configuration.ROOT_USER, opts...)
-
 				if handlers.ConnectionsCache["1"] == nil {
 					handlers.ConnectionsCacheLock.Lock()
 					handlers.ConnectionsCache["1"] = make(map[string]handlers.Connection)