[incubator-gobblin] branch master updated: [GOBBLIN-862][GOBBLIN-551] Security token encryption support in SFDC connector

[hu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hutran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-gobblin.git


The following commit(s) were added to refs/heads/master by this push:
     new bd4a09a  [GOBBLIN-862][GOBBLIN-551] Security token encryption support in SFDC connector
bd4a09a is described below

commit bd4a09ab77a4447490b25e31bc98cafbda9f2847
Author: Monish Vachhani <mv...@linkedin.com>
AuthorDate: Wed Aug 21 11:06:12 2019 -0700

    [GOBBLIN-862][GOBBLIN-551] Security token encryption support in SFDC connector
    
    Closes #2718 from mvachhani/master
---
 .../main/java/org/apache/gobblin/salesforce/SalesforceConnector.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/SalesforceConnector.java b/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/SalesforceConnector.java
index 7683e30..1c89d84 100644
--- a/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/SalesforceConnector.java
+++ b/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/SalesforceConnector.java
@@ -82,7 +82,8 @@ public class SalesforceConnector extends RestApiConnector {
       String userName = this.state.getProp(ConfigurationKeys.SOURCE_CONN_USERNAME);
       String password = PasswordManager.getInstance(this.state)
           .readPassword(this.state.getProp(ConfigurationKeys.SOURCE_CONN_PASSWORD));
-      String securityToken = this.state.getProp(ConfigurationKeys.SOURCE_CONN_SECURITY_TOKEN);
+      String securityToken = PasswordManager.getInstance(this.state)
+          .readPassword(this.state.getProp(ConfigurationKeys.SOURCE_CONN_SECURITY_TOKEN));
       formParams.add(new BasicNameValuePair("grant_type", "password"));
       formParams.add(new BasicNameValuePair("username", userName));
       formParams.add(new BasicNameValuePair("password", password + securityToken));