[Bug fix] CodeCatalyst: User connection status is not updated in developer tools if connection is expired. (#4189)

* Reauthentication Check and Partial expiration case for login

* Fix: In expired connection case CodeCatalyst will show the Re-authenticate to connect in Developer Tools

* Add Change log for Update connection status of CodeCatalyst in Developer Tools

* Addressing Comments

* Update status of connection between expired and connection

This reverts commit b7c97e6.

Author: laileni-aws

.changes/next-release/bugfix-29d009e9-238d-49aa-a0de-e748d2132f57.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "CodeCatalyst: Update status of connection in developer tools if the user connection is expired."
+}

plugins/toolkit/jetbrains-core/resources/META-INF/services/caws.xml

@@ -20,5 +20,10 @@
             <action class="software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes.actions.SonoLogin" id="aws.caws.devtools.actions.login"/>
             <action class="software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes.actions.CawsLearnMore" id="aws.caws.devtools.actions.learnMore"/>
         </group>
+
+        <group id="aws.caws.devtools.actions.expired">
+            <action class="software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes.actions.SonoLogin" id="aws.caws.devtools.actions.reauthenticate"/>
+            <action class="software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes.actions.CawsLearnMore" id="aws.caws.devtools.actions.learnMoreReAuth"/>
+        </group>
     </actions>
 </idea-plugin>

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/devToolsTab/nodes/CawsRootNode.kt

@@ -10,24 +10,24 @@ import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.project.Project
 import com.intellij.ui.SimpleTextAttributes
 import software.aws.toolkits.jetbrains.ToolkitPlaces
-import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.CodeCatalystConnection
-import software.aws.toolkits.jetbrains.core.credentials.sono.isSono
 import software.aws.toolkits.jetbrains.core.explorer.actions.AnActionTreeNode
 import software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes.actions.OpenWorkspaceInGateway
+import software.aws.toolkits.jetbrains.core.gettingstarted.editor.ActiveConnection
+import software.aws.toolkits.jetbrains.core.gettingstarted.editor.ActiveConnectionType
+import software.aws.toolkits.jetbrains.core.gettingstarted.editor.BearerTokenFeatureSet
+import software.aws.toolkits.jetbrains.core.gettingstarted.editor.checkBearerConnectionValidity
 import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import software.aws.toolkits.resources.message
 
 class CawsRootNode(private val nodeProject: Project) : AbstractTreeNode<String>(nodeProject, CawsServiceNode.NODE_NAME), PinnedConnectionNode {
     override fun getChildren(): Collection<AbstractTreeNode<*>> {
-        val connectionManager = ToolkitConnectionManager.getInstance(project)
-        val conn = connectionManager.activeConnectionForFeature(CodeCatalystConnection.getInstance())
-        val groupId = if (conn != null) {
-            "aws.caws.devtools.actions.loggedin"
-        } else {
-            "aws.caws.devtools.actions.loggedout"
+        val connection = checkBearerConnectionValidity(project, BearerTokenFeatureSet.CODECATALYST)
+        val groupId = when (connection) {
+            is ActiveConnection.NotConnected -> CAWS_SIGNED_OUT_ACTION_GROUP
+            is ActiveConnection.ValidBearer -> CAWS_SIGNED_IN_ACTION_GROUP
+            else -> CAWS_EXPIRED_TOKEN_ACTION_GROUP
         }
-
         val actions = ActionManager.getInstance().getAction(groupId) as ActionGroup
         return actions.getChildren(null).mapNotNull {
             if (it is OpenWorkspaceInGateway && isRunningOnRemoteBackend()) {
@@ -40,19 +40,26 @@ class CawsRootNode(private val nodeProject: Project) : AbstractTreeNode<String>(
 
     override fun update(presentation: PresentationData) {
         presentation.addText(value, SimpleTextAttributes.REGULAR_ATTRIBUTES)
-
-        val connection = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(CodeCatalystConnection.getInstance())
-        if (connection != null) {
-            val msgId = if (connection.isSono()) {
-                "caws.connected.builder_id"
-            } else {
-                "caws.connected.identity_center"
+        val connection = checkBearerConnectionValidity(project, BearerTokenFeatureSet.CODECATALYST)
+        val connectionText = when (connection) {
+            is ActiveConnection.ValidBearer -> {
+                when (connection.connectionType) {
+                    ActiveConnectionType.BUILDER_ID -> message("caws.connected.builder_id")
+                    else -> message("caws.connected.identity_center")
+                }
             }
-            presentation.addText(message(msgId), SimpleTextAttributes.GRAY_ATTRIBUTES)
+            is ActiveConnection.NotConnected -> null
+            else -> message("caws.expired.connection")
         }
+        presentation.addText(connectionText, SimpleTextAttributes.GRAY_ATTRIBUTES)
     }
 
     override fun feature() = CodeCatalystConnection.getInstance()
+    companion object {
+        const val CAWS_SIGNED_IN_ACTION_GROUP = "aws.caws.devtools.actions.loggedin"
+        const val CAWS_SIGNED_OUT_ACTION_GROUP = "aws.caws.devtools.actions.loggedout"
+        const val CAWS_EXPIRED_TOKEN_ACTION_GROUP = "aws.caws.devtools.actions.expired"
+    }
 }
 
 class CawsServiceNode : DevToolsServiceNode {

plugins/toolkit/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -5,8 +5,10 @@ action.apprunner.service.openServiceUri.text=Open Service URL
 action.aws.caws.devtools.actions.clone.text=Clone Repository
 action.aws.caws.devtools.actions.copyCloneUrl.text=Copy Clone URL for Command Line
 action.aws.caws.devtools.actions.learnMore.text=Learn More about CodeCatalyst
+action.aws.caws.devtools.actions.learnMoreReAuth.text=Learn More about CodeCatalyst
 action.aws.caws.devtools.actions.login.text=Start
 action.aws.caws.devtools.actions.openGateway.text=Open Dev Environments in JetBrains Gateway
+action.aws.caws.devtools.actions.reauthenticate.text=Re-authenticate to connect
 action.aws.caws.rebuildAction.text=Rebuild Dev Environment
 action.aws.caws.updateDevfile.text=Update Devfile...
 action.aws.toolkit.caws.logout.text=Sign out
@@ -273,8 +275,8 @@ caws.configure_workspace_not_running=Reconfigure Dev Environment is only availab
 caws.configure_workspace_tab_save_button=Save and restart
 caws.configure_workspace_tab_title=Configure Dev Environment
 caws.configure_workspace_title=Configure Dev Environment: {0} in {1}
-caws.connected.builder_id=\ AWS Builder ID Connected
-caws.connected.identity_center=\ IAM Identity Center Connected
+caws.connected.builder_id=\   AWS Builder ID Connected
+caws.connected.identity_center=\   IAM Identity Center Connected
 caws.connecting.checking=Checking state of Dev Environment
 caws.connecting.in_progress=Connecting to Dev Environment
 caws.connecting.waiting_for_environment=Launching Dev Environment (This may take a few minutes)
@@ -309,6 +311,7 @@ caws.devtoolPanel.title=CodeCatalyst
 caws.download.thin_client=Downloading IDE thin client
 caws.environment.status=Dev Environment is currently: {0}
 caws.environment.view_pricing=Learn more about Dev Environment pricing
+caws.expired.connection=\   Expired Connection
 caws.free.tier.subscription.storage=Other storage options are not currently available for your space. These require upgrading the billing tier.
 caws.getstarted.panel.description=Spend more time coding and less <br>time managing development <br>environments.
 caws.getstarted.panel.link_text=Learn more about CodeCatalyst Spaces