Merge pull request #25 from core-api/client-auth

Use `Client(auth=...)` instead of deprecated `Client(credentials=...)`

Author: tomchristie

coreapi_cli/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.6"
+__version__ = "1.0.7"

coreapi_cli/auth.py

@@ -0,0 +1,21 @@
+from coreapi_cli.compat import urlparse
+from requests.auth import AuthBase
+
+
+class DomainCredentials(AuthBase):
+    allow_cookies = False
+    credentials = None
+
+    def __init__(self, credentials=None):
+        self.credentials = credentials
+
+    def __call__(self, request):
+        if not self.credentials:
+            return request
+
+        # Include any authorization credentials relevant to this domain.
+        url_components = urlparse.urlparse(request.url)
+        host = url_components.hostname
+        if host in self.credentials:
+            request.headers['Authorization'] = self.credentials[host]
+        return request

coreapi_cli/compat.py

@@ -0,0 +1,16 @@
+import json
+
+try:
+    # Python 3
+    JSONDecodeError = json.decoder.JSONDecodeError
+except AttributeError:
+    # Python 2
+    JSONDecodeError = ValueError
+
+
+try:
+    # Python 2
+    import urlparse    # noqa
+except ImportError:
+    # Python 3
+    import urllib.parse as urlparse  # noqa

coreapi_cli/main.py

@@ -1,6 +1,8 @@
 from coreapi.compat import b64encode, force_bytes
 from coreapi_cli import __version__ as client_version
 from coreapi_cli import codec_plugins
+from coreapi_cli.auth import DomainCredentials
+from coreapi_cli.compat import JSONDecodeError
 from coreapi_cli.display import display
 from coreapi_cli.debug import DebugSession
 from coreapi_cli.history import History, dump_history, load_history
@@ -46,7 +48,7 @@ def coerce_key_types(doc, keys):
         if isinstance(active, coreapi.Array):
             try:
                 key = int(key)
-            except:
+            except ValueError:
                 pass
 
         # Descend through the document, so we can correctly identify
@@ -78,7 +80,7 @@ def get_client(decoders=None, debug=False):
         decoders = list(codec_plugins.decoders.values())
 
     http_transport = coreapi.transports.HTTPTransport(
-        credentials=credentials, headers=headers, session=session
+        auth=DomainCredentials(credentials), headers=headers, session=session
     )
     return coreapi.Client(decoders=decoders, transports=[http_transport])
 
@@ -268,7 +270,7 @@ def parse_params(ctx, param, tokens):
 
         try:
             pair = (field, json.loads(value))
-        except:
+        except JSONDecodeError:
             if value.startswith('{') or value.startswith('['):
                 # Guard against malformed composite objects being treated as strings.
                 raise click.BadParameter('Unclear if parameter "%s" should be interperted as a string or data. Use --data or --string instead.' % field)
@@ -288,7 +290,7 @@ def parse_json(ctx, param, tokens):
 
         try:
             pair = (field, json.loads(value))
-        except:
+        except JSONDecodeError:
             raise click.BadParameter('Could not parse value for data argument "%s"' % field)
         ret.append(pair)