Skip to content

fix: Chosing cancel on confirmation no longer deletes profiles (#5167) #5176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 6, 2024
Merged

fix: Chosing cancel on confirmation no longer deletes profiles (#5167) #5176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62598d7
fix: Chosing cancel on confirmation no longer deletes profiles (#5167)
ricsunSPL Dec 6, 2024
1dd6202
Merge branch 'main' into bugfix-5167
rickardsundin Dec 6, 2024
2d15cc0
Update .changes/next-release/bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e…
rickardsundin Dec 6, 2024
9de4286
unused import
rli Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changes/next-release/bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e83d.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)"
}
5 changes: 2 additions & 3 deletions ...community/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,8 +22,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)
Expand Down
Loading