Fix IDE deadlock when logging into Builder ID / SSO (#3685)

* Caused by connection switch lock on pooled thread waiting for dialog pinning prompt (on EDT), while status bar widget update waiting for lock release on EDT
* Causes subsequent warning on unsafe actions holding write lock, fix by setting modality state appropriately
* No tests because unit tests have a different thread model than a running IDE

Author: rli

jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitConnectionManager.kt

@@ -97,35 +97,34 @@ class DefaultToolkitConnectionManager : ToolkitConnectionManager, PersistentStat
     }
 
     @Synchronized
-    override fun switchConnection(connection: ToolkitConnection?) {
+    override fun switchConnection(newConnection: ToolkitConnection?) {
         val oldConnection = this.connection
-        val newConnection = connection
 
         if (oldConnection != newConnection) {
+            val application = ApplicationManager.getApplication()
             this.connection = newConnection
 
-            val pinningManager = pinningManager
-            if (newConnection != null && pinningManager != null) {
+            if (newConnection != null) {
                 val featuresToPin = mutableListOf<FeatureWithPinnedConnection>()
                 FeatureWithPinnedConnection.EP_NAME.forEachExtensionSafe {
                     if (!pinningManager.isFeaturePinned(it) &&
-
                         (
                             (oldConnection == null && it.supportsConnectionType(newConnection)) ||
                                 (oldConnection != null && it.supportsConnectionType(oldConnection) != it.supportsConnectionType(newConnection))
                             )
-
                     ) {
                         featuresToPin.add(it)
                     }
                 }
 
                 if (featuresToPin.isNotEmpty()) {
-                    pinningManager.maybePinFeatures(oldConnection, newConnection, featuresToPin)
+                    application.executeOnPooledThread {
+                        pinningManager.maybePinFeatures(oldConnection, newConnection, featuresToPin)
+                    }
                 }
             }
 
-            ApplicationManager.getApplication().messageBus.syncPublisher(ToolkitConnectionManagerListener.TOPIC).activeConnectionChanged(connection)
+            application.messageBus.syncPublisher(ToolkitConnectionManagerListener.TOPIC).activeConnectionChanged(newConnection)
         }
     }
 }

jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitAuthManager.kt

@@ -90,7 +90,7 @@ interface ToolkitConnectionManager : Disposable {
 
     fun activeConnectionForFeature(feature: FeatureWithPinnedConnection): ToolkitConnection?
 
-    fun switchConnection(connection: ToolkitConnection?)
+    fun switchConnection(newConnection: ToolkitConnection?)
 
     override fun dispose() {}
 

jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/pinning/ConnectionPinningManager.kt

@@ -6,6 +6,7 @@ package software.aws.toolkits.jetbrains.core.credentials.pinning
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
@@ -14,7 +15,7 @@ import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.MessageDialogBuilder
-import org.jetbrains.annotations.TestOnly
+import org.jetbrains.annotations.VisibleForTesting
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitAuthManager
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
@@ -98,7 +99,7 @@ class DefaultConnectionPinningManager :
         }
 
         var connectionToPin = if (oldConnection is AwsBearerTokenConnection) oldConnection else newConnection
-        if (computeOnEdt { showDialogIfNeeded(oldConnection, newConnection, featuresString) }) {
+        if (showDialogIfNeeded(oldConnection, newConnection, featuresString)) {
             features.forEach {
                 setPinnedConnection(it, connectionToPin)
             }
@@ -126,33 +127,35 @@ class DefaultConnectionPinningManager :
 
     override fun dispose() {}
 
-    @TestOnly
+    @VisibleForTesting
     internal fun showDialogIfNeeded(oldConnection: ToolkitConnection?, newConnection: ToolkitConnection, featuresString: String, project: Project? = null) =
         if (!doNotPromptForPinning) {
             val bearerTokenConnectionName = bearerTokenConnectionString(oldConnection, newConnection)
 
-            MessageDialogBuilder.yesNo(
-                message("credentials.switch.confirmation.title", featuresString, bearerTokenConnectionName),
-                message("credentials.switch.confirmation.comment", featuresString, bearerTokenConnectionName, message("iam.name"),)
-            )
-                .yesText(message("credentials.switch.confirmation.yes"))
-                .noText(message("credentials.switch.confirmation.no"))
-                .doNotAsk(object : com.intellij.openapi.ui.DoNotAskOption.Adapter() {
-                    override fun rememberChoice(isSelected: Boolean, exitCode: Int) {
-                        if (isSelected && exitCode == DialogWrapper.OK_EXIT_CODE) {
-                            doNotPromptForPinning = true
+            computeOnEdt(ModalityState.defaultModalityState()) {
+                MessageDialogBuilder.yesNo(
+                    message("credentials.switch.confirmation.title", featuresString, bearerTokenConnectionName),
+                    message("credentials.switch.confirmation.comment", featuresString, bearerTokenConnectionName, message("iam.name"))
+                )
+                    .yesText(message("credentials.switch.confirmation.yes"))
+                    .noText(message("credentials.switch.confirmation.no"))
+                    .doNotAsk(object : com.intellij.openapi.ui.DoNotAskOption.Adapter() {
+                        override fun rememberChoice(isSelected: Boolean, exitCode: Int) {
+                            if (isSelected && exitCode == DialogWrapper.OK_EXIT_CODE) {
+                                doNotPromptForPinning = true
+                            }
+                        }
+                    })
+                    .icon(AllIcons.General.QuestionDialog)
+                    .help(HelpIds.EXPLORER_CREDS_HELP.id)
+                    .ask(project).apply {
+                        if (this) {
+                            UiTelemetry.click(project, "connection_multiple_auths_yes")
+                        } else {
+                            UiTelemetry.click(project, "connection_multiple_auths_no")
                         }
                     }
-                })
-                .icon(AllIcons.General.QuestionDialog)
-                .help(HelpIds.EXPLORER_CREDS_HELP.id)
-                .ask(project).apply {
-                    if (this) {
-                        UiTelemetry.click(project, "connection_multiple_auths_yes")
-                    } else {
-                        UiTelemetry.click(project, "connection_multiple_auths_no")
-                    }
-                }
+            }
         } else {
             false
         }