Skip to content

Commit 07640ec

Browse files
authored
Fix sign out button in reauth panel in Q chat (#4935)
* Add signout metric * Fix broken sign out
1 parent 7e4f6e3 commit 07640ec

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Fix inability to sign out in reauth view in Q chat panel"
4+
}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package software.aws.toolkits.jetbrains.services.amazonq
66
import com.intellij.openapi.Disposable
77
import com.intellij.openapi.actionSystem.AnActionEvent
88
import com.intellij.openapi.actionSystem.DataContext
9+
import com.intellij.openapi.application.runInEdt
910
import com.intellij.openapi.components.Service
1011
import com.intellij.openapi.components.service
1112
import com.intellij.openapi.project.Project
@@ -177,13 +178,15 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
177178
ToolkitConnectionManager.getInstance(project)
178179
.activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection
179180
)?.let { connection ->
180-
SsoLogoutAction(connection).actionPerformed(
181-
AnActionEvent.createFromDataContext(
182-
"qBrowser",
183-
null,
184-
DataContext.EMPTY_CONTEXT
181+
runInEdt {
182+
SsoLogoutAction(connection).actionPerformed(
183+
AnActionEvent.createFromDataContext(
184+
"qBrowser",
185+
null,
186+
DataContext.EMPTY_CONTEXT
187+
)
185188
)
186-
)
189+
}
187190
}
188191
}
189192

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
1313
import software.aws.toolkits.jetbrains.core.credentials.deleteSsoConnection
1414
import software.aws.toolkits.jetbrains.core.credentials.logoutFromSsoConnection
1515
import software.aws.toolkits.resources.AwsCoreBundle
16+
import software.aws.toolkits.telemetry.UiTelemetry
1617

1718
class SsoLogoutAction(private val value: AwsBearerTokenConnection) : DumbAwareAction(AwsCoreBundle.message("credentials.individual_identity.signout")) {
1819
override fun actionPerformed(e: AnActionEvent) {
20+
UiTelemetry.click(e.project, "signOut")
1921
if (value is ProfileSsoManagedBearerSsoConnection) {
2022
val confirmDeletion = MessageDialogBuilder.okCancel(
2123
AwsCoreBundle.message("gettingstarted.auth.idc.sign.out.confirmation.title"),

0 commit comments

Comments
 (0)