Merge pull request #374 from aviskase/auth-honor-perrequest-options

Support per-request API key header overwrite by _request_options

CHANGELOG-MASTER.rst

@@ -4,3 +4,5 @@ Changelog-Master
 *This file will contain the Changelog of the master branch.*
 
 *The content will be used to build the Changelog of the new bravado release.*
+
+Support per-request API key header overwrite by `_request_options`

bravado/requests_client.py

@@ -67,7 +67,7 @@ def __init__(self, host, api_key, param_name=u'api_key', param_in=u'query'):
 
     def apply(self, request):
         if self.param_in == 'header':
-            request.headers[self.param_name] = self.api_key
+            request.headers.setdefault(self.param_name, self.api_key)
         else:
             request.params[self.param_name] = self.api_key
         return request

tests/http_client_test.py

@@ -134,6 +134,27 @@ def test_api_key_header(self):
                          httpretty.last_request().querystring)
         self.assertEqual('abc123', httpretty.last_request().headers['Key'])
 
+    @httpretty.activate
+    def test_api_key_header_overwrite(self):
+        httpretty.register_uri(
+            httpretty.GET, "http://swagger.py/client-test",
+            body='expected')
+
+        client = RequestsClient()
+        client.set_api_key("swagger.py", 'abc123', param_name='Key',
+                           param_in='header')
+        params = self._default_params()
+        params['params'] = {'foo': 'bar'}
+        params['headers'] = {'Key': 'def456'}
+
+        resp = client.request(params).result()
+
+        self.assertEqual(200, resp.status_code)
+        self.assertEqual('expected', resp.text)
+        self.assertEqual({'foo': ['bar']},
+                         httpretty.last_request().querystring)
+        self.assertEqual('def456', httpretty.last_request().headers['Key'])
+
     @httpretty.activate
     def test_auth_leak(self):
         httpretty.register_uri(