remove config file editing and stop Q window from switching views on unauthed connection selection.

Author: samgst-amazon

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

@@ -144,7 +144,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
         QWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.Q))
 
         // isQConnected alone is not robust and there is race condition (read/update connection states)
-        val component = if (isNewConnectionForQ || (isQConnected(project) && !isQExpired(project))) {
+        val component = if ((isQConnected(project) && !isQExpired(project))) {
             LOG.debug { "returning Q-chat window; isQConnection=$isNewConnectionForQ; hasPinnedConnection=$isNewConnectionForQ" }
             AmazonQToolWindow.getInstance(project).component
         } else {

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

@@ -41,7 +41,6 @@ interface ConfigFilesFacade {
     fun updateSectionInConfig(sectionName: String, profile: Profile)
 
     fun deleteSsoConnectionFromConfig(sessionName: String)
-    fun deleteSsoProfileScopesFromConfig(sessionName: String)
 }
 
 class DefaultConfigFilesFacade(
@@ -198,31 +197,6 @@ class DefaultConfigFilesFacade(
         }
     }
 
-    override fun deleteSsoProfileScopesFromConfig(sessionName: String) {
-        val filePath = configPath
-        val lines = filePath.inputStreamIfExists()?.reader()?.readLines().orEmpty().toMutableList()
-        val ssoHeaderLine = lines.indexOfFirst { it.startsWith("[${SsoSessionConstants.SSO_SESSION_SECTION_NAME} $sessionName]") }
-        if (ssoHeaderLine == -1) return
-        val nextHeaderLine = lines.subList(ssoHeaderLine + 1, lines.size).indexOfFirst { it.startsWith("[") }
-        val endIndex = if (nextHeaderLine == -1) lines.size else ssoHeaderLine + nextHeaderLine + 1
-
-        // Find and remove the sso_registration_scopes line
-        for (i in ssoHeaderLine until endIndex) {
-            if (lines[i].trim().startsWith("sso_registration_scopes=")) {
-                lines.removeAt(i)
-                break
-            }
-        }
-
-        filePath.writeText(lines.joinToString("\n"))
-
-        val applicationManager = ApplicationManager.getApplication()
-        if (applicationManager != null && !applicationManager.isUnitTestMode) {
-            FileDocumentManager.getInstance().saveAllDocuments()
-            ProfileWatcher.getInstance().forceRefresh()
-        }
-    }
-
     private fun getCorrespondingSsoSessionProfilePosition(updatedArray: List<String>, sessionName: String): List<String> {
         var content = updatedArray
         val finalContent = mutableListOf<String>()

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

@@ -203,15 +203,9 @@ fun loginSso(
 
 @Suppress("UnusedParameter")
 fun logoutFromSsoConnection(project: Project?, connection: AwsBearerTokenConnection, callback: () -> Unit = {}) {
-    try {
-        ToolkitAuthManager.getInstance().deleteConnection(connection.id)
-        ProfileWatcher.getInstance().forceRefresh()
-        if (connection is ProfileSsoManagedBearerSsoConnection) {
-            deleteSsoConnection(connection)
-        }
-    } finally {
-        callback()
-    }
+    ToolkitAuthManager.getInstance().deleteConnection(connection.id)
+    ProfileWatcher.getInstance().forceRefresh()
+    callback()
 }
 
 fun lazyGetUnauthedBearerConnections() =
@@ -340,7 +334,7 @@ fun deleteSsoConnection(connection: ProfileSsoManagedBearerSsoConnection) =
 fun deleteSsoConnection(connection: CredentialIdentifier) =
     deleteSsoConnection(getSsoSessionProfileNameFromCredentials(connection))
 
-fun deleteSsoConnection(sessionName: String) = DefaultConfigFilesFacade().deleteSsoProfileScopesFromConfig(sessionName)
+fun deleteSsoConnection(sessionName: String) = DefaultConfigFilesFacade().deleteSsoConnectionFromConfig(sessionName)
 
 private fun getSsoSessionProfileNameFromCredentials(connection: CredentialIdentifier): String {
     connection as ProfileCredentialsIdentifierSso