Skip to content

refactor(amazonq): removing the auth utils code of /agents #6080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2025
Merged

refactor(amazonq): removing the auth utils code of /agents #6080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions ...community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
)
Expand Down
21 changes: 3 additions & 18 deletions ...tbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand All @@ -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?,
) {
Expand All @@ -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,
)
Expand All @@ -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 {
Expand All @@ -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 }
},
Expand Down
12 changes: 3 additions & 9 deletions ...ommunity/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -709,11 +703,11 @@ class BrowserConnector(
const tempConnector = connectorAdapter.initiateAdapter(
false,
true, // the two values are not used here, needed for constructor
$isFeatureDevAvailable,
true,
Copy link
Contributor Author

@laileni-aws laileni-aws Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will be removing the dependency code for this in followup PR. I need to make changes to https://github.com/aws/aws-toolkit-jetbrains/tree/main/plugins/amazonq/mynah-ui

$isCodeTransformAvailable,
$isDocAvailable,
true,
$isCodeScanAvailable,
$isCodeTestAvailable,
true,
{ postMessage: () => {} },
);

Expand Down
6 changes: 0 additions & 6 deletions ...community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/CodeScanChatApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 }
)
)
Expand Down
3 changes: 0 additions & 3 deletions .../src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/messages/CodeScanMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,8 @@ data class ChatInputEnabledMessage(

data class AuthenticationUpdateMessage(
val authenticatingTabIDs: List<String>,
val featureDevEnabled: Boolean,
val codeTransformEnabled: Boolean,
val codeScanEnabled: Boolean,
val codeTestEnabled: Boolean,
val docEnabled: Boolean,
val message: String? = null,
) : CodeScanUiMessage(
null,
Expand Down
11 changes: 0 additions & 11 deletions ...ty/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/auth/CodeTestAuthUtils.kt
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ...ns-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/auth/DocAuthUtils.kt
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ...rc/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/auth/FeatureDevAuthUtils.kt
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...ity/src/software/aws/toolkits/jetbrains/services/cwc/controller/ReferenceLogController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import software.aws.toolkits.jetbrains.services.cwc.messages.CodeReference

object ReferenceLogController {
fun addReferenceLog(originalCode: String, codeReferences: List<CodeReference>?, 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(
Expand Down
6 changes: 0 additions & 6 deletions ...unity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 },
)
)
Expand Down
3 changes: 0 additions & 3 deletions .../software/aws/toolkits/jetbrains/services/codemodernizer/messages/CodeTransformMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,9 @@ data class AuthenticationNeededExceptionMessage(
)
data class AuthenticationUpdateMessage(
val authenticatingTabIDs: List<String>,
val featureDevEnabled: Boolean,
val codeTransformEnabled: Boolean,
val codeScanEnabled: Boolean,
val message: String? = null,
val codeTestEnabled: Boolean,
val docEnabled: Boolean,
) : CodeTransformUiMessage(
null,
type = "authenticationUpdateMessage",
Expand Down
Loading