Fix connection string related issues (#17737)

src/models/connectionCredentials.ts

@@ -252,7 +252,17 @@ export class ConnectionCredentials implements IConnectionInfo {
 						}
 					}
 				},
-				default: defaultProfileValues ? await connectionStore.lookupPassword(defaultProfileValues) : undefined
+				default: async (value) => {
+					if (value.connectionString) {
+						if ((value as IConnectionProfile).savePassword) {
+							// look up connection string
+							let connectionString = await connectionStore.lookupPassword(value, true);
+							value.connectionString = connectionString;
+						}
+					} else {
+						return await connectionStore.lookupPassword(value);
+					}
+				}
 			}
 		];
 		return questions;
@@ -298,8 +308,8 @@ export class ConnectionCredentials implements IConnectionInfo {
 
 	public static isPasswordBasedConnectionString(connectionString: string): boolean {
 		const connString = connectionString.toLowerCase();
-		return connString.includes('user') &&
-			connString.includes('password') &&
+		return (connString.includes('user') || connString.includes('uid') || connString.includes('userid')) &&
+			(connString.includes('password') || connString.includes('pwd')) &&
 			!connString.includes('Integrated Security');
 	}
 

src/models/connectionInfo.ts

@@ -6,7 +6,7 @@
 import { IConnectionInfo, IServerInfo } from 'vscode-mssql';
 import * as Constants from '../constants/constants';
 import * as LocalizedConstants from '../constants/localizedConstants';
-import { EncryptOptions, IConnectionProfile } from '../models/interfaces';
+import { EncryptOptions } from '../models/interfaces';
 import * as Interfaces from './interfaces';
 import * as Utils from './utils';
 
@@ -137,25 +137,14 @@ export function getPicklistDetails(connCreds: IConnectionInfo): string {
  */
 export function getConnectionDisplayString(creds: IConnectionInfo): string {
 	// Update the connection text
-	let text: string;
-	if (creds.connectionString) {
-		// If a connection string is present, try to display the profile name
-		if ((<IConnectionProfile>creds).profileName) {
-			text = (<IConnectionProfile>creds).profileName;
-			text = appendIfNotEmpty(text, creds.connectionString);
-		} else {
-			text = creds.connectionString;
-		}
+	let text: string = creds.server;
+	if (creds.database !== '') {
+		text = appendIfNotEmpty(text, creds.database);
 	} else {
-		text = creds.server;
-		if (creds.database !== '') {
-			text = appendIfNotEmpty(text, creds.database);
-		} else {
-			text = appendIfNotEmpty(text, LocalizedConstants.defaultDatabaseLabel);
-		}
-		let user: string = getUserNameOrDomainLogin(creds);
-		text = appendIfNotEmpty(text, user);
+		text = appendIfNotEmpty(text, LocalizedConstants.defaultDatabaseLabel);
 	}
+	let user: string = getUserNameOrDomainLogin(creds);
+	text = appendIfNotEmpty(text, user);
 
 	// Limit the maximum length of displayed text
 	if (text.length > Constants.maxDisplayedStatusTextLength) {

src/models/connectionStore.ts

@@ -72,7 +72,7 @@ export class ConnectionStore {
 	 * @returns {string} formatted string with server, DB and username
 	 */
 	public static formatCredentialId(server: string, database?: string, user?: string, itemType?: string, isConnectionString?: boolean): string {
-		if (Utils.isEmpty(server)) {
+		if (Utils.isEmpty(server) && !isConnectionString) {
 			throw new ValidationException('Missing Server Name, which is required');
 		}
 		let cred: string[] = [ConnectionStore.CRED_PREFIX];
@@ -116,7 +116,7 @@ export class ConnectionStore {
 	 * @returns {Promise<IConnectionCredentialsQuickPickItem[]>}
 	 */
 	public getPickListItems(): IConnectionCredentialsQuickPickItem[] {
-		let pickListItems: IConnectionCredentialsQuickPickItem[] = this.loadAllConnections(true);
+		let pickListItems: IConnectionCredentialsQuickPickItem[] = this.loadAllConnections(false);
 		pickListItems.push(<IConnectionCredentialsQuickPickItem>{
 			label: `$(add) ${LocalizedConstants.CreateProfileFromConnectionsListLabel}`,
 			connectionCreds: undefined,