changes to support NTCredentials

Author: diana-derose

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/HTTPBatchClientConnectionInterceptor.java

@@ -39,6 +39,7 @@
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.NTCredentials;
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.CredentialsProvider;
@@ -207,7 +208,12 @@ public CredentialsProvider setProxyAuthentication() {
             String port = Config.getProperty(Config.PROXY_PORT);
             if (StringUtils.hasText(host) && StringUtils.hasText(port)) {
                 CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-                credentialsProvider.setCredentials(new AuthScope(host, Integer.parseInt(port)), new UsernamePasswordCredentials(username, password));
+                String domain = Config.getProperty(Config.PROXY_DOMAIN);
+				if (StringUtils.hasText(domain)) {
+					credentialsProvider.setCredentials(new AuthScope(host, Integer.parseInt(port)), new NTCredentials(username, password, host, domain));
+				} else {
+					credentialsProvider.setCredentials(new AuthScope(host, Integer.parseInt(port)), new UsernamePasswordCredentials(username, password));
+				}
                 return credentialsProvider;
             }
         }

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/HTTPClientConnectionInterceptor.java

@@ -35,6 +35,7 @@
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.NTCredentials;
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.CredentialsProvider;
@@ -321,7 +322,12 @@ public CredentialsProvider setProxyAuthentication() {
 			String port = Config.getProperty(Config.PROXY_PORT);
 			if (StringUtils.hasText(host) && StringUtils.hasText(port)) {
 				CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-				credentialsProvider.setCredentials(new AuthScope(host, Integer.parseInt(port)), new UsernamePasswordCredentials(username, password));
+				String domain = Config.getProperty(Config.PROXY_DOMAIN);
+				if (StringUtils.hasText(domain)) {
+					credentialsProvider.setCredentials(new AuthScope(host, Integer.parseInt(port)), new NTCredentials(username, password, host, domain));
+				} else {
+					credentialsProvider.setCredentials(new AuthScope(host, Integer.parseInt(port)), new UsernamePasswordCredentials(username, password));
+				}
 				return credentialsProvider;
 			}
 		}

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/util/Config.java

@@ -76,6 +76,8 @@ public final class Config {
 	 */
 	public static final String PROXY_PASSWORD = "proxy.password";
 
+	public static final String PROXY_DOMAIN = "proxy.domain";
+	
 	/**
 	 * variable PROXY_KEYSTORE_PATH
 	 */

oauth2-platform-api/src/main/java/com/intuit/oauth2/http/HttpRequestClient.java

@@ -129,7 +129,7 @@ public CredentialsProvider setProxyAuthentication(ProxyConfig proxyConfig) {
 			String port = proxyConfig.getPort();
 			if (!host.isEmpty() && !port.isEmpty()) {
 				CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-				String domain=proxyConfig.getDomain();
+				String domain = proxyConfig.getDomain();
 				if (!domain.isEmpty()) {
 					credentialsProvider.setCredentials(new AuthScope(host, Integer.parseInt(port)), new NTCredentials(username, password, host, domain));
 				} else {

oauth2-platform-api/src/main/resources/oauthclient.properties

@@ -34,7 +34,7 @@ EMAIL=email
 INTUIT_NAME=intuit_name
 
 #Version
-version=5.0.2
+version=5.0.3
 
 #MIGRATION SERVICE URL
 OAUTH_MIGRATION_URL_PRODUCTION=https://developer.api.intuit.com/v2/oauth2/tokens/migrate

payments-api/src/main/java/com/intuit/payment/config/ProxyConfig.java

@@ -27,55 +27,43 @@ public class ProxyConfig {
 	private String port;
 	private String username;
 	private String password;
+	private String domain;
 
 	private ProxyConfig(ProxyConfigBuilder builder) {
 		this.host = builder.host;
 		this.port = builder.port;
 		this.username = builder.username;
 		this.password = builder.password;
-
+		this.domain = builder.domain;
 	}
 
-	/**
-	 * @return
-	 */
 	public String getHost() {
 		return host;
 	}
 
-	/**
-	 * @return
-	 */
 	public String getPort() {
 		return port;
 	}
 
-	/**
-	 * @return
-	 */
 	public String getUsername() {
 		return username;
 	}
 
-	/**
-	 * @return
-	 */
 	public String getPassword() {
 		return password;
 	}
 
-	/**
-	 * Builder class for ProxyConfig
-	 * 
-	 * @author dderose
-	 *
-	 */
+	public String getDomain() {
+		return domain;
+	}
+
 	public static class ProxyConfigBuilder {
 
 		private String host;
 		private String port;
 		private String username;
 		private String password;
+		private String domain;
 
 		public ProxyConfigBuilder(String host, String port) {
 			this.host = host;
@@ -92,10 +80,16 @@ public ProxyConfigBuilder password(String password) {
 			return this;
 		}
 
+		public ProxyConfigBuilder domain(String domain) {
+			this.domain = domain;
+			return this;
+		}
+
 		public ProxyConfig buildConfig() {
 			return new ProxyConfig(this);
 		}
 
 	}
 
+
 }

payments-api/src/main/java/com/intuit/payment/http/HttpRequestClient.java

@@ -31,6 +31,7 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
 import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.NTCredentials;
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.config.RequestConfig;
@@ -39,6 +40,7 @@
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.conn.ssl.SSLContexts;
@@ -89,8 +91,7 @@ public HttpRequestClient(ProxyConfig proxyConfig) {
 				"V3JavaSDK-payments-" + PropertiesConfig.getInstance().getProperty("version")));
 
 		// build the client
-		Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory> create()
-				.register("https", prepareClientSSL()).build();
+		Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory>create().register("https", prepareClientSSL()).register("http", new PlainConnectionSocketFactory()).build();
 		PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
 		HttpClientBuilder hcBuilder = HttpClients.custom().setConnectionManager(cm).setDefaultRequestConfig(config)
 				.setDefaultHeaders(headers).setMaxConnPerRoute(10)
@@ -173,8 +174,12 @@ public CredentialsProvider setProxyAuthentication(ProxyConfig proxyConfig) {
 			String port = proxyConfig.getPort();
 			if (!host.isEmpty() && !port.isEmpty()) {
 				CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-				credentialsProvider.setCredentials(new AuthScope(host, Integer.parseInt(port)),
-						new UsernamePasswordCredentials(username, password));
+				String domain = proxyConfig.getDomain();
+				if (!domain.isEmpty()) {
+					credentialsProvider.setCredentials(new AuthScope(host, Integer.parseInt(port)), new NTCredentials(username, password, host, domain));
+				} else {
+					credentialsProvider.setCredentials(new AuthScope(host, Integer.parseInt(port)), new UsernamePasswordCredentials(username, password));
+				}
 				return credentialsProvider;
 			}
 		}