handle split[1] for extracting token from email

Author: ayu-devtron

pkg/auth/user/UserService.go

@@ -1244,7 +1244,11 @@ func (impl *UserServiceImpl) GetUserByToken(context context.Context, token strin
 }
 
 func (impl *UserServiceImpl) CheckIfTokenIsValid(email string, version string) error {
-	tokenName := userHelper.ExtractTokenNameFromEmail(email)
+	tokenName, err := userHelper.ExtractTokenNameFromEmail(email)
+	if err != nil {
+		impl.logger.Errorw("error in extracting token name from email", "email", email, "error", err)
+		return err
+	}
 	embeddedTokenVersion, _ := strconv.Atoi(version)
 	isProvidedTokenValid, err := impl.userRepository.CheckIfTokenExistsByTokenNameAndVersion(tokenName, embeddedTokenVersion)
 	if err != nil || !isProvidedTokenValid {

pkg/auth/user/helper/helper.go

@@ -17,6 +17,7 @@
 package helper
 
 import (
+	"errors"
 	"fmt"
 	bean2 "github.com/devtron-labs/devtron/api/bean"
 	"github.com/devtron-labs/devtron/internal/util"
@@ -65,8 +66,12 @@ func CheckIfUserIdsExists(userIds []int32) error {
 	return nil
 }
 
-func ExtractTokenNameFromEmail(email string) string {
-	return strings.Split(email, ":")[1]
+func ExtractTokenNameFromEmail(email string) (string, error) {
+	splitData := strings.Split(email, ":")
+	if splitData == nil || len(splitData) != 2 {
+		return "", errors.New("invalid apitoken format")
+	}
+	return splitData[1], nil
 }
 
 func CreateErrorMessageForUserRoleGroups(restrictedGroups []bean2.RestrictedGroup) (string, string) {