diff --git a/.changes/next-release/bugfix-e43f051f-5a66-4a46-ac6f-3f351f76cf6e.json b/.changes/next-release/bugfix-e43f051f-5a66-4a46-ac6f-3f351f76cf6e.json new file mode 100644 index 00000000000..b64f7db646a --- /dev/null +++ b/.changes/next-release/bugfix-e43f051f-5a66-4a46-ac6f-3f351f76cf6e.json @@ -0,0 +1,4 @@ +{ + "type" : "bugfix", + "description" : "Fix inability to sign out in reauth view in Q chat panel" +} \ No newline at end of file diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt index 7952179c9b6..6af627f0279 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt @@ -6,6 +6,7 @@ package software.aws.toolkits.jetbrains.services.amazonq import com.intellij.openapi.Disposable import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.DataContext +import com.intellij.openapi.application.runInEdt import com.intellij.openapi.components.Service import com.intellij.openapi.components.service import com.intellij.openapi.project.Project @@ -177,13 +178,15 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos ToolkitConnectionManager.getInstance(project) .activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection )?.let { connection -> - SsoLogoutAction(connection).actionPerformed( - AnActionEvent.createFromDataContext( - "qBrowser", - null, - DataContext.EMPTY_CONTEXT + runInEdt { + SsoLogoutAction(connection).actionPerformed( + AnActionEvent.createFromDataContext( + "qBrowser", + null, + DataContext.EMPTY_CONTEXT + ) ) - ) + } } } diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt index 1cda785a815..49eb918a14a 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt @@ -13,9 +13,11 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager import software.aws.toolkits.jetbrains.core.credentials.deleteSsoConnection import software.aws.toolkits.jetbrains.core.credentials.logoutFromSsoConnection import software.aws.toolkits.resources.AwsCoreBundle +import software.aws.toolkits.telemetry.UiTelemetry class SsoLogoutAction(private val value: AwsBearerTokenConnection) : DumbAwareAction(AwsCoreBundle.message("credentials.individual_identity.signout")) { override fun actionPerformed(e: AnActionEvent) { + UiTelemetry.click(e.project, "signOut") if (value is ProfileSsoManagedBearerSsoConnection) { val confirmDeletion = MessageDialogBuilder.okCancel( AwsCoreBundle.message("gettingstarted.auth.idc.sign.out.confirmation.title"),