Merge remote-tracking branch 'origin/samgst/stopDeletingCredentialFromConfig' into samgst/stopDeletingCredentialFromConfig

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

Author: samgst-amazon

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

@@ -3,8 +3,6 @@
 
 package software.aws.toolkits.jetbrains.core.credentials
 
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.fileEditor.FileDocumentManager
 import software.amazon.awssdk.profiles.Profile
 import software.amazon.awssdk.profiles.ProfileFile
 import software.amazon.awssdk.profiles.ProfileFileLocation
@@ -17,8 +15,6 @@ import software.aws.toolkits.core.utils.touch
 import software.aws.toolkits.core.utils.tryDirOp
 import software.aws.toolkits.core.utils.tryFileOp
 import software.aws.toolkits.core.utils.writeText
-import software.aws.toolkits.jetbrains.core.credentials.profiles.ProfileWatcher
-import software.aws.toolkits.jetbrains.core.credentials.profiles.SsoSessionConstants
 import software.aws.toolkits.jetbrains.core.credentials.profiles.ssoSessions
 import java.nio.file.Path
 
@@ -39,8 +35,6 @@ interface ConfigFilesFacade {
     fun appendProfileToCredentials(profile: Profile)
     fun appendSectionToConfig(sectionName: String, profile: Profile)
     fun updateSectionInConfig(sectionName: String, profile: Profile)
-
-    fun deleteSsoConnectionFromConfig(sessionName: String)
 }
 
 class DefaultConfigFilesFacade(
@@ -179,24 +173,6 @@ class DefaultConfigFilesFacade(
         }
     }
 
-    override fun deleteSsoConnectionFromConfig(sessionName: String) {
-        val filePath = configPath
-        val lines = filePath.inputStreamIfExists()?.reader()?.readLines().orEmpty()
-        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
-        val updatedArray = lines.subList(0, ssoHeaderLine) + lines.subList(endIndex, lines.size)
-        val profileHeaderLine = getCorrespondingSsoSessionProfilePosition(updatedArray, sessionName)
-        filePath.writeText(profileHeaderLine.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

@@ -13,13 +13,11 @@ import software.amazon.awssdk.services.ssooidc.model.SsoOidcException
 import software.aws.toolkits.core.ClientConnectionSettings
 import software.aws.toolkits.core.ConnectionSettings
 import software.aws.toolkits.core.TokenConnectionSettings
-import software.aws.toolkits.core.credentials.CredentialIdentifier
 import software.aws.toolkits.core.credentials.ToolkitBearerTokenProvider
 import software.aws.toolkits.core.utils.getLogger
 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.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,9 +202,6 @@ fun loginSso(
 fun logoutFromSsoConnection(project: Project?, connection: AwsBearerTokenConnection, callback: () -> Unit = {}) {
     try {
         ToolkitAuthManager.getInstance().deleteConnection(connection.id)
-        if (connection is ProfileSsoManagedBearerSsoConnection) {
-            deleteSsoConnection(connection)
-        }
     } finally {
         callback()
     }
@@ -332,19 +327,6 @@ fun maybeReauthProviderIfNeeded(
     }
 }
 
-fun deleteSsoConnection(connection: ProfileSsoManagedBearerSsoConnection) =
-    deleteSsoConnection(connection.configSessionName)
-
-fun deleteSsoConnection(connection: CredentialIdentifier) =
-    deleteSsoConnection(getSsoSessionProfileNameFromCredentials(connection))
-
-fun deleteSsoConnection(sessionName: String) = DefaultConfigFilesFacade().deleteSsoConnectionFromConfig(sessionName)
-
-private fun getSsoSessionProfileNameFromCredentials(connection: CredentialIdentifier): String {
-    connection as ProfileCredentialsIdentifierSso
-    return connection.ssoSessionName
-}
-
 private fun recordLoginWithBrowser(
     credentialStartUrl: String? = null,
     credentialSourceId: CredentialSourceId? = null,

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

@@ -6,27 +6,13 @@ 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