Skip to content

Commit 50a637d

Browse files
samgst-amazonsamgst-amazon
committed
remove functions that delete sso from config
1 parent 7c4a996 commit 50a637d

File tree

4 files changed

+1
-89
lines changed

4 files changed

+1
-89
lines changed

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ interface ConfigFilesFacade {
4040
fun appendSectionToConfig(sectionName: String, profile: Profile)
4141
fun updateSectionInConfig(sectionName: String, profile: Profile)
4242

43-
fun deleteSsoConnectionFromConfig(sessionName: String)
4443
}
4544

4645
class DefaultConfigFilesFacade(
@@ -179,24 +178,6 @@ class DefaultConfigFilesFacade(
179178
}
180179
}
181180

182-
override fun deleteSsoConnectionFromConfig(sessionName: String) {
183-
val filePath = configPath
184-
val lines = filePath.inputStreamIfExists()?.reader()?.readLines().orEmpty()
185-
val ssoHeaderLine = lines.indexOfFirst { it.startsWith("[${SsoSessionConstants.SSO_SESSION_SECTION_NAME} $sessionName]") }
186-
if (ssoHeaderLine == -1) return
187-
val nextHeaderLine = lines.subList(ssoHeaderLine + 1, lines.size).indexOfFirst { it.startsWith("[") }
188-
val endIndex = if (nextHeaderLine == -1) lines.size else ssoHeaderLine + nextHeaderLine + 1
189-
val updatedArray = lines.subList(0, ssoHeaderLine) + lines.subList(endIndex, lines.size)
190-
val profileHeaderLine = getCorrespondingSsoSessionProfilePosition(updatedArray, sessionName)
191-
filePath.writeText(profileHeaderLine.joinToString("\n"))
192-
193-
val applicationManager = ApplicationManager.getApplication()
194-
if (applicationManager != null && !applicationManager.isUnitTestMode) {
195-
FileDocumentManager.getInstance().saveAllDocuments()
196-
ProfileWatcher.getInstance().forceRefresh()
197-
}
198-
}
199-
200181
private fun getCorrespondingSsoSessionProfilePosition(updatedArray: List<String>, sessionName: String): List<String> {
201182
var content = updatedArray
202183
val finalContent = mutableListOf<String>()

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,6 @@ fun loginSso(
204204
fun logoutFromSsoConnection(project: Project?, connection: AwsBearerTokenConnection, callback: () -> Unit = {}) {
205205
try {
206206
ToolkitAuthManager.getInstance().deleteConnection(connection.id)
207-
if (connection is ProfileSsoManagedBearerSsoConnection) {
208-
deleteSsoConnection(connection)
209-
}
210207
} finally {
211208
callback()
212209
}
@@ -332,19 +329,6 @@ fun maybeReauthProviderIfNeeded(
332329
}
333330
}
334331

335-
fun deleteSsoConnection(connection: ProfileSsoManagedBearerSsoConnection) =
336-
deleteSsoConnection(connection.configSessionName)
337-
338-
fun deleteSsoConnection(connection: CredentialIdentifier) =
339-
deleteSsoConnection(getSsoSessionProfileNameFromCredentials(connection))
340-
341-
fun deleteSsoConnection(sessionName: String) = DefaultConfigFilesFacade().deleteSsoConnectionFromConfig(sessionName)
342-
343-
private fun getSsoSessionProfileNameFromCredentials(connection: CredentialIdentifier): String {
344-
connection as ProfileCredentialsIdentifierSso
345-
return connection.ssoSessionName
346-
}
347-
348332
private fun recordLoginWithBrowser(
349333
credentialStartUrl: String? = null,
350334
credentialSourceId: CredentialSourceId? = null,

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,13 @@ package software.aws.toolkits.jetbrains.core.credentials.actions
66
import com.intellij.openapi.actionSystem.AnActionEvent
77
import com.intellij.openapi.application.ApplicationManager
88
import com.intellij.openapi.project.DumbAwareAction
9-
import com.intellij.openapi.ui.MessageDialogBuilder
109
import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
11-
import software.aws.toolkits.jetbrains.core.credentials.ProfileSsoManagedBearerSsoConnection
1210
import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManagerListener
13-
import software.aws.toolkits.jetbrains.core.credentials.deleteSsoConnection
1411
import software.aws.toolkits.jetbrains.core.credentials.logoutFromSsoConnection
1512
import software.aws.toolkits.resources.AwsCoreBundle
1613

1714
class SsoLogoutAction(private val value: AwsBearerTokenConnection) : DumbAwareAction(AwsCoreBundle.message("credentials.individual_identity.signout")) {
1815
override fun actionPerformed(e: AnActionEvent) {
19-
if (value is ProfileSsoManagedBearerSsoConnection) {
20-
val confirmDeletion = MessageDialogBuilder.okCancel(
21-
AwsCoreBundle.message("gettingstarted.auth.idc.sign.out.confirmation.title"),
22-
AwsCoreBundle.message("gettingstarted.auth.idc.sign.out.confirmation")
23-
).yesText(AwsCoreBundle.message("general.confirm")).ask(e.project)
24-
if (confirmDeletion) {
25-
deleteSsoConnection(value)
26-
}
27-
}
2816
logoutFromSsoConnection(e.project, value)
2917
ApplicationManager.getApplication().messageBus.syncPublisher(
3018
ToolkitConnectionManagerListener.TOPIC

‎plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanel.kt‎

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import software.aws.toolkits.jetbrains.core.credentials.ProfileSsoManagedBearerS
4444
import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
4545
import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
4646
import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManagerListener
47-
import software.aws.toolkits.jetbrains.core.credentials.deleteSsoConnection
4847
import software.aws.toolkits.jetbrains.core.credentials.logoutFromSsoConnection
4948
import software.aws.toolkits.jetbrains.core.credentials.pinning.CodeCatalystConnection
5049
import software.aws.toolkits.jetbrains.core.credentials.pinning.ConnectionPinningManagerListener
@@ -527,17 +526,6 @@ class GettingStartedPanel(
527526
val validConnection = activeConnection()
528527

529528
val connection = validConnection.activeConnectionBearer
530-
if (connection is ProfileSsoManagedBearerSsoConnection) {
531-
if (validConnection.connectionType == ActiveConnectionType.IAM_IDC) {
532-
val confirmDeletion = MessageDialogBuilder.okCancel(
533-
message("gettingstarted.auth.idc.sign.out.confirmation.title"),
534-
message("gettingstarted.auth.idc.sign.out.confirmation")
535-
).yesText(message("general.confirm")).ask(project)
536-
if (confirmDeletion) {
537-
deleteSsoConnection(connection)
538-
}
539-
}
540-
}
541529
if (connection != null) {
542530
logoutFromSsoConnection(project, connection) {
543531
controlPanelVisibility(panelConnected, panelNotConnected)
@@ -671,16 +659,6 @@ class GettingStartedPanel(
671659
link(message("toolkit.login.aws_builder_id.already_connected.reconnect")) {
672660
val activeConnection = checkIamConnectionValidity(project)
673661
val connection = activeConnection.activeConnectionIam
674-
if (connection != null) {
675-
val confirmDeletion = MessageDialogBuilder.okCancel(
676-
message("gettingstarted.auth.idc.sign.out.confirmation.title"),
677-
message("gettingstarted.auth.idc.sign.out.confirmation")
678-
).yesText(message("general.confirm")).ask(project)
679-
if (confirmDeletion) {
680-
deleteSsoConnection(connection)
681-
controlPanelVisibility(panelConnected, panelNotConnected)
682-
}
683-
}
684662
}
685663
}.visible(checkIamConnectionValidity(project).connectionType == ActiveConnectionType.IAM_IDC)
686664
row {
@@ -891,17 +869,7 @@ class GettingStartedPanel(
891869
val validConnection = checkBearerConnectionValidity(project, BearerTokenFeatureSet.CODEWHISPERER)
892870

893871
val connection = validConnection.activeConnectionBearer
894-
if (connection is ProfileSsoManagedBearerSsoConnection) {
895-
if (validConnection.connectionType == ActiveConnectionType.IAM_IDC) {
896-
val confirmDeletion = MessageDialogBuilder.okCancel(
897-
message("gettingstarted.auth.idc.sign.out.confirmation.title"),
898-
message("gettingstarted.auth.idc.sign.out.confirmation")
899-
).yesText(message("general.confirm")).ask(project)
900-
if (confirmDeletion) {
901-
deleteSsoConnection(connection)
902-
}
903-
}
904-
}
872+
905873
if (connection != null) {
906874
logoutFromSsoConnection(project, connection) {
907875
controlPanelVisibility(panelConnected, panelNotConnected)
@@ -982,15 +950,6 @@ class GettingStartedPanel(
982950
val validConnection = checkBearerConnectionValidity(project, BearerTokenFeatureSet.CODEWHISPERER)
983951
val connection = validConnection.activeConnectionBearer
984952
if (connection is ProfileSsoManagedBearerSsoConnection) {
985-
if (validConnection.connectionType == ActiveConnectionType.IAM_IDC) {
986-
val confirmDeletion = MessageDialogBuilder.okCancel(
987-
message("gettingstarted.auth.idc.sign.out.confirmation.title"),
988-
message("gettingstarted.auth.idc.sign.out.confirmation")
989-
).yesText(message("general.confirm")).ask(project)
990-
if (confirmDeletion) {
991-
deleteSsoConnection(connection)
992-
}
993-
}
994953
logoutFromSsoConnection(project, connection) {
995954
controlPanelVisibility(panelConnected, panelNotConnected)
996955
}

0 commit comments

Comments
 (0)