Always show device code prompt when performing device code grant through a legacy SSO configuration (aws#4522)

* Always show device code prompt when performing device code grant through a legacy SSO configuration

Resolves regression from prior behavior

* tst

---------

Co-authored-by: manodnyab <[email protected]>

Author: rli

.changes/next-release/bugfix-d0098f52-0f36-4a5d-92d9-aa957e952c11.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Always show device code prompt when performing device code grant through a legacy SSO configuration"
+}

plugins/core/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/core/credentials/sso/SsoLoginCallbackProvider.kt

@@ -6,5 +6,5 @@ package migration.software.aws.toolkits.jetbrains.core.credentials.sso
 import software.aws.toolkits.jetbrains.core.credentials.sso.SsoLoginCallback
 
 interface SsoLoginCallbackProvider {
-    fun getProvider(ssoUrl: String): SsoLoginCallback
+    fun getProvider(isAlwaysShowDeviceCode: Boolean, ssoUrl: String): SsoLoginCallback
 }

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

@@ -33,7 +33,8 @@ class ProfileLegacySsoProvider(ssoCache: SsoCache, profile: Profile) : AwsCreden
             profile.requiredProperty(ProfileProperty.SSO_START_URL),
             ssoRegion,
             ssoCache,
-            ssoOidcClient
+            ssoOidcClient,
+            isAlwaysShowDeviceCode = true,
         )
 
         credentialsProvider = SsoCredentialProvider(

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

@@ -48,6 +48,7 @@ class SsoAccessTokenProvider(
     private val ssoRegion: String,
     private val cache: SsoCache,
     private val client: SsoOidcClient,
+    private val isAlwaysShowDeviceCode: Boolean = false,
     private val scopes: List<String> = emptyList(),
     private val clock: Clock = Clock.systemUTC()
 ) : SdkTokenProvider {
@@ -207,7 +208,7 @@ class SsoAccessTokenProvider(
 
     @Deprecated("Device authorization grant flow is deprecated")
     private fun pollForDAGToken(): AccessToken {
-        val onPendingToken = service<SsoLoginCallbackProvider>().getProvider(ssoUrl)
+        val onPendingToken = service<SsoLoginCallbackProvider>().getProvider(isAlwaysShowDeviceCode, ssoUrl)
         val progressIndicator = progressIndicator()
         val registration = registerDAGClient()
         val authorization = authorizeDAGClient(registration)

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

@@ -18,16 +18,21 @@ import software.aws.toolkits.telemetry.Result
 typealias SsoLoginCallbackProvider = migration.software.aws.toolkits.jetbrains.core.credentials.sso.SsoLoginCallbackProvider
 
 class DefaultSsoLoginCallbackProvider : SsoLoginCallbackProvider {
-    override fun getProvider(ssoUrl: String): SsoLoginCallback = when {
-        JBCefApp.isSupported() -> {
-            if (ssoUrl == SONO_URL) {
-                BearerTokenPromptWithBrowserSupport
-            } else {
-                SsoPromptWithBrowserSupport
-            }
+    override fun getProvider(isAlwaysShowDeviceCode: Boolean, ssoUrl: String): SsoLoginCallback {
+        val deviceCodeProvider = if (ssoUrl == SONO_URL) {
+            DefaultBearerTokenPrompt
+        } else {
+            DefaultSsoPrompt
+        }
+
+        if (isAlwaysShowDeviceCode) {
+            return deviceCodeProvider
+        }
+
+        return when {
+            JBCefApp.isSupported() -> SsoPromptWithBrowserSupport
+            else -> deviceCodeProvider
         }
-        ssoUrl == SONO_URL -> DefaultBearerTokenPrompt
-        else -> DefaultSsoPrompt
     }
 }
 
@@ -96,11 +101,3 @@ object DefaultBearerTokenPrompt : BearerTokenPrompt {
         }
     }
 }
-
-object BearerTokenPromptWithBrowserSupport : BearerTokenPrompt {
-    override fun tokenPending(authorization: Authorization) {
-        computeOnEdt {
-            BrowserUtil.browse(authorization.verificationUriComplete)
-        }
-    }
-}

plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/core/credentials/sso/MockSsoLoginCallbackProvider.kt

@@ -28,7 +28,7 @@ internal class MockSsoLoginCallbackProvider : SsoLoginCallbackProvider {
         override fun tokenRetrievalFailure(e: Exception) {}
     }
 
-    override fun getProvider(ssoUrl: String): SsoLoginCallback =
+    override fun getProvider(isAlwaysShowDeviceCode: Boolean, ssoUrl: String): SsoLoginCallback =
         provider ?: ErrorSsoLoginCallback
 
     companion object {