ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-16 09:35:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add AuthenticationType enum to typings (#20699)

Browse Source 
* Add AuthenticationType enum to typings

* fix

* const

* Add comments

* fix comment

* remove unused
This commit is contained in:
Charles Gagnon
2022-09-30 16:49:36 -07:00
committed by GitHub
parent d6d75d8817
commit 85dc506a3c
49 changed files with 236 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/sql-database-projects/src/models/connections/connectionService.ts
View File

@@ -3,10 +3,10 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import * as azdata from 'azdata';
import * as constants from '../../common/constants';
import * as utils from '../../common/utils';
import * as vscode from 'vscode';
import { ConnectionResult } from 'azdata';
import { IFireWallRuleError } from 'vscode-mssql';
import { ISqlConnectionProperties } from 'sqldbproj';
@@ -28,7 +28,7 @@ export class ConnectionService {
* @param database database name
* @returns
*/
private async connectToDatabase(profile: ISqlConnectionProperties, saveConnectionAndPassword: boolean, database: string): Promise<ConnectionResult | string | undefined> {
private async connectToDatabase(profile: ISqlConnectionProperties, saveConnectionAndPassword: boolean, database: string): Promise<azdata.ConnectionResult | string | undefined> {
const azdataApi = utils.getAzdataApi();
const vscodeMssqlApi = azdataApi ? undefined : await utils.getVscodeMssqlApi();
if (azdataApi) {
@@ -43,7 +43,7 @@ export class ConnectionService {
id: '',
connectionName: profile.profileName,
options: [],
authenticationType: 'SqlLogin'
authenticationType: azdata.connection.AuthenticationType.SqlLogin
};
return await azdataApi.connection.connect(connectionProfile, saveConnectionAndPassword, false);
} else if (vscodeMssqlApi) {
@@ -54,7 +54,7 @@ export class ConnectionService {
database: database,
savePassword: saveConnectionAndPassword,
user: profile.userName,
authenticationType: 'SqlLogin',
authenticationType: azdata.connection.AuthenticationType.SqlLogin,
encrypt: false,
connectTimeout: 30,
applicationName: 'SQL Database Project',
@@ -112,12 +112,12 @@ export class ConnectionService {
* @param connection connection result or connection Id
* @returns validation result
*/
private async validateConnection(connection: ConnectionResult | string | undefined): Promise<utils.ValidationResult> {
private async validateConnection(connection: azdata.ConnectionResult | string | undefined): Promise<utils.ValidationResult> {
const azdataApi = utils.getAzdataApi();
if (!connection) {
return { validated: false, errorMessage: constants.connectionFailedError('No result returned') };
} else if (azdataApi) {
const connectionResult = <ConnectionResult>connection;
const connectionResult = <azdata.ConnectionResult>connection;
if (connectionResult) {
const connected = connectionResult !== undefined && connectionResult.connected && connectionResult.connectionId !== undefined;
return { validated: connected, errorMessage: connected ? '' : constants.connectionFailedError(connectionResult?.errorMessage!) };
@@ -134,9 +134,9 @@ export class ConnectionService {
* @param connection connection result or connection Id
* @returns formatted connection result
*/
private async formatConnectionResult(connection: ConnectionResult | string | undefined): Promise<string> {
private async formatConnectionResult(connection: azdata.ConnectionResult | string | undefined): Promise<string> {
const azdataApi = utils.getAzdataApi();
const connectionResult = connection !== undefined && azdataApi ? <ConnectionResult>connection : undefined;
const connectionResult = connection !== undefined && azdataApi ? <azdata.ConnectionResult>connection : undefined;
return connectionResult?.connected ? connectionResult.connectionId! : <string>connection;
}
@@ -160,7 +160,7 @@ export class ConnectionService {
this.defaultSqlNumberOfRetries, profile.connectionRetryTimeout || this.defaultSqlRetryTimeoutInSec);
if (connection) {
const connectionResult = <ConnectionResult>connection;
const connectionResult = <azdata.ConnectionResult>connection;
if (azdataApi) {
utils.throwIfNotConnected(connectionResult);
return azdataApi.connection.getUriForConnection(connectionResult.connectionId!);

7
extensions/sql-database-projects/src/models/dataSources/sqlConnectionStringSource.ts
View File

@@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import type * as azdataType from 'azdata';
import * as vscodeMssql from 'vscode-mssql';
import { DataSource } from './dataSources';
import * as constants from '../../common/constants';
@@ -44,11 +45,11 @@ export class SqlConnectionDataSource extends DataSource {
public get authType(): string {
if (this.azureMFA) {
return constants.azureMfaAuth;
return vscodeMssql.AuthenticationType.AzureMFA;
} else if (this.integratedSecurity) {
return constants.integratedAuth;
return vscodeMssql.AuthenticationType.Integrated;
} else {
return constants.sqlAuth;
return 'SqlAuth';
}
}