ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-28 15:50:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Forces device code auth on SAW and fixes a small axios issue (#9756)

Browse Source 
* Force device code and fix a device code issue

* Trailing comma
This commit is contained in:
Amir Omidi
2020-03-26 17:51:51 -07:00
committed by GitHub
parent dfeaaf384f
commit bb6e4e5ff1
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/azurecore/src/account-provider/azureAccountProvider.ts
View File

@@ -29,7 +29,8 @@ export class AzureAccountProvider implements azdata.AccountProvider {
constructor(
metadata: AzureAccountProviderMetadata,
tokenCache: SimpleTokenCache,
context: vscode.ExtensionContext
context: vscode.ExtensionContext,
private readonly forceDeviceCode: boolean = false
) {
vscode.workspace.onDidChangeConfiguration((changeEvent) => {
const impact = changeEvent.affectsConfiguration(AzureAccountProvider.CONFIGURATION_SECTION);
@@ -52,10 +53,10 @@ export class AzureAccountProvider implements azdata.AccountProvider {
const codeGrantMethod: boolean = configuration.get('codeGrant');
const deviceCodeMethod: boolean = configuration.get('deviceCode');
if (codeGrantMethod === true) {
if (codeGrantMethod === true && !this.forceDeviceCode) {
this.authMappings.set(AzureAuthType.AuthCodeGrant, new AzureAuthCodeGrant(metadata, tokenCache, context));
}
if (deviceCodeMethod === true) {
if (deviceCodeMethod === true || this.forceDeviceCode) {
this.authMappings.set(AzureAuthType.DeviceCode, new AzureDeviceCode(metadata, tokenCache, context));
}
}
@@ -69,7 +70,7 @@ export class AzureAccountProvider implements azdata.AccountProvider {
if (authType) {
return this.authMappings.get(authType);
} else {
return this.authMappings.get(AzureAuthType.AuthCodeGrant);
return this.authMappings.values().next().value;
}
}