switch to oidc client name

Author: jpinkney-aws

packages/amazonq/src/lsp/client.ts

@@ -11,7 +11,7 @@ import { registerInlineCompletion } from '../app/inline/completion'
 import { AmazonQLspAuth, encryptionKey, notificationTypes } from './auth'
 import { AuthUtil } from 'aws-core-vscode/codewhisperer'
 import { ConnectionMetadata } from '@aws/language-server-runtimes/protocol'
-import { ResourcePaths, Settings, clientName, createServerOptions, globals } from 'aws-core-vscode/shared'
+import { ResourcePaths, Settings, oidcClientName, createServerOptions, globals } from 'aws-core-vscode/shared'
 
 const localize = nls.loadMessageBundle()
 
@@ -48,7 +48,7 @@ export async function startLanguageServer(extensionContext: vscode.ExtensionCont
                     name: env.appName,
                     version: version,
                     extension: {
-                        name: clientName(),
+                        name: oidcClientName(),
                         version: '0.0.1',
                     },
                     clientId: crypto.randomUUID(),

packages/core/src/auth/sso/ssoAccessTokenProvider.ts

@@ -26,7 +26,7 @@ import { AwsLoginWithBrowser, AwsRefreshCredentials, telemetry } from '../../sha
 import { indent, toBase64URL } from '../../shared/utilities/textUtilities'
 import { AuthSSOServer } from './server'
 import { CancellationError, sleep } from '../../shared/utilities/timeoutUtils'
-import { clientName, isAmazonQ } from '../../shared/extensionUtilities'
+import { oidcClientName, isAmazonQ } from '../../shared/extensionUtilities'
 import { randomBytes, createHash } from 'crypto'
 import { localize } from '../../shared/utilities/vsCodeUtils'
 import { randomUUID } from '../../shared/crypto'
@@ -440,7 +440,7 @@ export class DeviceFlowAuthorization extends SsoAccessTokenProvider {
     override async registerClient(): Promise<ClientRegistration> {
         return this.oidc.registerClient(
             {
-                clientName: clientName(),
+                clientName: oidcClientName(),
                 clientType: clientRegistrationType,
                 scopes: this.profile.scopes,
             },
@@ -545,7 +545,7 @@ class AuthFlowAuthorization extends SsoAccessTokenProvider {
         return this.oidc.registerClient(
             {
                 // All AWS extensions (Q, Toolkit) for a given IDE use the same client name.
-                clientName: clientName(),
+                clientName: oidcClientName(),
                 clientType: clientRegistrationType,
                 scopes: this.profile.scopes,
                 grantTypes: [authorizationGrantType, refreshGrantType],
@@ -654,7 +654,7 @@ class WebAuthorization extends SsoAccessTokenProvider {
         return this.oidc.registerClient(
             {
                 // All AWS extensions (Q, Toolkit) for a given IDE use the same client name.
-                clientName: clientName(),
+                clientName: oidcClientName(),
                 clientType: clientRegistrationType,
                 scopes: this.profile.scopes,
                 grantTypes: [authorizationGrantType, refreshGrantType],

packages/core/src/shared/extensionUtilities.ts

@@ -49,8 +49,8 @@ export function productName() {
 }
 
 /** Gets the client name stored in oidc */
-export const clientName = once(_clientName)
-function _clientName() {
+export const oidcClientName = once(_oidcClientName)
+function _oidcClientName() {
     const companyName = getIdeProperties().company
     return isCloud9() ? `${companyName} Cloud9` : `${companyName} IDE Extensions for VSCode`
 }