Remove footgun from attempting to use application-level ToolkitConnectionManager outside of Gateway (#4851)

Author: rli

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

@@ -99,7 +99,7 @@ interface ToolkitConnectionManager : Disposable {
     override fun dispose() {}
 
     companion object {
-        fun getInstance(project: Project?) = project?.let { it.service<ToolkitConnectionManager>() } ?: service()
+        fun getInstance(project: Project) = project.service<ToolkitConnectionManager>()
     }
 }
 
@@ -140,7 +140,7 @@ fun loginSso(
             onSuccess()
         }
 
-        ToolkitConnectionManager.getInstance(project).switchConnection(connection)
+        project?.let { ToolkitConnectionManager.getInstance(it).switchConnection(connection) }
         return connection
     }
 

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialog.kt

@@ -117,7 +117,7 @@ interface AuthenticationDialog {
 }
 
 class SetupAuthenticationDialog(
-    private val project: Project?,
+    private val project: Project,
     private val scopes: List<String> = emptyList(),
     private val state: SetupAuthenticationDialogState = SetupAuthenticationDialogState(),
     private val tabSettings: Map<SetupAuthenticationTabs, AuthenticationTabSettings> = emptyMap(),
@@ -299,8 +299,6 @@ class SetupAuthenticationDialog(
 
                 val tokenProvider = connection.getConnectionSettings().tokenProvider
 
-                if (project == null) error("Not allowed")
-
                 val rolePopup = IdcRolePopup(
                     project,
                     state.idcTabState.region.id,

plugins/toolkit/jetbrains-core/resources/META-INF/inactive/plugin-gateway.xml

@@ -14,4 +14,9 @@
     <incompatible-with>com.intellij.modules.python</incompatible-with>
     <incompatible-with>com.intellij.modules.ultimate</incompatible-with>
     <incompatible-with>com.intellij.java</incompatible-with>
+
+    <extensions defaultExtensionNs="com.intellij">
+        <applicationService serviceInterface="software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager"
+                            serviceImplementation="software.aws.toolkits.jetbrains.core.credentials.DefaultToolkitConnectionManager"/>
+    </extensions>
 </idea-plugin>

plugins/toolkit/jetbrains-core/resources/META-INF/plugin.xml

@@ -190,10 +190,6 @@
         <moduleService serviceImplementation="software.aws.toolkits.jetbrains.settings.SyncSettings"/>
         <applicationService serviceImplementation="software.aws.toolkits.jetbrains.settings.UpdateLambdaState"/>
 
-        <!-- application-level ToolkitConnectionManager is gateway-only -->
-        <applicationService serviceInterface="software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager"
-                            serviceImplementation="software.aws.toolkits.jetbrains.core.credentials.DefaultToolkitConnectionManager"/>
-
         <projectService serviceImplementation="software.aws.toolkits.jetbrains.services.dynamic.CreateResourceFileStatusHandler"/>
 
         <statusBarWidgetFactory id="AwsSettingsPanel" implementation="software.aws.toolkits.jetbrains.core.credentials.AwsSettingsPanelInstaller"/>

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenuBuilder.kt

@@ -246,7 +246,7 @@ class ConnectionSettingsMenuBuilder private constructor() {
                     override fun actionPerformed(e: AnActionEvent) {
                         reauthConnectionIfNeeded(e.project, value, isReAuth = true)
 
-                        ToolkitConnectionManager.getInstance(e.project).switchConnection(value)
+                        e.project?.let { ToolkitConnectionManager.getInstance(it).switchConnection(value) }
                     }
                 },
 

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/sono/CodeCatalystCredentialManager.kt

@@ -36,9 +36,11 @@ class CodeCatalystCredentialManager {
     }
 
     fun connection() = (
-        ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(CodeCatalystConnection.getInstance())
-            as? AwsBearerTokenConnection
-        )
+        project?.let {
+            ToolkitConnectionManager.getInstance(project)
+            // app-version only used for gateway
+        } ?: service<ToolkitConnectionManager>()
+        ).activeConnectionForFeature(CodeCatalystConnection.getInstance()) as? AwsBearerTokenConnection
 
     internal fun provider(conn: AwsBearerTokenConnection) = conn.getConnectionSettings().tokenProvider.delegate as BearerTokenProvider
 

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/GatewaySetupAuthenticationDialog.kt

@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.core.gettingstarted
 
+import com.intellij.openapi.components.service
 import com.intellij.openapi.observable.properties.PropertyGraph
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
@@ -13,6 +14,7 @@ import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.components.BorderLayoutPanel
 import org.jetbrains.annotations.VisibleForTesting
 import software.aws.toolkits.core.region.AwsRegion
+import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.loginSso
 import software.aws.toolkits.jetbrains.core.credentials.sono.IDENTITY_CENTER_ROLE_ACCESS_SCOPE
 import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_REGION
@@ -164,7 +166,7 @@ class GatewaySetupAuthenticationDialog(
             scopes
         }
 
-        when (selectedTab()) {
+        val connection = when (selectedTab()) {
             GatewaySetupAuthenticationTabs.IDENTITY_CENTER -> {
                 authType = CredentialSourceId.IamIdentityCenter
                 val startUrl = state.idcTabState.startUrl
@@ -178,6 +180,8 @@ class GatewaySetupAuthenticationDialog(
             }
         }
 
+        service<ToolkitConnectionManager>().switchConnection(connection)
+
         close(OK_EXIT_CODE)
     }
 

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/ToolkitGettingStartedAuthUtils.kt

@@ -51,6 +51,8 @@ fun requestCredentialsForCodeCatalyst(
         }
 
         else -> {
+            requireNotNull(project) { "project must not be null when requesting credentials outside of gateway" }
+
             SetupAuthenticationDialog(
                 project,
                 state = SetupAuthenticationDialogState().also {

plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectionProvider.kt

@@ -7,6 +7,7 @@ import com.intellij.icons.AllIcons
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.runInEdt
+import com.intellij.openapi.components.service
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.rd.createNestedDisposable
@@ -107,7 +108,7 @@ class CawsConnectionProvider : GatewayConnectionProvider {
             return null
         }
 
-        val currentConnection = ToolkitConnectionManager.getInstance(null).activeConnectionForFeature(CodeCatalystConnection.getInstance())
+        val currentConnection = service<ToolkitConnectionManager>().activeConnectionForFeature(CodeCatalystConnection.getInstance())
             as AwsBearerTokenConnection?
 
         val ssoSettings = connectionParams.ssoSettings ?: SsoSettings(SONO_URL, SONO_REGION)

plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectorViewPanels.kt

@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.gateway
 
 import com.intellij.ide.browsers.BrowserLauncher
+import com.intellij.openapi.components.service
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
 import com.intellij.openapi.observable.properties.PropertyGraph
 import com.intellij.openapi.rd.createNestedDisposable
@@ -191,9 +192,8 @@ fun cawsWizard(lifetime: Lifetime, settings: CawsSettings = CawsSettings()) = Mu
                     return@startWithModalProgressAsync
                 }
 
-                val currentConnection = ToolkitConnectionManager.getInstance(
-                    null
-                ).activeConnectionForFeature(CodeCatalystConnection.getInstance()) as AwsBearerTokenConnection?
+                val currentConnection = service<ToolkitConnectionManager>()
+                    .activeConnectionForFeature(CodeCatalystConnection.getInstance()) as AwsBearerTokenConnection?
                     ?: error("Connection cannot be null")
 
                 val parameters = mapOf(