ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-29 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix/controller ad (#7445)

Browse Source 
Reapply my previous commit
add kerberos to excludes in the webpack for the extension
Fixes #7443
Verified on Windows and MacOS
This commit is contained in:
Kevin Cunnane
2019-10-01 14:52:09 -07:00
committed by GitHub
parent 7162272f1e
commit ee98ce5c18
16 changed files with 2245 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
extensions/big-data-cluster/src/bigDataCluster/tree/controllerTreeDataProvider.ts
View File

@@ -13,11 +13,13 @@ import { AddControllerNode } from './addControllerNode';
import { ControllerRootNode, ControllerNode } from './controllerTreeNode';
import { showErrorMessage } from '../utils';
import { LoadingControllerNode } from './loadingControllerNode';
import { AuthType } from '../constants';
const CredentialNamespace = 'clusterControllerCredentials';
interface IControllerInfoSlim {
url: string;
auth: AuthType;
username: string;
password?: string;
rememberPassword: boolean;
@@ -57,17 +59,18 @@ export class ControllerTreeDataProvider implements vscode.TreeDataProvider<TreeN
public addController(
url: string,
auth: AuthType,
username: string,
password: string,
rememberPassword: boolean
): void {
this.removeNonControllerNodes();
this.root.addControllerNode(url, username, password, rememberPassword);
this.root.addControllerNode(url, auth, username, password, rememberPassword);
this.notifyNodeChanged();
}
public deleteController(url: string, username: string): ControllerNode {
let deleted = this.root.deleteControllerNode(url, username);
public deleteController(url: string, auth: AuthType, username: string): ControllerNode {
let deleted = this.root.deleteControllerNode(url, auth, username);
if (deleted) {
this.notifyNodeChanged();
}
@@ -115,8 +118,12 @@ export class ControllerTreeDataProvider implements vscode.TreeDataProvider<TreeN
if (c.rememberPassword) {
password = await this.getPassword(c.url, c.username);
}
if (!c.auth) {
// Added before we had added authentication
c.auth = 'basic';
}
this.root.addChild(new ControllerNode(
c.url, c.username, password, c.rememberPassword,
c.url, c.auth, c.username, password, c.rememberPassword,
undefined, this.root, this, undefined
));
}
@@ -135,6 +142,7 @@ export class ControllerTreeDataProvider implements vscode.TreeDataProvider<TreeN
let controller = e as ControllerNode;
return {
url: controller.url,
auth: controller.auth,
username: controller.username,
password: controller.password,
rememberPassword: !!controller.rememberPassword
@@ -144,6 +152,7 @@ export class ControllerTreeDataProvider implements vscode.TreeDataProvider<TreeN
let controllersWithoutPassword = controllers.map((e): IControllerInfoSlim => {
return {
url: e.url,
auth: e.auth,
username: e.username,
rememberPassword: e.rememberPassword
};