Merge pull request #71 from TicketRack/proxy_auth_param

Accept proxy_auth parameter for hackney library

lib/httpoison/base.ex

@@ -178,11 +178,15 @@ defmodule HTTPoison.Base do
         recv_timeout = Keyword.get options, :recv_timeout
         stream_to = Keyword.get options, :stream_to
         proxy = Keyword.get options, :proxy
+        proxy_auth = Keyword.get options, :proxy_auth
+
         hn_options = Keyword.get options, :hackney, []
 
         if timeout, do: hn_options = [{:connect_timeout, timeout} | hn_options]
         if recv_timeout, do: hn_options = [{:recv_timeout, recv_timeout} | hn_options]
         if proxy, do: hn_options = [{:proxy, proxy} | hn_options]
+        if proxy_auth, do: hn_options = [{:proxy_auth, proxy_auth} | hn_options]
+
         if stream_to do
           hn_options = [:async, {:stream_to, spawn(__MODULE__, :transformer, [stream_to])} | hn_options]
         end

test/httpoison_base_test.exs

@@ -105,4 +105,17 @@ defmodule HTTPoisonBaseTest do
 
     assert validate :hackney
   end
+
+  test "passing proxy option with proxy_auth" do
+    expect(:hackney, :request, [{[:post, "http://localhost", [], "body", [proxy_auth: {"username", "password"}, proxy: "proxy"]],
+                                 {:ok, 200, "headers", :client}}])
+    expect(:hackney, :body, 1, {:ok, "response"})
+
+    assert HTTPoison.post!("localhost", "body", [], [proxy: "proxy", proxy_auth: {"username", "password"}]) ==
+    %HTTPoison.Response{ status_code: 200,
+                         headers: "headers",
+                         body: "response" }
+
+    assert validate :hackney
+  end
 end