ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-21 17:22:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing password in Connection pane for Server connections with remembered passwords (#21813)

Browse Source 
* Fix missing password in Connection pane

* Get saved password for SQL login default auth type

* Clean up

* Fix build hygiene errors

* Captures input

* Add timeout waiting for all promises to resolve

* Add missing semicolon

* Code review feedback

* Minor clean up

* Code review feedback

* Improved error messaging

* Update src/sql/workbench/services/connection/browser/connectionDialogService.ts

Co-authored-by: Charles Gagnon <chgagnon@microsoft.com>

* Improves UX around loading passwords

* Remove unused import

* Uses await instead of promise chaining.

* Removes async

* Revert back to resolving password promise.

* Asserts controller map and model have values.

---------

Co-authored-by: Charles Gagnon <chgagnon@microsoft.com>
This commit is contained in:
Lewis Sanchez
2023-02-14 20:49:55 -08:00
committed by GitHub
parent a683b1b777
commit d9b24522e5
3 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/sql/workbench/services/connection/browser/connectionDialogService.ts
View File

@@ -361,15 +361,20 @@ export class ConnectionDialogService implements IConnectionDialogService {
this.uiController.initDialog(this._params && this._params.providers, this._model);
}
private handleFillInConnectionInputs(connectionInfo: IConnectionProfile): void {
this._connectionManagementService.addSavedPassword(connectionInfo).then(connectionWithPassword => {
private async handleFillInConnectionInputs(connectionInfo: IConnectionProfile): Promise<void> {
try {
const connectionWithPassword = await this.createModel(connectionInfo);
if (this._model) {
this._model.dispose();
}
this._model = this.createModel(connectionWithPassword);
this._model = connectionWithPassword;
this.uiController.fillInConnectionInputs(this._model);
}).catch(err => onUnexpectedError(err));
}
catch (err) {
this._logService.error(`Error filling in connection inputs with password. Original error message: ${err}`);
}
this._connectionDialog.updateProvider(this._providerNameToDisplayNameMap[connectionInfo.providerName]);
}
@@ -381,11 +386,11 @@ export class ConnectionDialogService implements IConnectionDialogService {
this.uiController.handleOnConnecting();
}
private updateModelServerCapabilities(model: IConnectionProfile) {
private async updateModelServerCapabilities(model: IConnectionProfile) {
if (this._model) {
this._model.dispose();
}
this._model = this.createModel(model);
this._model = await this.createModel(model);
if (this._model.providerName) {
this._currentProviderType = this._model.providerName;
if (this._connectionDialog) {
@@ -394,7 +399,7 @@ export class ConnectionDialogService implements IConnectionDialogService {
}
}
private createModel(model: IConnectionProfile): ConnectionProfile {
private async createModel(model: IConnectionProfile): Promise<ConnectionProfile> {
const defaultProvider = this.getDefaultProviderName();
let providerName = model ? model.providerName : defaultProvider;
providerName = providerName ? providerName : defaultProvider;
@@ -410,6 +415,14 @@ export class ConnectionDialogService implements IConnectionDialogService {
}
let newProfile = new ConnectionProfile(this._capabilitiesService, model || providerName);
if (!model.password) {
try {
await this._connectionManagementService.addSavedPassword(newProfile);
}
catch (err) {
this._logService.error(`Error filling in password for connection dialog model. Original error message: ${err}`);
}
}
newProfile.saveProfile = true;
newProfile.generateNewId();
// If connecting from a query editor set "save connection" to false
@@ -420,7 +433,7 @@ export class ConnectionDialogService implements IConnectionDialogService {
}
private async showDialogWithModel(): Promise<void> {
this.updateModelServerCapabilities(this._inputModel);
await this.updateModelServerCapabilities(this._inputModel);
await this.doShowDialog(this._params);
}
@@ -459,7 +472,7 @@ export class ConnectionDialogService implements IConnectionDialogService {
this._params = params;
this._inputModel = model;
this.updateModelServerCapabilities(model);
await this.updateModelServerCapabilities(model);
// If connecting from a query editor set "save connection" to false
if (params && (params.input && params.connectionType === ConnectionType.editor ||