Fix sign out in the Getting Started panel (#4043)

manodnyab · web-flow · commit a25e7572ced0 · 2023-12-06T15:38:39.000-08:00
* Fix sign out option and add password field for secret access key

* added changelog

* detekt
diff --git a/.changes/next-release/bugfix-b72c9a8f-a3bd-4259-bc15-e36767cb294e.json b/.changes/next-release/bugfix-b72c9a8f-a3bd-4259-bc15-e36767cb294e.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fixed sign out button in the CodeWhisperer panel for Getting Started Page"
+}
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialog.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialog.kt
@@ -473,8 +473,8 @@ class SetupAuthenticationDialog(
         }
 
         row(message("gettingstarted.setup.iam.secret_key")) {
-            textField()
-                .errorOnApply(message("gettingstarted.setup.error.not_empty")) { it.text.isBlank() }
+            passwordField()
+                .errorOnApply(message("gettingstarted.setup.error.not_empty")) { it.password.isEmpty() }
                 .bindText(state.iamTabState::secretKey)
         }
     }
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanel.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanel.kt
@@ -836,6 +836,7 @@ class GettingStartedPanel(
                             row {
                                 link(message("toolkit.login.aws_builder_id.already_connected.reconnect")) {
                                     val validConnection = checkBearerConnectionValidity(project, BearerTokenFeatureSet.CODEWHISPERER)
+
                                     val connection = validConnection.activeConnectionBearer
                                     if (connection is ProfileSsoManagedBearerSsoConnection) {
                                         if (validConnection.connectionType == ActiveConnectionType.IAM_IDC) {
@@ -847,6 +848,8 @@ class GettingStartedPanel(
                                                 deleteSsoConnectionCW(connection)
                                             }
                                         }
+                                    }
+                                    if (connection != null) {
                                         logoutFromSsoConnection(project, connection) {
                                             controlPanelVisibility(panelConnected, panelNotConnected)
                                         }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Fixed sign out button in the CodeWhisperer panel for Getting Started Page"
 +}
Original file line number	Diff line number	Diff line change
`@@ -473,8 +473,8 @@ class SetupAuthenticationDialog(`
`473`	`473`	`}`
`474`	`474`
`475`	`475`	`row(message("gettingstarted.setup.iam.secret_key")) {`
`476`		`- textField()`
`477`		`- .errorOnApply(message("gettingstarted.setup.error.not_empty")) { it.text.isBlank() }`
	`476`	`+ passwordField()`
	`477`	`+ .errorOnApply(message("gettingstarted.setup.error.not_empty")) { it.password.isEmpty() }`
`478`	`478`	`.bindText(state.iamTabState::secretKey)`
`479`	`479`	`}`
`480`	`480`	`}`
Original file line number	Diff line number	Diff line change
`@@ -836,6 +836,7 @@ class GettingStartedPanel(`
`836`	`836`	`row {`
`837`	`837`	`link(message("toolkit.login.aws_builder_id.already_connected.reconnect")) {`
`838`	`838`	`val validConnection = checkBearerConnectionValidity(project, BearerTokenFeatureSet.CODEWHISPERER)`
	`839`	`+`
`839`	`840`	`val connection = validConnection.activeConnectionBearer`
`840`	`841`	`if (connection is ProfileSsoManagedBearerSsoConnection) {`
`841`	`842`	`if (validConnection.connectionType == ActiveConnectionType.IAM_IDC) {`
`@@ -847,6 +848,8 @@ class GettingStartedPanel(`
`847`	`848`	`deleteSsoConnectionCW(connection)`
`848`	`849`	`}`
`849`	`850`	`}`
	`851`	`+ }`
	`852`	`+ if (connection != null) {`
`850`	`853`	`logoutFromSsoConnection(project, connection) {`
`851`	`854`	`controlPanelVisibility(panelConnected, panelNotConnected)`
`852`	`855`	`}`