@@ -8,8 +8,6 @@ import com.intellij.openapi.components.service
88import com.intellij.openapi.extensions.ExtensionPointName
99import com.intellij.openapi.progress.ProcessCanceledException
1010import com.intellij.openapi.project.Project
11- import kotlinx.coroutines.delay
12- import kotlinx.coroutines.runBlocking
1311import migration.software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
1412import software.amazon.awssdk.services.ssooidc.model.SsoOidcException
1513import software.aws.toolkits.core.ClientConnectionSettings
@@ -30,14 +28,13 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.InteractiveBe
3028import software.aws.toolkits.jetbrains.utils.notifyInfo
3129import software.aws.toolkits.jetbrains.utils.runUnderProgressIfNeeded
3230import software.aws.toolkits.resources.AwsCoreBundle
33- import software.aws.toolkits.telemetry.AuthTelemetry
3431import software.aws.toolkits.resources.AwsCoreBundle.message
32+ import software.aws.toolkits.telemetry.AuthTelemetry
3533import software.aws.toolkits.telemetry.CredentialSourceId
3634import software.aws.toolkits.telemetry.CredentialType
3735import software.aws.toolkits.telemetry.Result
3836import java.net.UnknownHostException
3937import java.time.Instant
40- import kotlin.math.min
4138
4239sealed interface ToolkitConnection {
4340 val id: String
@@ -332,21 +329,16 @@ fun maybeReauthProviderIfNeeded(
332329 hasNotifiedNetworkErrorOnce = false
333330 return @runUnderProgressIfNeeded false
334331 }
335- } catch (e: SsoOidcException ) {
336- AuthTelemetry .sourceOfRefresh(authRefreshSource = reauthSource.toString())
337- getLogger<ToolkitAuthManager >().warn(e) { " Redriving bearer token login flow since token could not be refreshed" }
338- onReauthRequired(e)
339- return true
340332 } catch (e: Exception ) {
341333 when {
342334 e is SsoOidcException -> {
335+ AuthTelemetry .sourceOfRefresh(authRefreshSource = reauthSource.toString())
343336 getLogger<ToolkitAuthManager >().warn(e) { " Redriving bearer token login flow since token could not be refreshed" }
344337 onReauthRequired(e)
345338 return true
346339 }
347-
348340 e is UnknownHostException || e.message?.contains(" Unable to execute HTTP request" ) == true -> {
349- getLogger<ToolkitAuthManager >().error( " Failed to refresh token" , e)
341+ getLogger<ToolkitAuthManager >().warn(e) { " Failed to refresh token" }
350342 if (! hasNotifiedNetworkErrorOnce) {
351343 hasNotifiedNetworkErrorOnce = true
352344 notifyInfo(
@@ -357,7 +349,7 @@ fun maybeReauthProviderIfNeeded(
357349 }
358350 return false
359351 }
360- else -> {return false }
352+ else -> { return false }
361353 }
362354 }
363355 }
0 commit comments