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

user management fixes (#22282)

Browse Source 
* fix a few user management bugs

* revert user dialog change
This commit is contained in:
Alan Ren
2023-03-09 14:11:04 -08:00
committed by GitHub
parent 39f90afe6c
commit 6ace579986
5 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
extensions/mssql/src/objectManagement/commands.ts
View File

@@ -43,8 +43,12 @@ function getObjectManagementService(appContext: AppContext, useTestService: bool
}
async function handleNewLoginDialogCommand(context: azdata.ObjectExplorerContext, service: IObjectManagementService): Promise<void> {
const connectionUri = await getConnectionUri(context);
if (!connectionUri) {
return;
}
try {
const connectionUri = await azdata.connection.getUriForConnection(context.connectionProfile.id);
const dialog = new LoginDialog(service, connectionUri, true, undefined, context);
await dialog.open();
}
@@ -57,8 +61,11 @@ async function handleNewLoginDialogCommand(context: azdata.ObjectExplorerContext
}
async function handleNewUserDialogCommand(context: azdata.ObjectExplorerContext, service: IObjectManagementService): Promise<void> {
const connectionUri = await getConnectionUri(context);
if (!connectionUri) {
return;
}
try {
const connectionUri = await azdata.connection.getUriForConnection(context.connectionProfile.id);
const dialog = new UserDialog(service, connectionUri, context.connectionProfile.databaseName, true, undefined, context);
await dialog.open();
}
@@ -71,9 +78,12 @@ async function handleNewUserDialogCommand(context: azdata.ObjectExplorerContext,
}
async function handleObjectPropertiesDialogCommand(context: azdata.ObjectExplorerContext, service: IObjectManagementService): Promise<void> {
const connectionUri = await getConnectionUri(context);
if (!connectionUri) {
return;
}
const nodeTypeDisplayName = getNodeTypeDisplayName(context.nodeInfo.nodeType);
try {
const connectionUri = await azdata.connection.getUriForConnection(context.connectionProfile.id);
let dialog;
switch (context.nodeInfo.nodeType) {
case NodeType.Login:
@@ -98,6 +108,10 @@ async function handleObjectPropertiesDialogCommand(context: azdata.ObjectExplore
}
async function handleDeleteObjectCommand(context: azdata.ObjectExplorerContext, service: IObjectManagementService): Promise<void> {
const connectionUri = await getConnectionUri(context);
if (!connectionUri) {
return;
}
let additionalConfirmationMessage: string;
switch (context.nodeInfo.nodeType) {
case NodeType.Login:
@@ -122,7 +136,6 @@ async function handleDeleteObjectCommand(context: azdata.ObjectExplorerContext,
operation: async (operation) => {
try {
const startTime = Date.now();
const connectionUri = await azdata.connection.getUriForConnection(context.connectionProfile.id);
switch (context.nodeInfo.nodeType) {
case NodeType.Login:
await service.deleteLogin(connectionUri, context.nodeInfo.label);
@@ -151,3 +164,11 @@ async function handleDeleteObjectCommand(context: azdata.ObjectExplorerContext,
}
});
}
async function getConnectionUri(context: azdata.ObjectExplorerContext): Promise<string> {
const connectionUri = await azdata.connection.getUriForConnection(context.connectionProfile.id);
if (!connectionUri) {
await vscode.window.showErrorMessage(localizedConstants.FailedToRetrieveConnectionInfoErrorMessage, { modal: true });
}
return connectionUri;
}