Fix clientSecret is null or empty for ActiveDirectoryServicePrincipal in Azure container (#1519)

lilgreenbird · web-flow · commit 567ae6ee992f · 2021-02-22T14:30:55.000-08:00
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
@@ -2766,8 +2766,6 @@ private InetSocketAddress connectHelper(ServerPortPlaceHolder serverInfo, int ti
 
         // We have successfully connected, now do the login. logon takes seconds timeout
         executeCommand(new LogonCommand());
-        aadPrincipalSecret = "";
-        activeConnectionProperties.remove(SQLServerDriverStringProperty.AAD_SECURE_PRINCIPAL_SECRET.toString());
         return inetSocketAddress;
     }
 
@@ -4458,6 +4456,9 @@ final void processFedAuthInfo(TDSReader tdsReader, TDSTokenHandler tdsTokenHandl
         }
 
         onFedAuthInfo(sqlFedAuthInfo, tdsTokenHandler);
+
+        aadPrincipalSecret = "";
+        activeConnectionProperties.remove(SQLServerDriverStringProperty.AAD_SECURE_PRINCIPAL_SECRET.toString());
     }
 
     final class FedAuthTokenCommand extends UninterruptableTDSCommand {

Original file line number	Diff line number	Diff line change
`@@ -2766,8 +2766,6 @@ private InetSocketAddress connectHelper(ServerPortPlaceHolder serverInfo, int ti`
`2766`	`2766`
`2767`	`2767`	`// We have successfully connected, now do the login. logon takes seconds timeout`
`2768`	`2768`	`executeCommand(new LogonCommand());`
`2769`		`- aadPrincipalSecret = "";`
`2770`		`- activeConnectionProperties.remove(SQLServerDriverStringProperty.AAD_SECURE_PRINCIPAL_SECRET.toString());`
`2771`	`2769`	`return inetSocketAddress;`
`2772`	`2770`	`}`
`2773`	`2771`
`@@ -4458,6 +4456,9 @@ final void processFedAuthInfo(TDSReader tdsReader, TDSTokenHandler tdsTokenHandl`
`4458`	`4456`	`}`
`4459`	`4457`
`4460`	`4458`	`onFedAuthInfo(sqlFedAuthInfo, tdsTokenHandler);`
	`4459`	`+`
	`4460`	`+ aadPrincipalSecret = "";`
	`4461`	`+ activeConnectionProperties.remove(SQLServerDriverStringProperty.AAD_SECURE_PRINCIPAL_SECRET.toString());`
`4461`	`4462`	`}`
`4462`	`4463`
`4463`	`4464`	`final class FedAuthTokenCommand extends UninterruptableTDSCommand {`