From 1fed1dff9cfc85c0d39f42afb5e0de9f4eb2c043 Mon Sep 17 00:00:00 2001
From: Shawn Fang <shafang@microsoft.com>
Date: Mon, 25 Feb 2019 00:15:00 -0800
Subject: [PATCH] Digest Support: init first connection with null headers

---
 .../impl/WebSocketProxyConnectionHandler.java | 35 +------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/azure-eventhubs/src/main/java/com/microsoft/azure/eventhubs/impl/WebSocketProxyConnectionHandler.java b/azure-eventhubs/src/main/java/com/microsoft/azure/eventhubs/impl/WebSocketProxyConnectionHandler.java
index 81220c338..e6ebc6758 100644
--- a/azure-eventhubs/src/main/java/com/microsoft/azure/eventhubs/impl/WebSocketProxyConnectionHandler.java
+++ b/azure-eventhubs/src/main/java/com/microsoft/azure/eventhubs/impl/WebSocketProxyConnectionHandler.java
@@ -58,8 +58,7 @@ protected void addTransportLayers(final Event event, final TransportInternal tra
         // after creating the socket to proxy
         final String hostName = event.getConnection().getHostname();
         final ProxyHandler proxyHandler = new ProxyHandlerImpl();
-        final Map<String, String> proxyHeader = getAuthorizationHeader();
-        proxy.configure(hostName, proxyHeader, proxyHandler, transport);
+        proxy.configure(hostName, null, proxyHandler, transport);
 
         transport.addTransportLayer(proxy);
 
@@ -119,38 +118,6 @@ public int getRemotePort() {
         return socketAddress.getPort();
     }
 
-    private Map<String, String> getAuthorizationHeader() {
-        final PasswordAuthentication authentication = Authenticator.requestPasswordAuthentication(
-                getRemoteHostName(),
-                null,
-                getRemotePort(),
-                "https",
-                "Event Hubs client websocket proxy support",
-                "basic",
-                null,
-                Authenticator.RequestorType.PROXY);
-        if (authentication == null) {
-            return null;
-        }
-
-        final String proxyUserName = authentication.getUserName();
-        final String proxyPassword = authentication.getPassword() != null
-                ? new String(authentication.getPassword())
-                : null;
-        if (StringUtil.isNullOrEmpty(proxyUserName)
-                || StringUtil.isNullOrEmpty(proxyPassword)) {
-            return null;
-        }
-
-        final HashMap<String, String> proxyAuthorizationHeader = new HashMap<>();
-        // https://tools.ietf.org/html/rfc7617
-        final String usernamePasswordPair = proxyUserName + ":" + proxyPassword;
-        proxyAuthorizationHeader.put(
-                "Proxy-Authorization",
-                "Basic " + Base64.getEncoder().encodeToString(usernamePasswordPair.getBytes()));
-        return proxyAuthorizationHeader;
-    }
-
     private InetSocketAddress getProxyAddress() {
         final URI serviceUri = createURIFromHostNamePort(
                 this.getAmqpConnection().getHostName(),