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

Clear Azure token if connection doesn't need it (#6244)

Browse Source 
* Clear Azure token if connection doesn't need it

* Update function name
This commit is contained in:
Charles Gagnon
2019-07-02 21:01:53 +00:00
committed by GitHub
parent 7b88800c62
commit 49619e5b39
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sql/platform/connection/common/connectionManagementService.ts
View File

@@ -237,7 +237,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
* @param connectionProfile Connection Profile * @param connectionProfile Connection Profile
*/ */
public async addSavedPassword(connectionProfile: IConnectionProfile): Promise<IConnectionProfile> { public async addSavedPassword(connectionProfile: IConnectionProfile): Promise<IConnectionProfile> {
await this.fillInAzureTokenIfNeeded(connectionProfile); await this.fillInOrClearAzureToken(connectionProfile);
return this._connectionStore.addSavedPassword(connectionProfile).then(result => result.profile); return this._connectionStore.addSavedPassword(connectionProfile).then(result => result.profile);
} }
@@ -277,7 +277,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
} }
// Fill in the Azure account token if needed and open the connection dialog if it fails // Fill in the Azure account token if needed and open the connection dialog if it fails
let tokenFillSuccess = await self.fillInAzureTokenIfNeeded(newConnection); let tokenFillSuccess = await self.fillInOrClearAzureToken(newConnection);
// If the password is required and still not loaded show the dialog // If the password is required and still not loaded show the dialog
if ((!foundPassword && self._connectionStore.isPasswordRequired(newConnection) && !newConnection.password) || !tokenFillSuccess) { if ((!foundPassword && self._connectionStore.isPasswordRequired(newConnection) && !newConnection.password) || !tokenFillSuccess) {
@@ -446,7 +446,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
if (callbacks.onConnectStart) { if (callbacks.onConnectStart) {
callbacks.onConnectStart(); callbacks.onConnectStart();
} }
let tokenFillSuccess = await this.fillInAzureTokenIfNeeded(connection); let tokenFillSuccess = await this.fillInOrClearAzureToken(connection);
if (!tokenFillSuccess) { if (!tokenFillSuccess) {
throw new Error(nls.localize('connection.noAzureAccount', 'Failed to get Azure account token for connection')); throw new Error(nls.localize('connection.noAzureAccount', 'Failed to get Azure account token for connection'));
} }
@@ -778,8 +778,17 @@ export class ConnectionManagementService extends Disposable implements IConnecti
return defaultProvider && this._providers.has(defaultProvider) ? defaultProvider : undefined; return defaultProvider && this._providers.has(defaultProvider) ? defaultProvider : undefined;
} }
private async fillInAzureTokenIfNeeded(connection: IConnectionProfile): Promise<boolean> { /**
if (connection.authenticationType !== Constants.azureMFA || connection.options['azureAccountToken']) { * Fills in the Azure account token if it's needed for this connection and doesn't already have one
* and clears it if it isn't.
* @param connection The connection to fill in or update
*/
private async fillInOrClearAzureToken(connection: IConnectionProfile): Promise<boolean> {
if (connection.authenticationType !== Constants.azureMFA) {
connection.options['azureAccountToken'] = undefined;
return true;
}
if (connection.options['azureAccountToken']) {
return true; return true;
} }
let accounts = await this._accountManagementService.getAccountsForProvider('azurePublicCloud'); let accounts = await this._accountManagementService.getAccountsForProvider('azurePublicCloud');