Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 21 additions & 77 deletions extensions/mssql/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions extensions/mssql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@
"@types/sinon": "^10.0.12",
"@types/sinon-chai": "^4.0.0",
"@types/tmp": "0.0.28",
"@types/tunnel": "0.0.1",
"@types/vscode": "1.101.0",
"@types/vscode-webview": "^1.57.5",
"@types/xmldom": "^0.1.34",
Expand Down Expand Up @@ -158,7 +157,6 @@
"@microsoft/vscode-azext-azureauth": "^5.1.1",
"@microsoft/vscode-azureresources-api": "^3.1.1",
"@xmldom/xmldom": "^0.9.10",
"axios": "^1.18.0",
"dockerode": "^4.0.9",
"dotenv": "^16.4.5",
"error-ex": "^1.3.0",
Expand All @@ -178,7 +176,6 @@
"strip-json-comments": "^5.0.1",
"tar": "^7.5.16",
"tmp": "^0.2.7",
"tunnel": "0.0.6",
"vscode-jsonrpc": "^9.0.0",
"vscode-languageclient": "10.0.0",
"xml-formatter": "^3.6.7",
Expand Down
9 changes: 6 additions & 3 deletions extensions/mssql/src/azure/msal/msalAzureAuth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { ILogger } from "../../sharedInterfaces/logger";
import { AzureAuthError } from "../azureAuthError";
import * as Constants from "../constants";
import { ErrorResponseBody } from "@azure/arm-subscriptions";
import { HttpClient } from "../../http/httpClient";
import { VscodeHttpClient } from "extension-toolkit/vscode";
import { getErrorMessage } from "../../utils/utils";

export type GetTenantsResponseData = {
Expand All @@ -43,7 +43,7 @@ export abstract class MsalAzureAuth {
protected readonly scopesString: string;
protected readonly clientId: string;
protected readonly resources: Resource[];
private readonly _httpHelper: HttpClient;
private readonly _httpHelper: VscodeHttpClient;

constructor(
protected readonly providerSettings: IProviderSettings,
Expand All @@ -59,7 +59,10 @@ export abstract class MsalAzureAuth {
this.scopes = [...this.providerSettings.scopes];
this.scopesString = this.scopes.join(" ");

this._httpHelper = new HttpClient(logger);
this._httpHelper = new VscodeHttpClient({
logger,
messages: LocalizedConstants.Proxy,
});
}

public async startLogin(): Promise<LoginResult> {
Expand Down
7 changes: 5 additions & 2 deletions extensions/mssql/src/azure/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ import { PagedAsyncIterableIterator } from "@azure/core-paging";
import * as path from "path";
import * as os from "os";
import * as vscode from "vscode";
import { VscodeHttpClient } from "extension-toolkit/vscode";
import { AzureAuthType, IToken, UserGroup } from "../models/contracts/azure";
import * as LocalizedConstants from "../constants/locConstants";
import * as Constants from "./constants";
import { TokenCredentialWrapper } from "./credentialWrapper";
import { HttpClient } from "../http/httpClient";
import { getLogger } from "../models/logger";
import { getErrorMessage } from "../utils/utils";

Expand Down Expand Up @@ -121,7 +122,9 @@ export function getAppDataPath(): string {
export async function fetchUserGroups(userId: string): Promise<UserGroup[]> {
const graphBaseUri = vscode.Uri.parse("https://graph.microsoft.com/v1.0/");
const uri = vscode.Uri.joinPath(graphBaseUri, `users/${userId}/memberOf`);
const httpHelper = new HttpClient();
const httpHelper = new VscodeHttpClient({
messages: LocalizedConstants.Proxy,
});

const session = await vscode.authentication.getSession("microsoft", [], {
createIfNone: true,
Expand Down
7 changes: 5 additions & 2 deletions extensions/mssql/src/controllers/mainController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ import { SearchDatabaseWebViewController } from "../searchDatabase/searchDatabas
import { ChangelogWebviewController } from "./changelogWebviewController";
import { AzureDataStudioMigrationWebviewController } from "./azureDataStudioMigrationWebviewController";
import { ShortcutsConfigurationWebviewController } from "./shortcutsConfigurationWebviewController";
import { HttpClient } from "../http/httpClient";
import { VscodeHttpClient } from "extension-toolkit/vscode";
import { ILogger } from "../sharedInterfaces/logger";
import { logger } from "../models/logger";
import { FileBrowserService } from "../services/fileBrowserService";
Expand Down Expand Up @@ -202,7 +202,10 @@ export default class MainController implements vscode.Disposable {
this.configuration = vscode.workspace.getConfiguration();

UserSurvey.createInstance(this._context);
new HttpClient(this._logger).warnOnInvalidProxySettings();
new VscodeHttpClient({
logger: this._logger,
messages: LocalizedConstants.Proxy,
}).warnOnInvalidProxySettings();
}

/**
Expand Down
Loading
Loading