remove SQL Login from CMS and add error messages (#5873)

extensions/cms/package.json

@@ -86,17 +86,9 @@
 					"defaultValue": null,
 					"objectType": null,
 					"categoryValues": [
-						{
-							"displayName": "%cms.connectionOptions.authType.categoryValues.sqlLogin%",
-							"name": "SqlLogin"
-						},
 						{
 							"displayName": "%cms.connectionOptions.authType.categoryValues.integrated%",
 							"name": "Integrated"
-						},
-						{
-							"displayName": "%cms.connectionOptions.authType.categoryValues.azureMFA%",
-							"name": "AzureMFA"
 						}
 					],
 					"isRequired": true,

extensions/cms/src/cmsResource/tree/cmsResourceTreeNode.ts

@@ -78,7 +78,7 @@ export class CmsResourceTreeNode extends CmsResourceTreeNodeBase {
 				}
 			}, (error) => {
 				let errorText = localize('cms.errors.expandCmsFail', 'The Central Management Server {0} could not be found or is offline', this.name);
-				this.appContext.apiWrapper.showErrorMessage(errorText);
+				this.appContext.apiWrapper.showErrorMessage(error ? error : errorText);
 				return [];
 			});
 		} catch {

extensions/cms/src/cmsUtils.ts

@@ -143,9 +143,7 @@ export class CmsUtils {
 			providerName: undefined,
 			saveProfile: undefined,
 			id: undefined,
-			options: {
-				authTypeChanged: true
-			}
+			options: {}
 		};
 		return this.openConnectionDialog([cmsProvider], initialProfile, { saveConnection: false }).then(async (connection) => {
 			if (connection && connection.options) {

extensions/mssql/src/cms/cmsService.ts

@@ -16,7 +16,6 @@ import { ListRegisteredServersResult } from '../api/mssqlapis';
 export class CmsService {
 
 	constructor(private appContext: AppContext, private client: SqlOpsDataClient) {
-
 		this.appContext.registerService<CmsService>(constants.CmsService, this);
 	}
 
@@ -30,7 +29,7 @@ export class CmsService {
 			},
 			e => {
 				this.client.logFailedRequest(contracts.CreateCentralManagementServerRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e.message);
 			}
 		);
 	}
@@ -43,7 +42,7 @@ export class CmsService {
 			},
 			e => {
 				this.client.logFailedRequest(contracts.ListRegisteredServersRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e.message);
 			}
 		);
 	}
@@ -56,7 +55,7 @@ export class CmsService {
 			},
 			e => {
 				this.client.logFailedRequest(contracts.AddRegisteredServerRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e.message);
 			}
 		);
 	}
@@ -69,7 +68,7 @@ export class CmsService {
 			},
 			e => {
 				this.client.logFailedRequest(contracts.RemoveRegisteredServerRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e.message);
 			}
 		);
 	}
@@ -82,7 +81,7 @@ export class CmsService {
 			},
 			e => {
 				this.client.logFailedRequest(contracts.AddServerGroupRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e.message);
 			}
 		);
 	}
@@ -95,7 +94,7 @@ export class CmsService {
 			},
 			e => {
 				this.client.logFailedRequest(contracts.RemoveServerGroupRequest.type, e);
-				return Promise.resolve(undefined);
+				return Promise.reject(e.message);
 			}
 		);
 	}