Merge pull request #2406 from digma-ai/change-user-id-order

Change user id order

Author: shalom938

build.gradle.kts

@@ -316,9 +316,9 @@ tasks {
 
         )
 
-        //to simulate external user
+        //to simulate external user. don't change the value it's used in UniqueGeneratedUserId
 //        environment(
-//            "devenv" to "notdigma"
+//            "devenv" to "externalUserSimulator"
 //        )
 
     }

ide-common/src/main/kotlin/org/digma/intellij/plugin/common/UniqueGeneratedUserId.kt

@@ -13,8 +13,16 @@ object UniqueGeneratedUserId {
 
     init {
         if (System.getenv("devenv") == "digma") {
-            userId = CommonUtils.getLocalHostname()
+            val userName = System.getProperty("user.name") ?: "user"
+            userId = "$userName@${CommonUtils.getLocalHostname()}"
             isDevUser = true
+        } else if (System.getenv("devenv") == "externalUserSimulator") {
+            //this is just to overcome my own deleted external user which can not be recreated in posthog
+            if (service<PersistenceService>().getUserId() == null) {
+                service<PersistenceService>().setUserId(generateUniqueUserId("digma"))
+            }
+            userId = service<PersistenceService>().getUserId()!!
+            isDevUser = false
         } else {
             if (service<PersistenceService>().getUserId() == null) {
                 service<PersistenceService>().setUserId(generateUniqueUserId())
@@ -27,7 +35,7 @@ object UniqueGeneratedUserId {
 
 
 //this method is outside the class so that it can be tested,UniqueGeneratedUserId can not be instantiated in regular unit tests
-fun generateUniqueUserId(): String {
+fun generateUniqueUserId(salt: String = ""): String {
     try {
         val userName = System.getProperty("user.name")
         val userHome = System.getProperty("user.home")
@@ -36,7 +44,7 @@ fun generateUniqueUserId(): String {
         //MUST BE SORTED
         val ni = NetworkInterface.networkInterfaces().toList().mapNotNull { it.hardwareAddress }.map { macAddressToString(it) }.sorted()
             .joinToString("-")
-        val baseString = userName + userHome + osName + osArch + ni
+        val baseString = salt + userName + userHome + osName + osArch + ni
         return DigestUtils.sha1Hex(baseString)
     } catch (e: Throwable) {
         return DigestUtils.sha1Hex(UUID.randomUUID().toString())

ide-common/src/test/kotlin/org/digma/intellij/plugin/common/UserIdTests.kt

@@ -14,4 +14,13 @@ class UserIdTests {
         }
     }
 
+    @Test
+    fun testUniquenessWithSalt() {
+        val myId = generateUniqueUserId("digma")
+        repeat(10) {
+            val id = generateUniqueUserId("digma")
+            assertEquals(myId, id)
+        }
+    }
+
 }