removing-domain-from-username-if-exists

Author: cx-hitesh-madgulkar

internal/wrappers/client.go

@@ -1028,7 +1028,7 @@ func GetUniqueID() string {
 		if !ok {
 			continue
 		}
-		if strings.EqualFold(engineStr, "Checkmarx Developer Assist") {
+		if strings.EqualFold(engineStr, "Checkmarx One Assist") {
 			isAllowed = true
 			break
 		}
@@ -1048,7 +1048,14 @@ func GetUniqueID() string {
 		logger.PrintIfVerbose("Failed to get user: " + err.Error())
 		return ""
 	}
-	uniqueID = uuid.New().String() + "_" + currentUser.Username
+	username := currentUser.Username
+	username = strings.TrimSpace(username)
+	logger.PrintIfVerbose("Username to be used for unique id: " + username)
+	if strings.Contains(username, "\\") {
+		username = strings.Split(username, "\\")[1]
+	}
+	uniqueID = uuid.New().String() + "_" + username
+
 	logger.PrintIfVerbose("Unique id: " + uniqueID)
 	viper.Set(commonParams.UniqueIDConfigKey, uniqueID)
 	configFilePath, _ := configuration.GetConfigFilePath()