ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-10 10:12:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes import wizard to work with enabled SQL auth provider (#23004)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-05-08 21:36:05 -07:00
committed by GitHub
parent 0d8e1882fa
commit f7bc38d552
2 changed files with 73 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
extensions/import/src/wizard/pages/summaryPage.ts
View File

@@ -9,6 +9,7 @@ import { ImportPage } from '../api/importPage';
import { InsertDataResponse } from '../../services/contracts';
import * as constants from '../../common/constants';
import { EOL } from 'os';
import { isMssqlAuthProviderEnabled } from '../../common/utils';
export class SummaryPage extends ImportPage {
private _table: azdata.TableComponent;
@@ -137,10 +138,14 @@ export class SummaryPage extends ImportPage {
const currentServer = this.model.server;
const includePasswordInConnectionString = (currentServer.options.authenticationType === azdata.connection.AuthenticationType.Integrated) ? false : true;
const connectionString = await azdata.connection.getConnectionString(currentServer.connectionId, includePasswordInConnectionString);
let connectionString = await azdata.connection.getConnectionString(currentServer.connectionId, includePasswordInConnectionString);
let accessToken = undefined;
if (currentServer.options.authenticationType === azdata.connection.AuthenticationType.AzureMFA) {
// Remove authentication properties from connection string if SQL Authentication Provider is enabled
if (isMssqlAuthProviderEnabled()) {
connectionString = this.updateConnectionStringForAccessToken(connectionString);
}
const azureAccount = (await azdata.accounts.getAllAccounts()).filter(v => v.key.accountId === currentServer.options.azureAccount)[0];
accessToken = (await azdata.accounts.getAccountSecurityToken(azureAccount, currentServer.options.azureTenantId, azdata.AzureResource.Sql)).token;
}
@@ -178,6 +183,21 @@ export class SummaryPage extends ImportPage {
});
}
/**
* Removes authentication related properties from connection string as SQL Tools Service now supports
* 'EnableSqlAuthenticationProvider' which sets the below properties on connection string that conflict with access token:
* 1. User Id
* 2. Authentication
* Since we need to set access token, we cannot use the same connection string as is.
* @param connString Connection string to fix
* @returns Updated connection string
*/
private updateConnectionStringForAccessToken(connString: string): string {
return connString ? connString.split(';').filter(prop =>
!['user', 'uid', 'password', 'pwd', 'authentication'].some(prefix => prop.toLocaleLowerCase().startsWith(prefix))
).join(';') : connString;
}
// private async getCountRowsInserted(): Promise<Number> {
// let connectionUri = await azdata.connection.getUriForConnection(this.model.server.connectionId);
// let queryProvider = azdata.dataprotocol.getProvider<azdata.QueryProvider>(this.model.server.providerName, azdata.DataProviderType.QueryProvider);