Skip to content

Commit b3c68be

Browse files
fix(codecatalyst): codecatalyst login prompt message not clear
This makes the prompt message more clear to users based off of IDE-10429 Signed-off-by: Nikolas Komonen <[email protected]>
1 parent d2983c2 commit b3c68be

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

src/codecatalyst/auth.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import * as vscode from 'vscode'
77
import { CodeCatalystClient } from '../shared/clients/codecatalystClient'
8-
import { isCloud9 } from '../shared/extensionUtilities'
8+
import { getIdeProperties, isCloud9 } from '../shared/extensionUtilities'
99
import {
1010
Auth,
1111
isBuilderIdConnection,
@@ -106,18 +106,19 @@ export class CodeCatalystAuthenticationProvider {
106106

107107
const conn = (await this.auth.listConnections()).find(isBuilderIdConnection)
108108
const isNewUser = conn === undefined
109-
const okItem: vscode.MessageItem = { title: localizedText.ok }
109+
const continueItem: vscode.MessageItem = { title: localizedText.continueText }
110110
const cancelItem: vscode.MessageItem = { title: localizedText.cancel, isCloseAffordance: true }
111111

112112
if (isNewUser || !isValidCodeCatalystConnection(conn)) {
113113
// TODO: change to `satisfies` on TS 4.9
114114
telemetry.record({ codecatalyst_connectionFlow: isNewUser ? 'Create' : 'Upgrade' } as ConnectionFlowEvent)
115115

116-
const message = isNewUser
117-
? 'CodeCatalyst requires an AWS Builder ID connection. Creating a connection opens your browser to login.\n\n Create one now?'
118-
: 'Your AWS Builder ID connection does not have access to CodeCatalyst. Upgrading the connection requires another login.\n\n Upgrade now?'
119-
const resp = await vscode.window.showInformationMessage(message, { modal: true }, okItem, cancelItem)
120-
if (resp !== okItem) {
116+
const message = `The ${
117+
getIdeProperties().company
118+
} Toolkit extension requires a connection for CodeCatalyst to begin.\n\n Proceed to the browser to allow access?`
119+
120+
const resp = await vscode.window.showInformationMessage(message, { modal: true }, continueItem, cancelItem)
121+
if (resp !== continueItem) {
121122
throw new ToolkitError('Not connected to CodeCatalyst', { code: 'NoConnection', cancelled: true })
122123
}
123124

@@ -136,10 +137,10 @@ export class CodeCatalystAuthenticationProvider {
136137
const resp = await vscode.window.showInformationMessage(
137138
'CodeCatalyst requires an AWS Builder ID connection.\n\n Switch to it now?',
138139
{ modal: true },
139-
okItem,
140+
continueItem,
140141
cancelItem
141142
)
142-
if (resp !== okItem) {
143+
if (resp !== continueItem) {
143144
throw new ToolkitError('Not connected to CodeCatalyst', { code: 'NoConnection', cancelled: true })
144145
}
145146

src/shared/localizedText.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export const ok = localize('AWS.generic.response.ok', 'OK')
1313
export const retry = localize('AWS.generic.response.retry', 'Retry')
1414
export const skip = localize('AWS.generic.response.skip', 'Skip')
1515
export const confirm = localize('AWS.generic.confirm', 'Confirm')
16+
export const continueText = localize('AWS.generic.continue', 'Continue')
1617
export const invalidArn = localize('AWS.error.invalidArn', 'Invalid ARN')
1718
export const localizedDelete = localize('AWS.generic.delete', 'Delete')
1819
export const cancel = localize('AWS.generic.cancel', 'Cancel')

0 commit comments

Comments
 (0)