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

handle default auth type (#20572)

Browse Source 
* handle default auth type

* comments
This commit is contained in:
Alan Ren
2022-09-09 08:59:53 -07:00
committed by GitHub
parent 982c242301
commit 1f6482490c
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,7 @@ export interface IConnectionManagementService {
/** /**
* Gets the default authentication type from the configuration service * Gets the default authentication type from the configuration service
*/ */
getDefaultAuthenticationTypeId(): string; getDefaultAuthenticationTypeId(providerName: string): string;
/** /**
* Cancels the connection * Cancels the connection

2
src/sql/platform/connection/test/common/testConnectionManagementService.ts
View File

@@ -306,7 +306,7 @@ export class TestConnectionManagementService implements IConnectionManagementSer
return undefined!; return undefined!;
} }
getDefaultAuthenticationTypeId(): string { getDefaultAuthenticationTypeId(providerName: string): string {
return undefined!; return undefined!;
} }

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

@@ -312,7 +312,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
// If there is no authentication type set, set it using configuration // If there is no authentication type set, set it using configuration
if (!newConnection.authenticationType || newConnection.authenticationType === '') { if (!newConnection.authenticationType || newConnection.authenticationType === '') {
newConnection.authenticationType = this.getDefaultAuthenticationTypeId(); newConnection.authenticationType = this.getDefaultAuthenticationTypeId(newConnection.providerName);
} }
// If the password is required and still not loaded show the dialog // If the password is required and still not loaded show the dialog
@@ -797,8 +797,11 @@ export class ConnectionManagementService extends Disposable implements IConnecti
return defaultProvider && this._providers.has(defaultProvider) ? defaultProvider : undefined; return defaultProvider && this._providers.has(defaultProvider) ? defaultProvider : undefined;
} }
public getDefaultAuthenticationTypeId(): string { public getDefaultAuthenticationTypeId(providerName: string): string {
let defaultAuthenticationType = WorkbenchUtils.getSqlConfigValue<string>(this._configurationService, Constants.defaultAuthenticationType); // only return the default authentication type if the provider supports the AuthType option.
// Other issues with the implementation is tracked here: https://github.com/microsoft/azuredatastudio/issues/20573
const authOption = this._capabilitiesService.getCapabilities(providerName)?.connection.connectionOptions?.find(option => option.specialValueType === ConnectionOptionSpecialType.authType);
const defaultAuthenticationType = authOption ? WorkbenchUtils.getSqlConfigValue<string>(this._configurationService, Constants.defaultAuthenticationType) : undefined;
return defaultAuthenticationType; return defaultAuthenticationType;
} }