Merge branch 'memphisdev:master' into master

Author: EbubeCode

README.md

@@ -102,7 +102,7 @@ curl --location --request POST 'https://REST_GW_URL:4444/auth/authenticate' \
     "username": "root",
     // "connection_token": "memphis", // OS Only: In case the chosen auth method is connection_token
     "password": "memphis, // OS + Cloud: client-type user password
-    "account_id": 123456789, // Cloud only
+    "account_id": 123456789, // Cloud only, in case you don't have the ability to set this field as a body param you can add it as a query string param, for example: https://<REST-GW-ADDRESS>/auth/authenticate?accountId=123456789
     "token_expiry_in_minutes": 60,
     "refresh_token_expiry_in_minutes": 10000092
 }'

handlers/auth.go

@@ -75,7 +75,14 @@ func (ah AuthHandler) Authenticate(c *fiber.Ctx) error {
 		})
 	}
 
-	conn, err := Connect(body.Password, body.Username, body.ConnectionToken, int(body.AccountId))
+	accountId := int(body.AccountId)
+	if accountId == 0 {
+		accId, err := c.Request().URI().QueryArgs().GetUint("accountId")
+		if err == nil {
+			accountId = accId
+		}
+	}
+	conn, err := Connect(body.Password, body.Username, body.ConnectionToken, accountId)
 	if err != nil {
 		errMsg := strings.ToLower(err.Error())
 		if strings.Contains(errMsg, ErrorMsgAuthorizationViolation) || strings.Contains(errMsg, "token") || strings.Contains(errMsg, ErrorMsgMissionAccountId) {
@@ -90,10 +97,10 @@ func (ah AuthHandler) Authenticate(c *fiber.Ctx) error {
 			"message": "Server error",
 		})
 	}
-	if body.AccountId == 0 {
-		body.AccountId = 1
+	if accountId == 0 {
+		accountId = 1
 	}
-	token, refreshToken, tokenExpiry, refreshTokenExpiry, err := createTokens(body.TokenExpiryMins, body.RefreshTokenExpiryMins, body.Username, int(body.AccountId), body.Password, body.ConnectionToken)
+	token, refreshToken, tokenExpiry, refreshTokenExpiry, err := createTokens(body.TokenExpiryMins, body.RefreshTokenExpiryMins, body.Username, accountId, body.Password, body.ConnectionToken)
 	if err != nil {
 		log.Errorf("Authenticate: %s", err.Error())
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
@@ -102,15 +109,15 @@ func (ah AuthHandler) Authenticate(c *fiber.Ctx) error {
 	}
 
 	username := strings.ToLower(body.Username)
-	accountId := strconv.Itoa(int(body.AccountId))
-	if ConnectionsCache[accountId] == nil {
+	accountIdStr := strconv.Itoa(accountId)
+	if ConnectionsCache[accountIdStr] == nil {
 		ConnectionsCacheLock.Lock()
-		ConnectionsCache[accountId] = make(map[string]Connection)
+		ConnectionsCache[accountIdStr] = make(map[string]Connection)
 		ConnectionsCacheLock.Unlock()
 	}
 
 	ConnectionsCacheLock.Lock()
-	ConnectionsCache[accountId][username] = Connection{Connection: conn, ExpirationTime: tokenExpiry}
+	ConnectionsCache[accountIdStr][username] = Connection{Connection: conn, ExpirationTime: tokenExpiry}
 	ConnectionsCacheLock.Unlock()
 	return c.Status(fiber.StatusOK).JSON(fiber.Map{
 		"jwt":                      token,

middlewares/auth.go

@@ -91,6 +91,7 @@ func Authenticate(c *fiber.Ctx) error {
 	path := strings.ToLower(string(c.Context().URI().RequestURI()))
 	var user models.AuthSchema
 	var err error
+	path = strings.Split(path, "?")[0]
 	if isAuthNeeded(path) {
 		headers := c.GetReqHeaders()
 		tokenString, err := extractToken(headers["Authorization"])