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

Change proxy to Axios (#24118)

Browse Source
This commit is contained in:
Christopher Suh
2023-08-16 21:23:50 -07:00
committed by GitHub
parent abae1f500a
commit f7c71a1fb3
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
extensions/azurecore/src/account-provider/auths/azureAuth.ts
View File

@@ -26,9 +26,14 @@ import { HttpClient } from './httpClient';
import { getProxyEnabledHttpClient, getTenantIgnoreList, updateTenantIgnoreList } from '../../utils'; import { getProxyEnabledHttpClient, getTenantIgnoreList, updateTenantIgnoreList } from '../../utils';
import { errorToPromptFailedResult } from './networkUtils'; import { errorToPromptFailedResult } from './networkUtils';
import { MsalCachePluginProvider } from '../utils/msalCachePlugin'; import { MsalCachePluginProvider } from '../utils/msalCachePlugin';
import { AzureListOperationResponse, ErrorResponseBodyWithError, isErrorResponseBodyWithError } from '../../azureResource/utils'; import { isErrorResponseBodyWithError } from '../../azureResource/utils';
import axios, { AxiosResponse, AxiosRequestConfig } from 'axios';
const localize = nls.loadMessageBundle(); const localize = nls.loadMessageBundle();
export type GetTenantsResponseData = {
value: TenantResponse[];
}
export abstract class AzureAuth implements vscode.Disposable { export abstract class AzureAuth implements vscode.Disposable {
protected readonly memdb = new MemoryDatabase<string>(); protected readonly memdb = new MemoryDatabase<string>();
protected readonly loginEndpointUrl: string; protected readonly loginEndpointUrl: string;
@@ -242,18 +247,14 @@ export abstract class AzureAuth implements vscode.Disposable {
Logger.verbose(`Fetching tenants with uri: ${tenantUri}`); Logger.verbose(`Fetching tenants with uri: ${tenantUri}`);
let tenantList: string[] = []; let tenantList: string[] = [];
const tenantResponse = await this.httpClient.sendGetRequestAsync<AzureListOperationResponse<TenantResponse[]> | ErrorResponseBodyWithError>(tenantUri, { const tenantResponse = await this.makeGetRequest<GetTenantsResponseData>(tenantUri, token);
headers: {
'Content-Type': 'application/json',
'Authorization': `Bearer ${token}`
}
});
const data = tenantResponse.data; const data = tenantResponse.data;
if (isErrorResponseBodyWithError(data)) { if (isErrorResponseBodyWithError(data)) {
Logger.error(`Error fetching tenants :${data.error?.code} - ${data.error?.message}`); Logger.error(`Error fetching tenants :${data.error?.code} - ${data.error?.message}`);
throw new Error(`${data.error?.code} - ${data.error?.message}`); throw new Error(`${data.error?.code} - ${data.error?.message}`);
} }
const tenants: Tenant[] = data.value.map((tenantInfo: TenantResponse) => { const tenants: Tenant[] = data.value.map((tenantInfo: TenantResponse) => {
if (tenantInfo.displayName) { if (tenantInfo.displayName) {
tenantList.push(tenantInfo.displayName); tenantList.push(tenantInfo.displayName);
@@ -476,6 +477,20 @@ export abstract class AzureAuth implements vscode.Disposable {
//#region network functions //#region network functions
private async makeGetRequest<T>(url: string, token: string): Promise<AxiosResponse<T>> {
const config: AxiosRequestConfig = {
headers: {
'Content-Type': 'application/json',
'Authorization': `Bearer ${token}`
},
validateStatus: () => true // Never throw
};
const response: AxiosResponse = await axios.get<T>(url, config);
Logger.piiSanitized('GET request ', [{ name: 'response', objOrArray: response.data?.value as TenantResponse[] ?? response.data as GetTenantsResponseData }], [], url,);
return response;
}
//#endregion //#endregion
//#region inconsequential //#region inconsequential