Merge pull request #2419 from digma-ai/change-auth-events-trigger-name

shalom938 · web-flow · commit ee0972e1f6bc · 2024-08-19T01:16:21.000+03:00
change trigger field name
diff --git a/analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/RestAnalyticsProvider.java b/analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/RestAnalyticsProvider.java
@@ -669,7 +669,7 @@ private ObjectMapper createObjectMapper() {
             ObjectMapper objectMapper = new ObjectMapper();
             objectMapper.setTimeZone(TimeZone.getTimeZone("UTC"));
             objectMapper.registerModule(new JavaTimeModule());
-            //objectMapper can be configured here is necessary
+            //objectMapper can be configured here if necessary
             objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
             objectMapper.disable(DeserializationFeature.FAIL_ON_IGNORED_PROPERTIES);
             objectMapper.enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE);
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/AuthManager.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/AuthManager.kt
@@ -399,6 +399,7 @@ class AuthManager(private val cs: CoroutineScope) : Disposable {
                     reportAuthPosthogEvent(
                         "fire auth info changed",
                         this.javaClass.simpleName,
+                        null,
                         mapOf("user.id" to myLatestAuthInfo.userId.toString(), "listeners" to listeners.size)
                     )
                 }
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/AuthUtils.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/AuthUtils.kt
@@ -3,11 +3,16 @@ package org.digma.intellij.plugin.auth
 import org.digma.intellij.plugin.common.findActiveProject
 import org.digma.intellij.plugin.posthog.ActivityMonitor
 
-fun reportAuthPosthogEvent(evenName: String, caller: String, details: Map<String, Any> = mapOf()) {
+fun reportAuthPosthogEvent(evenName: String, caller: String, trigger: String?, details: Map<String, Any> = mapOf()) {
     findActiveProject()?.let { project ->
         val detailsToSend = details.toMutableMap()
         detailsToSend["caller"] = caller
         detailsToSend["auth"] = "true" //a property for filtering auth events ,filter on auth isSet
+
+        trigger?.let {
+            detailsToSend["trigger"] = it
+        }
+
         ActivityMonitor.getInstance(project).registerAuthEvent(evenName, detailsToSend)
     }
 }
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/account/AbstractLoginHandler.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/account/AbstractLoginHandler.kt
@@ -31,7 +31,7 @@ abstract class AbstractLoginHandler(protected val analyticsProvider: RestAnalyti
 
         return try {
 
-            reportAuthPosthogEvent("login", this.javaClass.simpleName, mapOf("user" to user, "login trigger" to trigger))
+            reportAuthPosthogEvent("login", this.javaClass.simpleName, trigger, mapOf("user" to user))
 
             trace("login called for url {}, user {},trigger {}", analyticsProvider.apiUrl, user, trigger)
 
@@ -59,7 +59,7 @@ abstract class AbstractLoginHandler(protected val analyticsProvider: RestAnalyti
 
             trace("login success for url {}, user {}, created account {},trigger {}", analyticsProvider.apiUrl, user, getDefaultAccount(), trigger)
 
-            reportAuthPosthogEvent("login success", this.javaClass.simpleName, mapOf("user" to user, "login trigger" to trigger))
+            reportAuthPosthogEvent("login success", this.javaClass.simpleName, trigger, mapOf("user" to user))
 
             LoginResult(true, credentials.userId, null)
 
@@ -71,7 +71,8 @@ abstract class AbstractLoginHandler(protected val analyticsProvider: RestAnalyti
             reportAuthPosthogEvent(
                 "login failed",
                 this.javaClass.simpleName,
-                mapOf("user" to user, "error" to errorMessage, "login trigger" to trigger)
+                trigger,
+                mapOf("user" to user, "error" to errorMessage)
             )
 
             LoginResult(false, null, ExceptionUtils.getNonEmptyMessage(e))
@@ -86,7 +87,7 @@ abstract class AbstractLoginHandler(protected val analyticsProvider: RestAnalyti
             trace("refresh called for url {},trigger {}", analyticsProvider.apiUrl, trigger)
 
             withAuthManagerDebug {
-                reportAuthPosthogEvent("refresh token", this.javaClass.simpleName, mapOf("refresh trigger" to trigger))
+                reportAuthPosthogEvent("refresh token", this.javaClass.simpleName, trigger)
             }
 
             val newCredentials = authApiClient.refreshToken(account, credentials)
@@ -95,7 +96,7 @@ abstract class AbstractLoginHandler(protected val analyticsProvider: RestAnalyti
             trace("refresh success for url {}, updated account {},trigger {}", analyticsProvider.apiUrl, getDefaultAccount(), trigger)
 
             withAuthManagerDebug {
-                reportAuthPosthogEvent("refresh token success", this.javaClass.simpleName, mapOf("refresh trigger" to trigger))
+                reportAuthPosthogEvent("refresh token success", this.javaClass.simpleName, trigger)
             }
 
             true
@@ -104,7 +105,7 @@ abstract class AbstractLoginHandler(protected val analyticsProvider: RestAnalyti
             warnWithException(e, "Exception in refresh {}", e)
             ErrorReporter.getInstance().reportError("${javaClass.simpleName}.refresh", e, mapOf("refresh trigger" to trigger))
             val errorMessage = ExceptionUtils.getNonEmptyMessage(e)
-            reportAuthPosthogEvent("refresh token failed", this.javaClass.simpleName, mapOf("error" to errorMessage, "refresh trigger" to trigger))
+            reportAuthPosthogEvent("refresh token failed", this.javaClass.simpleName, trigger, mapOf("error" to errorMessage))
 
             val authenticationException = ExceptionUtils.findCause(AuthenticationException::class.java, e)
             if (authenticationException != null) {
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/account/CentralizedLoginHandler.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/account/CentralizedLoginHandler.kt
@@ -18,7 +18,7 @@ class CentralizedLoginHandler(analyticsProvider: RestAnalyticsProvider) : Abstra
             trace("loginOrRefresh called, url: {},trigger {}", analyticsProvider.apiUrl, trigger)
 
             withAuthManagerDebug {
-                reportAuthPosthogEvent("loginOrRefresh", this.javaClass.simpleName, mapOf("loginOrRefresh trigger" to trigger))
+                reportAuthPosthogEvent("loginOrRefresh", this.javaClass.simpleName, trigger)
             }
 
             val digmaAccount = getDefaultAccount()
@@ -98,7 +98,8 @@ class CentralizedLoginHandler(analyticsProvider: RestAnalyticsProvider) : Abstra
             reportAuthPosthogEvent(
                 "loginOrRefresh failed",
                 this.javaClass.simpleName,
-                mapOf("error" to errorMessage, "loginOrRefresh trigger" to trigger)
+                trigger,
+                mapOf("error" to errorMessage)
             )
 
             //if got exception here then we probably can't refresh,logout, user will be redirected to login,
@@ -107,7 +108,7 @@ class CentralizedLoginHandler(analyticsProvider: RestAnalyticsProvider) : Abstra
             throw e
         } finally {
             withAuthManagerDebug {
-                reportAuthPosthogEvent("loginOrRefresh completed", this.javaClass.simpleName, mapOf("loginOrRefresh trigger" to trigger))
+                reportAuthPosthogEvent("loginOrRefresh completed", this.javaClass.simpleName, trigger)
             }
         }
 
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/account/LocalLoginHandler.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/account/LocalLoginHandler.kt
@@ -23,7 +23,7 @@ class LocalLoginHandler(analyticsProvider: RestAnalyticsProvider) : AbstractLogi
             trace("loginOrRefresh called, url: {},trigger {}", analyticsProvider.apiUrl, trigger)
 
             withAuthManagerDebug {
-                reportAuthPosthogEvent("loginOrRefresh", this.javaClass.simpleName, mapOf("loginOrRefresh trigger" to trigger))
+                reportAuthPosthogEvent("loginOrRefresh", this.javaClass.simpleName, trigger)
             }
 
             val digmaAccount = getDefaultAccount()
@@ -132,7 +132,8 @@ class LocalLoginHandler(analyticsProvider: RestAnalyticsProvider) : AbstractLogi
             reportAuthPosthogEvent(
                 "loginOrRefresh failed",
                 this.javaClass.simpleName,
-                mapOf("error" to errorMessage, "loginOrRefresh trigger" to trigger)
+                trigger,
+                mapOf("error" to errorMessage)
             )
 
             //if got exception here it may be from refresh or login, in both cases delete the current account
@@ -143,7 +144,7 @@ class LocalLoginHandler(analyticsProvider: RestAnalyticsProvider) : AbstractLogi
             false
         } finally {
             withAuthManagerDebug {
-                reportAuthPosthogEvent("loginOrRefresh completed", this.javaClass.simpleName, mapOf("loginOrRefresh trigger" to trigger))
+                reportAuthPosthogEvent("loginOrRefresh completed", this.javaClass.simpleName, trigger)
             }
         }
 
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/account/LoginHandler.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/account/LoginHandler.kt
@@ -85,7 +85,7 @@ interface LoginHandler {
 
             trace("logout called, trigger {}", trigger)
 
-            reportAuthPosthogEvent("logout", this.javaClass.simpleName, mapOf("logout trigger" to trigger))
+            reportAuthPosthogEvent("logout", this.javaClass.simpleName, trigger)
 
             val digmaAccount = DigmaDefaultAccountHolder.getInstance().account
 
@@ -102,7 +102,8 @@ interface LoginHandler {
             reportAuthPosthogEvent(
                 "logout success",
                 this.javaClass.simpleName,
-                mapOf("logout trigger" to trigger, "account found" to (digmaAccount != null))
+                trigger,
+                mapOf("account found" to (digmaAccount != null))
             )
 
             //return true only if an account was really deleted
@@ -112,7 +113,7 @@ interface LoginHandler {
             warnWithException(e, "Exception in logout {}, trigger {}", e, trigger)
             ErrorReporter.getInstance().reportError("${javaClass.simpleName}.logout", e, mapOf("logout trigger" to trigger))
             val errorMessage = ExceptionUtils.getNonEmptyMessage(e)
-            reportAuthPosthogEvent("logout failed", this.javaClass.simpleName, mapOf("error" to errorMessage, "logout trigger" to trigger))
+            reportAuthPosthogEvent("logout failed", this.javaClass.simpleName, trigger, mapOf("error" to errorMessage))
             false
         }
     }
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/credentials/DigmaCredentials.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/credentials/DigmaCredentials.kt
@@ -36,6 +36,8 @@ class DigmaCredentials
     private val creationTime: Long
 ) : CredentialsWithRefresh {
 
+    //the format of expirationTime from the server is 2024-08-18T21:33:24Z
+
 
     //expiresIn is the time left for expiration, it is not accurate because it is assigned some time after
     // the server created the expirationTime. it should actually be
@@ -50,7 +52,7 @@ class DigmaCredentials
      *         false if the token has already expired.
      */
     @JsonIgnore
-    override fun isAccessTokenValid(): Boolean = Date(System.currentTimeMillis()).time < expirationTime
+    override fun isAccessTokenValid(): Boolean = Clock.System.now().toEpochMilliseconds() < expirationTime
 
     @JsonIgnore
     fun getExpirationTimeAsDate(): Date {

Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,7 @@ class AuthManager(private val cs: CoroutineScope) : Disposable {`
`399`	`399`	`reportAuthPosthogEvent(`
`400`	`400`	`"fire auth info changed",`
`401`	`401`	`this.javaClass.simpleName,`
	`402`	`+ null,`
`402`	`403`	`mapOf("user.id" to myLatestAuthInfo.userId.toString(), "listeners" to listeners.size)`
`403`	`404`	`)`
`404`	`405`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class CentralizedLoginHandler(analyticsProvider: RestAnalyticsProvider) : Abstra`
`18`	`18`	`trace("loginOrRefresh called, url: {},trigger {}", analyticsProvider.apiUrl, trigger)`
`19`	`19`
`20`	`20`	`withAuthManagerDebug {`
`21`		`- reportAuthPosthogEvent("loginOrRefresh", this.javaClass.simpleName, mapOf("loginOrRefresh trigger" to trigger))`
	`21`	`+ reportAuthPosthogEvent("loginOrRefresh", this.javaClass.simpleName, trigger)`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`val digmaAccount = getDefaultAccount()`
`@@ -98,7 +98,8 @@ class CentralizedLoginHandler(analyticsProvider: RestAnalyticsProvider) : Abstra`
`98`	`98`	`reportAuthPosthogEvent(`
`99`	`99`	`"loginOrRefresh failed",`
`100`	`100`	`this.javaClass.simpleName,`
`101`		`- mapOf("error" to errorMessage, "loginOrRefresh trigger" to trigger)`
	`101`	`+ trigger,`
	`102`	`+ mapOf("error" to errorMessage)`
`102`	`103`	`)`
`103`	`104`
`104`	`105`	`//if got exception here then we probably can't refresh,logout, user will be redirected to login,`
`@@ -107,7 +108,7 @@ class CentralizedLoginHandler(analyticsProvider: RestAnalyticsProvider) : Abstra`
`107`	`108`	`throw e`
`108`	`109`	`} finally {`
`109`	`110`	`withAuthManagerDebug {`
`110`		`- reportAuthPosthogEvent("loginOrRefresh completed", this.javaClass.simpleName, mapOf("loginOrRefresh trigger" to trigger))`
	`111`	`+ reportAuthPosthogEvent("loginOrRefresh completed", this.javaClass.simpleName, trigger)`
`111`	`112`	`}`
`112`	`113`	`}`
`113`	`114`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class LocalLoginHandler(analyticsProvider: RestAnalyticsProvider) : AbstractLogi`
`23`	`23`	`trace("loginOrRefresh called, url: {},trigger {}", analyticsProvider.apiUrl, trigger)`
`24`	`24`
`25`	`25`	`withAuthManagerDebug {`
`26`		`- reportAuthPosthogEvent("loginOrRefresh", this.javaClass.simpleName, mapOf("loginOrRefresh trigger" to trigger))`
	`26`	`+ reportAuthPosthogEvent("loginOrRefresh", this.javaClass.simpleName, trigger)`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`val digmaAccount = getDefaultAccount()`
`@@ -132,7 +132,8 @@ class LocalLoginHandler(analyticsProvider: RestAnalyticsProvider) : AbstractLogi`
`132`	`132`	`reportAuthPosthogEvent(`
`133`	`133`	`"loginOrRefresh failed",`
`134`	`134`	`this.javaClass.simpleName,`
`135`		`- mapOf("error" to errorMessage, "loginOrRefresh trigger" to trigger)`
	`135`	`+ trigger,`
	`136`	`+ mapOf("error" to errorMessage)`
`136`	`137`	`)`
`137`	`138`
`138`	`139`	`//if got exception here it may be from refresh or login, in both cases delete the current account`
`@@ -143,7 +144,7 @@ class LocalLoginHandler(analyticsProvider: RestAnalyticsProvider) : AbstractLogi`
`143`	`144`	`false`
`144`	`145`	`} finally {`
`145`	`146`	`withAuthManagerDebug {`
`146`		`- reportAuthPosthogEvent("loginOrRefresh completed", this.javaClass.simpleName, mapOf("loginOrRefresh trigger" to trigger))`
	`147`	`+ reportAuthPosthogEvent("loginOrRefresh completed", this.javaClass.simpleName, trigger)`
`147`	`148`	`}`
`148`	`149`	`}`
`149`	`150`