Remove signout popup, stop credential deletion & remove scopes from config instead

Author: samgst-amazon

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

@@ -41,6 +41,7 @@ interface ConfigFilesFacade {
     fun updateSectionInConfig(sectionName: String, profile: Profile)
 
     fun deleteSsoConnectionFromConfig(sessionName: String)
+    fun deleteSsoProfileScopesFromConfig(sessionName: String)
 }
 
 class DefaultConfigFilesFacade(
@@ -197,6 +198,31 @@ 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

@@ -20,6 +20,7 @@ import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.credentials.pinning.FeatureWithPinnedConnection
 import software.aws.toolkits.jetbrains.core.credentials.profiles.ProfileCredentialsIdentifierSso
+import software.aws.toolkits.jetbrains.core.credentials.profiles.ProfileWatcher
 import software.aws.toolkits.jetbrains.core.credentials.profiles.SsoSessionConstants.SSO_SESSION_SECTION_NAME
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenAuthState
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProvider
@@ -204,6 +205,7 @@ fun loginSso(
 fun logoutFromSsoConnection(project: Project?, connection: AwsBearerTokenConnection, callback: () -> Unit = {}) {
     try {
         ToolkitAuthManager.getInstance().deleteConnection(connection.id)
+        ProfileWatcher.getInstance().forceRefresh()
         if (connection is ProfileSsoManagedBearerSsoConnection) {
             deleteSsoConnection(connection)
         }
@@ -338,7 +340,7 @@ fun deleteSsoConnection(connection: ProfileSsoManagedBearerSsoConnection) =
 fun deleteSsoConnection(connection: CredentialIdentifier) =
     deleteSsoConnection(getSsoSessionProfileNameFromCredentials(connection))
 
-fun deleteSsoConnection(sessionName: String) = DefaultConfigFilesFacade().deleteSsoConnectionFromConfig(sessionName)
+fun deleteSsoConnection(sessionName: String) = DefaultConfigFilesFacade().deleteSsoProfileScopesFromConfig(sessionName)
 
 private fun getSsoSessionProfileNameFromCredentials(connection: CredentialIdentifier): String {
     connection as ProfileCredentialsIdentifierSso

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

@@ -6,27 +6,15 @@ package software.aws.toolkits.jetbrains.core.credentials.actions
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.DumbAwareAction
-import com.intellij.openapi.ui.MessageDialogBuilder
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
-import software.aws.toolkits.jetbrains.core.credentials.ProfileSsoManagedBearerSsoConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManagerListener
-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"),
-                AwsCoreBundle.message("gettingstarted.auth.idc.sign.out.confirmation")
-            ).yesText(AwsCoreBundle.message("general.confirm")).ask(e.project)
-            if (confirmDeletion) {
-                deleteSsoConnection(value)
-            }
-        }
         logoutFromSsoConnection(e.project, value)
         ApplicationManager.getApplication().messageBus.syncPublisher(
             ToolkitConnectionManagerListener.TOPIC