From 62598d78499acf6b8116318711a8aa93fd00b29e Mon Sep 17 00:00:00 2001 From: Rickard Sundin Date: Fri, 6 Dec 2024 17:27:51 +0100 Subject: [PATCH 1/3] fix: Chosing cancel on confirmation no longer deletes profiles (#5167) If the user selects cancel in the confirmation dialog, the sign out will now be aborted. The method logoutFromSsoConnection also calls deleteSsoConnection() if the connection is of type ProfileSsoManagedBearerSsoConnection, so it is does not have to be called from SsoLogoutAction. --- .../bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e83d.json | 4 ++++ .../jetbrains/core/credentials/actions/SsoLogoutAction.kt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 .changes/next-release/bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e83d.json diff --git a/.changes/next-release/bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e83d.json b/.changes/next-release/bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e83d.json new file mode 100644 index 00000000000..939e34ca0f6 --- /dev/null +++ b/.changes/next-release/bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e83d.json @@ -0,0 +1,4 @@ +{ + "type" : "bugfix", + "description" : " Chosing cancel on sign out confirmation now cancels the sign out and does not delete profiles from ~/.aws/config ([#5167](https://github.com/aws/aws-toolkit-jetbrains/issues/5167))" +} diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt index 49eb918a14a..582f84491f0 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt @@ -23,8 +23,8 @@ class SsoLogoutAction(private val value: AwsBearerTokenConnection) : DumbAwareAc 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) + if (!confirmDeletion) { + return } } logoutFromSsoConnection(e.project, value) From 2d15cc01f4c469cea12cf11a70c505b627849bae Mon Sep 17 00:00:00 2001 From: rickardsundin Date: Fri, 6 Dec 2024 18:13:13 +0100 Subject: [PATCH 2/3] Update .changes/next-release/bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e83d.json Co-authored-by: Richard Li <742829+rli@users.noreply.github.com> --- .../bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e83d.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changes/next-release/bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e83d.json b/.changes/next-release/bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e83d.json index 939e34ca0f6..e3675dfdd05 100644 --- a/.changes/next-release/bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e83d.json +++ b/.changes/next-release/bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e83d.json @@ -1,4 +1,4 @@ { "type" : "bugfix", - "description" : " Chosing cancel on sign out confirmation now cancels the sign out and does not delete profiles from ~/.aws/config ([#5167](https://github.com/aws/aws-toolkit-jetbrains/issues/5167))" + "description" : " Chosing cancel on sign out confirmation now cancels the sign out and does not delete profiles from ~/.aws/config (#5167)" } From 9de4286d6452928c2c026d655e8141657170e19d Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Fri, 6 Dec 2024 09:38:10 -0800 Subject: [PATCH 3/3] unused import --- .../jetbrains/core/credentials/actions/SsoLogoutAction.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt index 582f84491f0..1c03c39b87d 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt @@ -10,7 +10,6 @@ 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