fix

Author: shohamroditimemphis

middlewares/auth.go

@@ -116,43 +116,6 @@ func Authenticate(c *fiber.Ctx) error {
 				"message": "Unauthorized",
 			})
 		}
-		// for backward compatability
-		if strings.HasSuffix(path, "/produce/single") || strings.HasSuffix(path, "/produce/batch") {
-			if user.Username == "" {
-				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",
-						})
-					}
-				}
-				if handlers.ConnectionsCache["1"] == nil {
-					handlers.ConnectionsCacheLock.Lock()
-					handlers.ConnectionsCache["1"] = make(map[string]handlers.Connection)
-					handlers.ConnectionsCacheLock.Unlock()
-				}
-
-				handlers.ConnectionsCache["1"][configuration.ROOT_USER] = handlers.Connection{Connection: conn, ExpirationTime: int64(user.TokenExpiryMins)}
-
-				if !configuration.USER_PASS_BASED_AUTH {
-					user = models.AuthSchema{
-						Username:        configuration.ROOT_USER,
-						ConnectionToken: configuration.CONNECTION_TOKEN,
-						AccountId:       1,
-					}
-				} else {
-					user = models.AuthSchema{
-						Username:  configuration.ROOT_USER,
-						Password:  configuration.ROOT_PASSWORD,
-						AccountId: 1,
-					}
-				}
-			}
-		}
 
 	} else if path == "/auth/refreshtoken" {
 		var body models.RefreshTokenSchema
@@ -190,6 +153,44 @@ func Authenticate(c *fiber.Ctx) error {
 		user.AccountId = 1
 	}
 
+	// for backward compatability
+	if strings.HasSuffix(path, "/produce/single") || strings.HasSuffix(path, "/produce/batch") || path == "/auth/refreshtoken" {
+		if user.Username == "" {
+			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",
+					})
+				}
+			}
+			if handlers.ConnectionsCache["1"] == nil {
+				handlers.ConnectionsCacheLock.Lock()
+				handlers.ConnectionsCache["1"] = make(map[string]handlers.Connection)
+				handlers.ConnectionsCacheLock.Unlock()
+			}
+
+			handlers.ConnectionsCache["1"][configuration.ROOT_USER] = handlers.Connection{Connection: conn, ExpirationTime: int64(user.TokenExpiryMins)}
+
+			if !configuration.USER_PASS_BASED_AUTH {
+				user = models.AuthSchema{
+					Username:        configuration.ROOT_USER,
+					ConnectionToken: configuration.CONNECTION_TOKEN,
+					AccountId:       1,
+				}
+			} else {
+				user = models.AuthSchema{
+					Username:  configuration.ROOT_USER,
+					Password:  configuration.ROOT_PASSWORD,
+					AccountId: 1,
+				}
+			}
+		}
+	}
+
 	c.Locals("userData", user)
 	return c.Next()
 }