ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed CMS connection auth (#5306)

Browse Source 
* fixed auth change to reflect in UI

* added comments

* fix bug where cms shows in dropdown

* added parameter to parent call
This commit is contained in:
Aditya Bist
2019-05-03 13:26:04 -07:00
committed by GitHub
parent f5d13319a2
commit a69f194d8b
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/platform/connection/common/constants.ts
View File

@@ -29,6 +29,6 @@ export const azureMFA = 'AzureMFA';
/* CMS constants */ /* CMS constants */
export const cmsProviderName = 'MSSQL-CMS'; export const cmsProviderName = 'MSSQL-CMS';
export const cmsProviderDisplayName = localize('constants.cmsProviderDisplayName', 'Microsoft SQL Server (CMS)'); export const cmsProviderDisplayName = localize('constants.cmsProviderDisplayName', 'Microsoft SQL Server - CMS');
export const UNSAVED_GROUP_ID = 'unsaved'; export const UNSAVED_GROUP_ID = 'unsaved';

9
src/sql/workbench/services/connection/browser/cmsConnectionWidget.ts
View File

@@ -92,16 +92,15 @@ export class CmsConnectionWidget extends ConnectionWidget {
} }
protected addAuthenticationTypeOption(authTypeChanged: boolean = false): void { protected addAuthenticationTypeOption(authTypeChanged: boolean = false): void {
super.addAuthenticationTypeOption(); super.addAuthenticationTypeOption(authTypeChanged);
let authTypeOption = this._optionsMaps[ConnectionOptionSpecialType.authType]; let authTypeOption = this._optionsMaps[ConnectionOptionSpecialType.authType];
let newAuthTypes = authTypeOption.categoryValues; let newAuthTypes = authTypeOption.categoryValues;
// True when opening a CMS dialog to add a registered server
if (authTypeChanged) { if (authTypeChanged) {
// Need to filter out SQL Login because registered servers don't support it
newAuthTypes = authTypeOption.categoryValues.filter((option) => option.name !== AuthenticationType.SqlLogin); newAuthTypes = authTypeOption.categoryValues.filter((option) => option.name !== AuthenticationType.SqlLogin);
} authTypeOption.defaultValue = AuthenticationType.Integrated;
if (this._authTypeSelectBox) {
this._authTypeSelectBox.setOptions(newAuthTypes.map(c => c.displayName)); this._authTypeSelectBox.setOptions(newAuthTypes.map(c => c.displayName));
} else {
this._authTypeSelectBox = new SelectBox(newAuthTypes.map(c => c.displayName), authTypeOption.defaultValue, this._contextViewService, undefined, { ariaLabel: authTypeOption.displayName });
} }
} }