master: azure active directory askForPassword. Fixes #375

mtxr · Sep 28, 2019 · 2eb5efa · 2eb5efa
1 parent 14c00f3
commit 2eb5efa
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/packages/core/dialect/mssql/index.ts b/packages/core/dialect/mssql/index.ts
@@ -6,6 +6,7 @@ import * as Utils from '@sqltools/core/utils';
 import queries from './queries';
 import GenericDialect from '@sqltools/core/dialect/generic';
 import { DatabaseInterface } from '@sqltools/core/plugin-api';
+import get from 'lodash/get';
 
 export default class MSSQL extends GenericDialect<MSSQLLib.ConnectionPool> implements ConnectionDialect {
   queries = queries;
@@ -28,6 +29,12 @@ export default class MSSQL extends GenericDialect<MSSQLLib.ConnectionPool> imple
       encryptAttempt = encryptOverride;
     }
 
+    if (this.credentials.askForPassword && get(mssqlOptions, 'authentication.type') && get(mssqlOptions, 'authentication.options.userName')) {
+      mssqlOptions.authentication.options.password = mssqlOptions.authentication.options.password || this.credentials.password;
+      this.credentials.password = null;
+    }
+
+
     const pool = new MSSQLLib.ConnectionPool(this.credentials.connectString || {
       database: this.credentials.database,
       connectionTimeout: this.credentials.connectionTimeout * 1000,