1. Added domain in ProxyConfig

2. Added NTCredentials if domain not empty in HttpRequestClinent

Author: Kedar

oauth2-platform-api/src/main/java/com/intuit/oauth2/config/ProxyConfig.java

@@ -17,25 +17,25 @@
 
 /**
  * Config class to hold the proxy properties
- * 
- * @author dderose
  *
+ * @author dderose
  */
 public class ProxyConfig {
 
 	private String host;
 	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.host = builder.host;
+		this.port = builder.port;
+		this.username = builder.username;
+		this.password = builder.password;
+		this.domain = builder.domain;
 	}
-	
+
 	public String getHost() {
 		return host;
 	}
@@ -52,33 +52,43 @@ public String getPassword() {
 		return password;
 	}
 
+	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;
 			this.port = port;
 		}
-		
+
 		public ProxyConfigBuilder username(String username) {
 			this.username = username;
 			return this;
 		}
-		
+
 		public ProxyConfigBuilder password(String password) {
 			this.password = password;
 			return this;
 		}
 
+		public ProxyConfigBuilder domain(String domain) {
+			this.domain = domain;
+			return this;
+		}
+
 		public ProxyConfig buildConfig() {
 			return new ProxyConfig(this);
 		}
-		
+
 	}
 
-	   
+
 }

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

@@ -129,11 +129,9 @@ public CredentialsProvider setProxyAuthentication(ProxyConfig proxyConfig) {
 			String port = proxyConfig.getPort();
 			if (!host.isEmpty() && !port.isEmpty()) {
 				CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-				if (username.contains("/") || username.contains("\\")) {
-					int index = username.indexOf("/") > 0 ? username.indexOf("/") : username.indexOf("\\");
-					String domain = username.substring(0, index);
-					String user = username.substring(index + 1, username.length());
-					credentialsProvider.setCredentials(new AuthScope(host, Integer.parseInt(port)), new NTCredentials(user, password, host, domain));
+				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));
 				}