Skip to content

fix(amazonq lsp): add getConnectionMetadata handler before auth initialiation #6880

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
Apr 1, 2025
Merged

fix(amazonq lsp): add getConnectionMetadata handler before auth initialiation #6880

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
16 changes: 8 additions & 8 deletions packages/amazonq/src/lsp/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,7 @@ export async function startLanguageServer(
const auth = new AmazonQLspAuth(client)

return client.onReady().then(async () => {
await auth.init()
const inlineManager = new InlineCompletionManager(client)
inlineManager.registerInlineCompletion()
if (Experiments.instance.get('amazonqChatLSP', false)) {
activate(client, encryptionKey, resourcePaths.mynahUI)
}

// Request handler for when the server wants to know about the clients auth connnection
// Request handler for when the server wants to know about the clients auth connnection. Must be registered before the initial auth init call
client.onRequest<ConnectionMetadata, Error>(notificationTypes.getConnectionMetadata.method, () => {
return {
sso: {
Expand All @@ -109,6 +102,13 @@ export async function startLanguageServer(
}
})

await auth.init()
const inlineManager = new InlineCompletionManager(client)
inlineManager.registerInlineCompletion()
if (Experiments.instance.get('amazonqChatLSP', false)) {
activate(client, encryptionKey, resourcePaths.mynahUI)
}

// Temporary code for pen test. Will be removed when we switch to the real flare auth
const authInterval = setInterval(async () => {
try {
Expand Down
Loading