rebase

Author: samgst-amazon

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

@@ -8,6 +8,8 @@ import com.intellij.openapi.components.service
 import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.project.Project
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
 import migration.software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
 import software.amazon.awssdk.services.ssooidc.model.SsoOidcException
 import software.aws.toolkits.core.ClientConnectionSettings
@@ -25,13 +27,17 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenAu
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProvider
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProviderListener
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.InteractiveBearerTokenProvider
+import software.aws.toolkits.jetbrains.utils.notifyInfo
 import software.aws.toolkits.jetbrains.utils.runUnderProgressIfNeeded
 import software.aws.toolkits.resources.AwsCoreBundle
 import software.aws.toolkits.telemetry.AuthTelemetry
+import software.aws.toolkits.resources.AwsCoreBundle.message
 import software.aws.toolkits.telemetry.CredentialSourceId
 import software.aws.toolkits.telemetry.CredentialType
 import software.aws.toolkits.telemetry.Result
+import java.net.UnknownHostException
 import java.time.Instant
+import kotlin.math.min
 
 sealed interface ToolkitConnection {
     val id: String
@@ -310,7 +316,7 @@ fun maybeReauthProviderIfNeeded(
     onReauthRequired: (SsoOidcException?) -> Any,
 ): Boolean {
     val state = tokenProvider.state()
-    when (state) {
+    return when (state) {
         BearerTokenAuthState.NOT_AUTHENTICATED -> {
             getLogger<ToolkitAuthManager>().info { "Token provider NOT_AUTHENTICATED, requesting login" }
             onReauthRequired(null)
@@ -323,13 +329,36 @@ fun maybeReauthProviderIfNeeded(
                 return runUnderProgressIfNeeded(project, AwsCoreBundle.message("credentials.refreshing"), true) {
                     tokenProvider.resolveToken()
                     BearerTokenProviderListener.notifyCredUpdate(tokenProvider.id)
+                    hasNotifiedNetworkErrorOnce = false
                     return@runUnderProgressIfNeeded false
                 }
             } catch (e: SsoOidcException) {
                 AuthTelemetry.sourceOfRefresh(authRefreshSource = reauthSource.toString())
                 getLogger<ToolkitAuthManager>().warn(e) { "Redriving bearer token login flow since token could not be refreshed" }
                 onReauthRequired(e)
                 return true
+            } catch (e: Exception) {
+                when {
+                    e is SsoOidcException -> {
+                        getLogger<ToolkitAuthManager>().warn(e) { "Redriving bearer token login flow since token could not be refreshed" }
+                        onReauthRequired(e)
+                        return true
+                    }
+
+                    e is UnknownHostException || e.message?.contains("Unable to execute HTTP request") == true -> {
+                        getLogger<ToolkitAuthManager>().error("Failed to refresh token", e)
+                        if (!hasNotifiedNetworkErrorOnce) {
+                            hasNotifiedNetworkErrorOnce = true
+                            notifyInfo(
+                                message("general.auth.network.error"),
+                                message("general.auth.network.error.message"),
+                                project
+                            )
+                        }
+                        return false
+                    }
+                    else -> {return false}
+                }
             }
         }
 
@@ -410,6 +439,8 @@ private fun recordAddConnection(
     }
 }
 
+private var hasNotifiedNetworkErrorOnce = false
+
 data class ConnectionMetadata(
     val sourceId: String? = null,
 )

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

@@ -1240,6 +1240,8 @@ gateway.connection.workflow.step_skipped=Step skipped
 gateway.connection.workflow.step_successful=\nStep completed successfully\n
 general.add.another=Add another
 general.auth.reauthenticate=Reauthenticate
+general.auth.network.error=Network Error
+general.auth.network.error.message=Failed to update connection due to networking issues
 general.cancel=Cancel
 general.close_button=Close
 general.configure_button=Configure