Merge pull request #3313 from nkomonen-amazon/buildIdSigninMessage

fix(codecatalyst): codecatalyst login prompt message not clear

Author: nkomonen-amazon

src/codecatalyst/auth.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode'
 import { CodeCatalystClient } from '../shared/clients/codecatalystClient'
-import { isCloud9 } from '../shared/extensionUtilities'
+import { getIdeProperties, isCloud9 } from '../shared/extensionUtilities'
 import {
     Auth,
     isBuilderIdConnection,
@@ -106,18 +106,19 @@ export class CodeCatalystAuthenticationProvider {
 
         const conn = (await this.auth.listConnections()).find(isBuilderIdConnection)
         const isNewUser = conn === undefined
-        const okItem: vscode.MessageItem = { title: localizedText.ok }
+        const continueItem: vscode.MessageItem = { title: localizedText.continueText }
         const cancelItem: vscode.MessageItem = { title: localizedText.cancel, isCloseAffordance: true }
 
         if (isNewUser || !isValidCodeCatalystConnection(conn)) {
             // TODO: change to `satisfies` on TS 4.9
             telemetry.record({ codecatalyst_connectionFlow: isNewUser ? 'Create' : 'Upgrade' } as ConnectionFlowEvent)
 
-            const message = isNewUser
-                ? 'CodeCatalyst requires an AWS Builder ID connection. Creating a connection opens your browser to login.\n\n Create one now?'
-                : 'Your AWS Builder ID connection does not have access to CodeCatalyst. Upgrading the connection requires another login.\n\n Upgrade now?'
-            const resp = await vscode.window.showInformationMessage(message, { modal: true }, okItem, cancelItem)
-            if (resp !== okItem) {
+            const message = `The ${
+                getIdeProperties().company
+            } Toolkit extension requires a connection for CodeCatalyst to begin.\n\n Proceed to the browser to allow access?`
+
+            const resp = await vscode.window.showInformationMessage(message, { modal: true }, continueItem, cancelItem)
+            if (resp !== continueItem) {
                 throw new ToolkitError('Not connected to CodeCatalyst', { code: 'NoConnection', cancelled: true })
             }
 
@@ -136,10 +137,10 @@ export class CodeCatalystAuthenticationProvider {
             const resp = await vscode.window.showInformationMessage(
                 'CodeCatalyst requires an AWS Builder ID connection.\n\n Switch to it now?',
                 { modal: true },
-                okItem,
+                continueItem,
                 cancelItem
             )
-            if (resp !== okItem) {
+            if (resp !== continueItem) {
                 throw new ToolkitError('Not connected to CodeCatalyst', { code: 'NoConnection', cancelled: true })
             }
 

src/shared/localizedText.ts

@@ -13,6 +13,7 @@ export const ok = localize('AWS.generic.response.ok', 'OK')
 export const retry = localize('AWS.generic.response.retry', 'Retry')
 export const skip = localize('AWS.generic.response.skip', 'Skip')
 export const confirm = localize('AWS.generic.confirm', 'Confirm')
+export const continueText = localize('AWS.generic.continue', 'Continue')
 export const invalidArn = localize('AWS.error.invalidArn', 'Invalid ARN')
 export const localizedDelete = localize('AWS.generic.delete', 'Delete')
 export const cancel = localize('AWS.generic.cancel', 'Cancel')