Skip to content

fix(amazonq): send sso startUrl on token update #7148

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 2 commits into from
Apr 23, 2025
Merged

fix(amazonq): send sso startUrl on token update #7148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de41e5f
fix(amazonq): send sso startUrl on token update
jpinkney-aws Apr 23, 2025
0c9dc99
remove connection metadata
jpinkney-aws Apr 23, 2025
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
11 changes: 9 additions & 2 deletions packages/amazonq/src/lsp/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
*/

import {
bearerCredentialsUpdateRequestType,
ConnectionMetadata,
NotificationType,
RequestType,
ResponseMessage,
UpdateCredentialsParams,
} from '@aws/language-server-runtimes/protocol'
import * as jose from 'jose'
import * as crypto from 'crypto'
Expand Down Expand Up @@ -81,7 +83,7 @@ export class AmazonQLspAuth {
token,
})

await this.client.sendRequest(notificationTypes.updateBearerToken.method, request)
await this.client.sendRequest(bearerCredentialsUpdateRequestType.method, request)

this.client.info(`UpdateBearerToken: ${JSON.stringify(request)}`)
}
Expand All @@ -96,7 +98,7 @@ export class AmazonQLspAuth {
return interval
}

private async createUpdateCredentialsRequest(data: any) {
private async createUpdateCredentialsRequest(data: any): Promise<UpdateCredentialsParams> {
const payload = new TextEncoder().encode(JSON.stringify({ data }))

const jwt = await new jose.CompactEncrypt(payload)
Expand All @@ -105,6 +107,11 @@ export class AmazonQLspAuth {

return {
data: jwt,
metadata: {
sso: {
startUrl: AuthUtil.instance.auth.startUrl,
},
},
encrypted: true,
}
}
Expand Down
9 changes: 0 additions & 9 deletions packages/amazonq/src/lsp/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { LanguageClient, LanguageClientOptions, RequestType } from 'vscode-langu
import { InlineCompletionManager } from '../app/inline/completion'
import { AmazonQLspAuth, encryptionKey, notificationTypes } from './auth'
import {
ConnectionMetadata,
CreateFilesParams,
DeleteFilesParams,
DidChangeWorkspaceFoldersParams,
Expand Down Expand Up @@ -164,14 +163,6 @@ export async function startLanguageServer(
const auth = new AmazonQLspAuth(client)

return client.onReady().then(async () => {
// 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: {
startUrl: AuthUtil.instance.auth.startUrl,
},
}
})
await auth.refreshConnection()

if (Experiments.instance.get('amazonqLSPInline', false)) {
Expand Down