telesign 2.2.3__py2.py3-none-any.whl → 2.2.4__py2.py3-none-any.whl

telesign/phoneid.py

@@ -24,31 +24,5 @@ class PhoneIdClient(RestClient):
         See https://developer.telesign.com/docs/phoneid-api for detailed API documentation.
         """
         return self.post(PHONEID_RESOURCE.format(phone_number=phone_number),
-                         **params)
-
-    def _execute(self, method_function, method_name, resource, **params):
-        resource_uri = "{api_host}{resource}".format(api_host=self.api_host, resource=resource)
-
-        json_fields = json.dumps(params)
-
-        content_type = "application/json" if method_name in ("POST", "PUT") else ""
-
-        headers = self.generate_telesign_headers(self.customer_id,
-                                                 self.api_key,
-                                                 method_name,
-                                                 resource,
-                                                 json_fields,
-                                                 user_agent=self.user_agent,
-                                                 content_type=content_type)
-
-        if method_name in ['POST', 'PUT']:
-            payload = {'data': json_fields}
-        else:
-            payload = {'params': json_fields}
-
-        response = self.Response(method_function(resource_uri,
-                                                 headers=headers,
-                                                 timeout=self.timeout,
-                                                 **payload))
-
-        return response
+                        json_fields=params,
+                        **params)

telesign/rest.py

@@ -8,6 +8,7 @@ from hashlib import sha256
 from platform import python_version
 
 import requests
+import json
 
 import telesign
 from telesign.util import AuthMethod
@@ -118,14 +119,14 @@ class RestClient(requests.models.RequestEncodingMixin):
             content_type = "application/x-www-form-urlencoded" if method_name in ("POST", "PUT") else ""
 
         # Default auth_method is Digest if not explicitly specified
-        if auth_method == AuthMethod.BASIC.value:
+        if auth_method == AuthMethod.BASIC:
             usr_apikey = "{customer_id}:{api_key}".format(customer_id=customer_id,
                                                           api_key=api_key)
             b64val = b64encode(usr_apikey.encode())
-            authorization = "{auth_method} {b64val}".format(auth_method=AuthMethod.BASIC.value,
+            authorization = "{auth_method} {b64val}".format(auth_method=AuthMethod.BASIC,
                                                             b64val=b64val.decode())
         else:
-            auth_method = AuthMethod.HMAC_SHA256.value
+            auth_method = AuthMethod.HMAC_SHA256
 
             string_to_sign_builder = ["{method}".format(method=method_name)]
 
@@ -164,7 +165,7 @@ class RestClient(requests.models.RequestEncodingMixin):
 
         return headers
 
-    def post(self, resource, body=None, **query_params):
+    def post(self, resource, body=None, json_fields=None, **query_params):
         """
         Generic TeleSign REST API POST handler.
 
@@ -173,9 +174,9 @@ class RestClient(requests.models.RequestEncodingMixin):
         :param query_params: query_params to perform the POST request with, as a dictionary.
         :return: The RestClient Response object.
         """
-        return self._execute(self.session.post, 'POST', resource, body, **query_params)
+        return self._execute(self.session.post, 'POST', resource, body, json_fields, **query_params)
 
-    def get(self, resource, body=None, **query_params):
+    def get(self, resource, body=None, json_fields=None, **query_params):
         """
         Generic TeleSign REST API GET handler.
 
@@ -184,9 +185,9 @@ class RestClient(requests.models.RequestEncodingMixin):
         :param query_params: query_params to perform the GET request with, as a dictionary.
         :return: The RestClient Response object.
         """
-        return self._execute(self.session.get, 'GET', resource, body, **query_params)
+        return self._execute(self.session.get, 'GET', resource, body, json_fields, **query_params)
 
-    def put(self, resource, body=None, **query_params):
+    def put(self, resource, body=None, json_fields=None, **query_params):
         """
         Generic TeleSign REST API PUT handler.
 
@@ -195,9 +196,9 @@ class RestClient(requests.models.RequestEncodingMixin):
         :param query_params: query_params to perform the PUT request with, as a dictionary.
         :return: The RestClient Response object.
         """
-        return self._execute(self.session.put, 'PUT', resource, body, **query_params)
+        return self._execute(self.session.put, 'PUT', resource, body, json_fields, **query_params)
 
-    def delete(self, resource, body=None, **query_params):
+    def delete(self, resource, body=None, json_fields=None, **query_params):
         """
         Generic TeleSign REST API DELETE handler.
 
@@ -206,9 +207,9 @@ class RestClient(requests.models.RequestEncodingMixin):
         :param query_params: query_params to perform the DELETE request with, as a dictionary.
         :return: The RestClient Response object.
         """
-        return self._execute(self.session.delete, 'DELETE', resource, body, **query_params)
+        return self._execute(self.session.delete, 'DELETE', resource, body, json_fields, **query_params)
 
-    def _execute(self, method_function, method_name, resource, body=None, **query_params):
+    def _execute(self, method_function, method_name, resource, body=None, json_fields=None, **query_params):
         """
         Generic TeleSign REST API request handler.
 
@@ -222,7 +223,11 @@ class RestClient(requests.models.RequestEncodingMixin):
         resource_uri = "{api_host}{resource}".format(api_host=self.api_host, resource=resource)
 
         url_encoded_fields = self._encode_params(query_params)
-        if body:
+        if json_fields:
+            fields = json.dumps(json_fields)
+            url_encoded_fields = fields
+
+        if body or json_fields:
             content_type = "application/json"
         else:
             content_type = None  # set later
@@ -235,13 +240,14 @@ class RestClient(requests.models.RequestEncodingMixin):
                                                        user_agent=self.user_agent,
                                                        content_type=content_type,
                                                        auth_method=self.auth_method)
-
         if method_name in ['POST', 'PUT']:
             payload = {}
             if body:
                 payload['json'] = body
             if query_params:
                 payload['data'] = url_encoded_fields
+            if json_fields:
+                payload = {'data': url_encoded_fields}
         else:
             payload = {'params': url_encoded_fields}
 

{telesign-2.2.3.dist-info → telesign-2.2.4.dist-info}/METADATA

@@ -1,12 +1,13 @@
 Metadata-Version: 2.1
 Name: telesign
-Version: 2.2.3
+Version: 2.2.4
 Summary: TeleSign SDK
 Home-page: https://github.com/telesign/python_telesign
 Author: TeleSign Corp.
 Author-email: support@telesign.com
 License: MIT
 Keywords: telesign,sms,voice,mobile,authentication,identity,messaging
+Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -20,7 +21,6 @@ Classifier: Programming Language :: Python :: 3.3
 Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
-License-File: LICENSE.txt
 Requires-Dist: requests
 
 .. image:: https://raw.github.com/TeleSign/python_telesign/master/python_banner.jpg
@@ -105,7 +105,7 @@ Here is a basic code example with the JSON response.
     print(response.json)
 
 .. code-block:: javascript
-       
+
     {'reference_id': 'DGFDF6E11AB86303ASDFD425BE00000657',
      'status': {'code': 103,
         'description': 'Call in progress',
@@ -113,3 +113,5 @@ Here is a basic code example with the JSON response.
 
 For more examples, see the `examples <https://github.com/TeleSign/python_telesign/tree/master/examples>`_ folder or
 visit the `TeleSign Standard Documentation <https://standard.telesign.com/>`_.
+
+

{telesign-2.2.3.dist-info → telesign-2.2.4.dist-info}/RECORD

@@ -2,13 +2,13 @@ telesign/__init__.py,sha256=D8kANX0FKxBD7-a7xQ21xPz3ojM2WAOK8lThGLtDZuE,367
 telesign/appverify.py,sha256=wBeaeUxGmYcZkrbxkkXlG3-0oZr5sVvegzVpdvaoO2A,1195
 telesign/intelligence.py,sha256=t-xwlgxkXw1OMupF5K4_UKWeTArOr9XPvddmqgZftPI,1452
 telesign/messaging.py,sha256=v7l-eKUPqz7Nrwka0YNPMkC2TaoFUvQm3yp_djuTPu0,1367
-telesign/phoneid.py,sha256=czEVgjDmbbWgDGanqclNhlmAYkD1jLYhEOXQs7M9F88,2111
-telesign/rest.py,sha256=BtiRi0dc5h4OiWapdsfSBvLLwXB5swrwiACT7R-UAkc,11058
+telesign/phoneid.py,sha256=mk03NxL3wlaXpd8b-BB6q_SKfCxbtuTO19ayAHxmzz0,954
+telesign/rest.py,sha256=PsrVpzRznfJVv7QxXM-1x62BdAuAUJeNqsXRaIYaYOc,11401
 telesign/score.py,sha256=Kceu6IrirN9SsuT1geEWs0QHAn6H9ZNFyIDVHcBJdwg,908
 telesign/util.py,sha256=stDxpL5ZQeGskE_OSGP04UFHs3ZP2ACaRpW1WyQGMHg,1624
 telesign/voice.py,sha256=DJaWyQpun-T7LfNjpxpsUjupiv2ShW1jqoFQA-CE2-Y,1341
-telesign-2.2.3.dist-info/LICENSE.txt,sha256=a--xZ4PCKUL5rpct8RrUC6ODU_8ZKIU51kJPfsA4HUs,1058
-telesign-2.2.3.dist-info/METADATA,sha256=0XcO1v2ZEwFJt2yzWdUH_L6tc7zAXLJeRxZQ3WieMF0,4545
-telesign-2.2.3.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
-telesign-2.2.3.dist-info/top_level.txt,sha256=6LG7Jcr1jnpVhOWaIShoTdwYJn0QCfPhfudyVJNz1qg,9
-telesign-2.2.3.dist-info/RECORD,,
+telesign-2.2.4.dist-info/LICENSE.txt,sha256=a--xZ4PCKUL5rpct8RrUC6ODU_8ZKIU51kJPfsA4HUs,1058
+telesign-2.2.4.dist-info/METADATA,sha256=AydnJnTgwrypVvEq8hcDJosiAx1TJPZPP4zpxgszbw0,4532
+telesign-2.2.4.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
+telesign-2.2.4.dist-info/top_level.txt,sha256=6LG7Jcr1jnpVhOWaIShoTdwYJn0QCfPhfudyVJNz1qg,9
+telesign-2.2.4.dist-info/RECORD,,

{telesign-2.2.3.dist-info → telesign-2.2.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: bdist_wheel (0.37.1)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any