Skip to content

Commit df30b58

Browse files
committed
Check current explorerConnection for scopes only
1 parent 4e1af21 commit df30b58

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/GettingStartedAuthUtils.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.intellij.openapi.project.Project
77
import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
88
import software.amazon.awssdk.services.toolkittelemetry.model.Unit
99
import software.aws.toolkits.core.utils.tryOrNull
10+
import software.aws.toolkits.jetbrains.core.credentials.AwsConnectionManager
1011
import software.aws.toolkits.jetbrains.core.credentials.LegacyManagedBearerSsoConnection
1112
import software.aws.toolkits.jetbrains.core.credentials.ManagedBearerSsoConnection
1213
import software.aws.toolkits.jetbrains.core.credentials.ProfileSsoManagedBearerSsoConnection
@@ -233,25 +234,24 @@ fun reauthenticateWithQ(project: Project) {
233234
}
234235

235236
fun emitUserState(project: Project) {
236-
237-
val scopes = ToolkitAuthManager.getInstance().listConnections().flatMap { connection ->
238-
when (connection) {
239-
is ProfileSsoManagedBearerSsoConnection -> connection.scopes
240-
is LegacyManagedBearerSsoConnection -> connection.scopes
241-
else -> emptyList()
242-
}
243-
}.toSet()
237+
val explorerConnection = ToolkitConnectionManager.getInstance(project).activeConnection()
238+
val scopes = when (explorerConnection) {
239+
is ManagedBearerSsoConnection -> explorerConnection.scopes
240+
else -> emptyList()
241+
}
244242

245243
TelemetryService.getInstance().record(project) {
246-
datum("auth_userState"){
244+
datum("auth_userState") {
247245
createTime(Instant.now())
248246
unit(Unit.NONE)
249247
value(1.0)
250248
passive(true)
251249
metadata("source", getStartupState().toString())
252250
metadata("authStatus", getAuthStatus(project).toString())
253251
metadata("authEnabledConnections", getEnabledConnections(project))
254-
metadata("authScopes", scopes.joinToString(","))
252+
if (getAuthStatus(project).toString() != "notConnected") {
253+
metadata("authScopes", scopes.joinToString(","))
254+
}
255255
}
256256
}
257257
}

0 commit comments

Comments
 (0)