Fix references

Author: opieter-aws

packages/core/src/codewhisperer/region/regionProfileManager.ts

@@ -336,7 +336,7 @@ export class RegionProfileManager {
     }
 
     async createQClient(region: string, endpoint: string): Promise<CodeWhispererUserClient> {
-        const token = AuthUtil.instance.getToken()
+        const token = await AuthUtil.instance.getToken()
         const serviceOption: ServiceOptions = {
             apiConfig: userApiConfig,
             region: region,

packages/core/src/codewhisperer/service/recommendationService.ts

@@ -68,7 +68,7 @@ export class RecommendationService {
         event?: vscode.TextDocumentChangeEvent
     ) {
         // TODO: should move all downstream auth check(inlineCompletionService, recommendationHandler etc) to here(upstream) instead of spreading everywhere
-        if (AuthUtil.instance.isConnected() && AuthUtil.instance.requireProfileSelection()) { // TODO: @hayemaxi
+        if (AuthUtil.instance.isConnected() && AuthUtil.instance.regionProfileManager.requireProfileSelection()) {
             return
         }
 

packages/core/src/codewhisperer/ui/statusBarMenu.ts

@@ -43,7 +43,7 @@ function getAmazonQCodeWhispererNodes() {
         return [createSignIn(), createLearnMore()]
     }
 
-    if (AuthUtil.instance.isConnected() && AuthUtil.instance.requireProfileSelection()) {
+    if (AuthUtil.instance.isConnected() && AuthUtil.instance.regionProfileManager.requireProfileSelection()) {
         return []
     }
 

packages/core/src/codewhisperer/util/getStartUrl.ts

@@ -29,7 +29,7 @@ export const getStartUrl = async () => {
 
 export async function connectToEnterpriseSso(startUrl: string, region: Region['id']) {
     try {
-        AuthUtil.instance.login(startUrl, region)
+        await AuthUtil.instance.login(startUrl, region)
     } catch (e) {
         throw ToolkitError.chain(e, CodeWhispererConstants.failedToConnectIamIdentityCenter, {
             code: 'FailedToConnect',

packages/core/src/codewhispererChat/controllers/chat/controller.ts

@@ -65,7 +65,6 @@ import { getSelectedCustomization } from '../../../codewhisperer/util/customizat
 import { getHttpStatusCode, AwsClientResponseError } from '../../../shared/errors'
 import { uiEventRecorder } from '../../../amazonq/util/eventRecorder'
 import { telemetry } from '../../../shared/telemetry/telemetry'
-import { isSsoConnection } from '../../../auth/connection'
 import { inspect } from '../../../shared/utilities/collectionUtils'
 import { DefaultAmazonQAppInitContext } from '../../../amazonq/apps/initContext'
 import globals from '../../../shared/extensionGlobals'
@@ -1111,9 +1110,7 @@ export class ChatController {
 
         const credentialsState = AuthUtil.instance.getAuthState()
 
-        if (
-            !(credentialsState === 'connected')
-        ) {
+        if (!(credentialsState === 'connected')) {
             await this.messenger.sendAuthNeededExceptionMessage(credentialsState, tabID, triggerID)
             return
         }

packages/core/src/login/webview/commonAuthViewProvider.ts

@@ -44,8 +44,6 @@ import { CodeCatalystAuthenticationProvider } from '../../codecatalyst/auth'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { AuthSources } from './util'
 import { AuthFlowStates } from './vue/types'
-import { getTelemetryMetadataForConn } from '../../auth/connection'
-import { AuthUtil } from '../../codewhisperer/util/authUtil'
 import { ExtensionUse } from '../../auth/utils'
 
 export class CommonAuthViewProvider implements WebviewViewProvider {
@@ -109,7 +107,7 @@ export class CommonAuthViewProvider implements WebviewViewProvider {
                 if (authState === AuthFlowStates.REAUTHNEEDED || authState === AuthFlowStates.REAUTHENTICATING) {
                     this.webView!.server.storeMetricMetadata({
                         isReAuth: true,
-                        // ...(await getTelemetryMetadataForConn(AuthUtil.instance.conn)), // TODO: @hayemaxi Re-add metrics
+                        // ...(await getTelemetryMetadataForConn(AuthUtil.instance.conn)), // TODO: @opieter Re-add telemetry
                     })
                 } else {
                     this.webView!.server.storeMetricMetadata({ isReAuth: false })

packages/core/src/login/webview/vue/amazonq/backend_amazonq.ts

@@ -66,7 +66,7 @@ export class AmazonQLoginWebview extends CommonAuthWebview {
             })
             await awsIdSignIn()
             // this.storeMetricMetadata(await getTelemetryMetadataForConn(conn))
-            // TODO: @hayemaxi
+            // TODO: @opieter re-add metrics
 
             void vscode.window.showInformationMessage('AmazonQ: Successfully connected to AWS Builder ID')
         })
@@ -84,7 +84,7 @@ export class AmazonQLoginWebview extends CommonAuthWebview {
 
             await connectToEnterpriseSso(startUrl, region)
             // this.storeMetricMetadata(await getTelemetryMetadataForConn(conn))
-            // TODO: @hayemaxi
+            // TODO: @opieter re-add metrics
 
             void vscode.window.showInformationMessage('AmazonQ: Successfully connected to AWS IAM Identity Center')
         })
@@ -110,7 +110,7 @@ export class AmazonQLoginWebview extends CommonAuthWebview {
              * causes the reauth page to refresh before the user is actually done the whole reauth flow.
              */
             this.reauthError = await this.ssoSetup('reauthenticateAmazonQ', async () => {
-                // TODO: Re-add metrics
+                // TODO: @ opieter Re-add metrics
                 // this.storeMetricMetadata({
                 //     authEnabledFeatures: this.getAuthEnabledFeatures(conn),
                 //     isReAuth: true,

packages/core/src/login/webview/vue/backend.ts

@@ -14,7 +14,6 @@ import { handleWebviewError } from '../../../webviews/server'
 import { InvalidGrantException } from '@aws-sdk/client-sso-oidc'
 import {
     AwsConnection,
-    Connection,
     hasScopes,
     scopesCodeCatalyst,
     scopesCodeWhispererChat,
@@ -196,8 +195,6 @@ export abstract class CommonAuthWebview extends VueWebview {
     abstract reauthenticateConnection(): Promise<void>
     abstract getReauthError(): Promise<AuthError | undefined>
 
-    abstract getActiveConnection(): Promise<Connection | undefined>
-
     /** Refreshes the current state of the auth flow, determining what you see in the UI */
     abstract refreshAuthState(): Promise<void>
     /** Use {@link refreshAuthState} first to ensure this returns the latest state */

packages/core/src/login/webview/vue/toolkit/backend_toolkit.ts

@@ -9,7 +9,6 @@ import { getLogger } from '../../../../shared/logger/logger'
 import { CommonAuthWebview } from '../backend'
 import {
     AwsConnection,
-    Connection,
     SsoConnection,
     TelemetryMetadata,
     createSsoProfile,
@@ -156,9 +155,6 @@ export class ToolkitLoginWebview extends CommonAuthWebview {
     override reauthenticateConnection(): Promise<undefined> {
         throw new Error('Method not implemented.')
     }
-    override getActiveConnection(): Promise<Connection | undefined> {
-        throw new Error('Method not implemented.')
-    }
 
     override async refreshAuthState(): Promise<void> {}
     override async getAuthState(): Promise<AuthFlowState> {

packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts

@@ -142,7 +142,6 @@ describe('Controller', () => {
         })
 
         sinon.stub(AuthUtil.instance, 'getAuthState').returns('connected')
-
     })
 
     afterEach(() => {