From 2f62b8a1e708fea7a7923ea46834762205f97e76 Mon Sep 17 00:00:00 2001 From: laileni Date: Thu, 23 Oct 2025 15:21:14 -0700 Subject: [PATCH] refactor: removing the auth utils code of /agents --- .../amazonq/toolwindow/AmazonQPanel.kt | 6 ------ .../services/amazonq/webview/Browser.kt | 21 +++---------------- .../amazonq/webview/BrowserConnector.kt | 12 +++-------- .../amazonqCodeScan/CodeScanChatApp.kt | 6 ------ .../messages/CodeScanMessage.kt | 3 --- .../amazonqCodeTest/auth/CodeTestAuthUtils.kt | 11 ---------- .../services/amazonqDoc/auth/DocAuthUtils.kt | 16 -------------- .../auth/FeatureDevAuthUtils.kt | 16 -------------- .../cwc/controller/ReferenceLogController.kt | 1 - .../codemodernizer/CodeTransformChatApp.kt | 6 ------ .../messages/CodeTransformMessage.kt | 3 --- 11 files changed, 6 insertions(+), 95 deletions(-) delete mode 100644 plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/auth/CodeTestAuthUtils.kt delete mode 100644 plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/auth/DocAuthUtils.kt delete mode 100644 plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/auth/FeatureDevAuthUtils.kt diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt index dc2b3a55baf..b98c4e275b4 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt @@ -41,9 +41,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.webview.BrowserConnector import software.aws.toolkits.jetbrains.services.amazonq.webview.FqnWebviewAdapter import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.EditorThemeAdapter import software.aws.toolkits.jetbrains.services.amazonqCodeScan.auth.isCodeScanAvailable -import software.aws.toolkits.jetbrains.services.amazonqCodeTest.auth.isCodeTestAvailable -import software.aws.toolkits.jetbrains.services.amazonqDoc.auth.isDocAvailable -import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend import software.aws.toolkits.resources.message @@ -265,10 +262,7 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di private fun connectUi(browser: Browser) { browser.init( isCodeTransformAvailable = isCodeTransformAvailable(project), - isFeatureDevAvailable = isFeatureDevAvailable(project), isCodeScanAvailable = isCodeScanAvailable(project), - isCodeTestAvailable = isCodeTestAvailable(project), - isDocAvailable = isDocAvailable(project), highlightCommand = highlightCommand(), activeProfile = QRegionProfileManager.getInstance().takeIf { it.shouldDisplayProfileInfo(project) }?.activeProfile(project) ) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt index e6e96874632..904db25ee7f 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt @@ -44,19 +44,13 @@ class Browser(parent: Disposable, private val mynahAsset: Path, val project: Pro fun init( isCodeTransformAvailable: Boolean, - isFeatureDevAvailable: Boolean, - isDocAvailable: Boolean, isCodeScanAvailable: Boolean, - isCodeTestAvailable: Boolean, highlightCommand: HighlightCommand?, activeProfile: QRegionProfile?, ) { loadWebView( isCodeTransformAvailable, - isFeatureDevAvailable, - isDocAvailable, isCodeScanAvailable, - isCodeTestAvailable, highlightCommand, activeProfile ) @@ -80,10 +74,7 @@ class Browser(parent: Disposable, private val mynahAsset: Path, val project: Pro // Load the chat web app into the jcefBrowser private fun loadWebView( isCodeTransformAvailable: Boolean, - isFeatureDevAvailable: Boolean, - isDocAvailable: Boolean, isCodeScanAvailable: Boolean, - isCodeTestAvailable: Boolean, highlightCommand: HighlightCommand?, activeProfile: QRegionProfile?, ) { @@ -99,10 +90,7 @@ class Browser(parent: Disposable, private val mynahAsset: Path, val project: Pro "webview/chat.html", getWebviewHTML( isCodeTransformAvailable, - isFeatureDevAvailable, - isDocAvailable, isCodeScanAvailable, - isCodeTestAvailable, highlightCommand, activeProfile, ) @@ -116,10 +104,7 @@ class Browser(parent: Disposable, private val mynahAsset: Path, val project: Pro */ private fun getWebviewHTML( isCodeTransformAvailable: Boolean, - isFeatureDevAvailable: Boolean, - isDocAvailable: Boolean, isCodeScanAvailable: Boolean, - isCodeTestAvailable: Boolean, highlightCommand: HighlightCommand?, activeProfile: QRegionProfile?, ): String { @@ -138,11 +123,11 @@ class Browser(parent: Disposable, private val mynahAsset: Path, val project: Pro const hybridChatConnector = connectorAdapter.initiateAdapter( ${MeetQSettings.getInstance().reinvent2024OnboardingCount < MAX_ONBOARDING_PAGE_COUNT}, ${MeetQSettings.getInstance().disclaimerAcknowledged}, - $isFeatureDevAvailable, + true, $isCodeTransformAvailable, - $isDocAvailable, + true, $isCodeScanAvailable, - $isCodeTestAvailable, + true, { postMessage: message => { $postMessageToJavaJsCode } }, diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt index a8a29033859..54ccf726f3a 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt @@ -109,9 +109,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.util.tabType import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.AmazonQTheme import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.ThemeBrowserAdapter import software.aws.toolkits.jetbrains.services.amazonqCodeScan.auth.isCodeScanAvailable -import software.aws.toolkits.jetbrains.services.amazonqCodeTest.auth.isCodeTestAvailable -import software.aws.toolkits.jetbrains.services.amazonqDoc.auth.isDocAvailable -import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanIssue import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanManager @@ -694,11 +691,8 @@ class BrowserConnector( } private suspend fun updateQuickActionsInBrowser(browser: Browser) { - val isFeatureDevAvailable = isFeatureDevAvailable(project) val isCodeTransformAvailable = isCodeTransformAvailable(project) - val isDocAvailable = isDocAvailable(project) val isCodeScanAvailable = isCodeScanAvailable(project) - val isCodeTestAvailable = isCodeTestAvailable(project) val serverCapabilities = AmazonQLspService.getInstance(project).instanceFlow.first().initializeResult.await().awsServerCapabilities @@ -709,11 +703,11 @@ class BrowserConnector( const tempConnector = connectorAdapter.initiateAdapter( false, true, // the two values are not used here, needed for constructor - $isFeatureDevAvailable, + true, $isCodeTransformAvailable, - $isDocAvailable, + true, $isCodeScanAvailable, - $isCodeTestAvailable, + true, { postMessage: () => {} }, ); diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/CodeScanChatApp.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/CodeScanChatApp.kt index ce77b84f89a..fab490e4c5c 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/CodeScanChatApp.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/CodeScanChatApp.kt @@ -32,9 +32,6 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeScan.messages.Authent import software.aws.toolkits.jetbrains.services.amazonqCodeScan.messages.CODE_SCAN_TAB_NAME import software.aws.toolkits.jetbrains.services.amazonqCodeScan.messages.IncomingCodeScanMessage import software.aws.toolkits.jetbrains.services.amazonqCodeScan.storage.ChatSessionStorage -import software.aws.toolkits.jetbrains.services.amazonqCodeTest.auth.isCodeTestAvailable -import software.aws.toolkits.jetbrains.services.amazonqDoc.auth.isDocAvailable -import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable import java.util.concurrent.atomic.AtomicBoolean @@ -90,11 +87,8 @@ class CodeScanChatApp(private val scope: CoroutineScope) : AmazonQApp { // Notify tabs about restoring authentication context.messagesFromAppToUi.publish( AuthenticationUpdateMessage( - featureDevEnabled = isFeatureDevAvailable(context.project), codeTransformEnabled = isCodeTransformAvailable(context.project), codeScanEnabled = isCodeScanAvailable(context.project), - codeTestEnabled = isCodeTestAvailable(context.project), - docEnabled = isDocAvailable(context.project), authenticatingTabIDs = chatSessionStorage.getAuthenticatingSessions().map { it.tabId } ) ) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/messages/CodeScanMessage.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/messages/CodeScanMessage.kt index 062e974336a..51fffcdb53d 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/messages/CodeScanMessage.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/messages/CodeScanMessage.kt @@ -129,11 +129,8 @@ data class ChatInputEnabledMessage( data class AuthenticationUpdateMessage( val authenticatingTabIDs: List, - val featureDevEnabled: Boolean, val codeTransformEnabled: Boolean, val codeScanEnabled: Boolean, - val codeTestEnabled: Boolean, - val docEnabled: Boolean, val message: String? = null, ) : CodeScanUiMessage( null, diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/auth/CodeTestAuthUtils.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/auth/CodeTestAuthUtils.kt deleted file mode 100644 index bd8161d53ac..00000000000 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/auth/CodeTestAuthUtils.kt +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -package software.aws.toolkits.jetbrains.services.amazonqCodeTest.auth - -import com.intellij.openapi.project.Project -import software.aws.toolkits.jetbrains.core.gettingstarted.editor.ActiveConnection -import software.aws.toolkits.jetbrains.core.gettingstarted.editor.BearerTokenFeatureSet -import software.aws.toolkits.jetbrains.core.gettingstarted.editor.checkBearerConnectionValidity - -fun isCodeTestAvailable(project: Project): Boolean = checkBearerConnectionValidity(project, BearerTokenFeatureSet.Q) is ActiveConnection.ValidBearer diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/auth/DocAuthUtils.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/auth/DocAuthUtils.kt deleted file mode 100644 index 3390a8c5bb8..00000000000 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/auth/DocAuthUtils.kt +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -package software.aws.toolkits.jetbrains.services.amazonqDoc.auth - -import com.intellij.openapi.project.Project -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 - -fun isDocAvailable(project: Project): Boolean { - val connection = checkBearerConnectionValidity(project, BearerTokenFeatureSet.Q) - return (connection.connectionType == ActiveConnectionType.IAM_IDC || connection.connectionType == ActiveConnectionType.BUILDER_ID) && - connection is ActiveConnection.ValidBearer -} diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/auth/FeatureDevAuthUtils.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/auth/FeatureDevAuthUtils.kt deleted file mode 100644 index 196f9e2c315..00000000000 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/auth/FeatureDevAuthUtils.kt +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -package software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth - -import com.intellij.openapi.project.Project -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 - -fun isFeatureDevAvailable(project: Project): Boolean { - val connection = checkBearerConnectionValidity(project, BearerTokenFeatureSet.Q) - return (connection.connectionType == ActiveConnectionType.IAM_IDC || connection.connectionType == ActiveConnectionType.BUILDER_ID) && - connection is ActiveConnection.ValidBearer -} diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ReferenceLogController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ReferenceLogController.kt index 70842bd457d..89d7621e2e0 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ReferenceLogController.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ReferenceLogController.kt @@ -14,7 +14,6 @@ import software.aws.toolkits.jetbrains.services.cwc.messages.CodeReference object ReferenceLogController { fun addReferenceLog(originalCode: String, codeReferences: List?, editor: Editor, project: Project, inlineChatStartPosition: CaretPosition?) { - // TODO flare: hook /dev references with flare correctly, this is only a compile error fix which is not tested codeReferences?.let { references -> val cwReferences = references.map { reference -> InlineCompletionReference( diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt index 0d647e0b7b7..3e34ffa1e10 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt @@ -19,9 +19,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileSelectedListener import software.aws.toolkits.jetbrains.services.amazonqCodeScan.auth.isCodeScanAvailable -import software.aws.toolkits.jetbrains.services.amazonqCodeTest.auth.isCodeTestAvailable -import software.aws.toolkits.jetbrains.services.amazonqDoc.auth.isDocAvailable -import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformActionMessage import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformMessageListener import software.aws.toolkits.jetbrains.services.codemodernizer.controller.CodeTransformChatController @@ -113,11 +110,8 @@ class CodeTransformChatApp : AmazonQApp { // Notify tabs about restoring authentication context.messagesFromAppToUi.publish( AuthenticationUpdateMessage( - featureDevEnabled = isFeatureDevAvailable(context.project), codeTransformEnabled = isCodeTransformAvailable(context.project), codeScanEnabled = isCodeScanAvailable(context.project), - codeTestEnabled = isCodeTestAvailable(context.project), - docEnabled = isDocAvailable(context.project), authenticatingTabIDs = chatSessionStorage.getAuthenticatingSessions().map { it.tabId }, ) ) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/messages/CodeTransformMessage.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/messages/CodeTransformMessage.kt index 66ad7d185d6..8a05c6fff8f 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/messages/CodeTransformMessage.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/messages/CodeTransformMessage.kt @@ -190,12 +190,9 @@ data class AuthenticationNeededExceptionMessage( ) data class AuthenticationUpdateMessage( val authenticatingTabIDs: List, - val featureDevEnabled: Boolean, val codeTransformEnabled: Boolean, val codeScanEnabled: Boolean, val message: String? = null, - val codeTestEnabled: Boolean, - val docEnabled: Boolean, ) : CodeTransformUiMessage( null, type = "authenticationUpdateMessage",