Pull request #2: Fix failing phoneid/REST client in python_telesign sdk

Merge in SDK/python_telesign from hotfix/92035 to master

* commit 'b36f998c8b3457f59c07ddf08a247d410d4b7eec':
  Fix import
  Take variables of env
  fix import module
  Fix issue method phoneid
  Fix issue method phoneid

Author: jmartinez-telesign

telesign/phoneid.py

@@ -24,31 +24,5 @@ def phoneid(self, phone_number, **params):
         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 platform import python_version
 
 import requests
+import json
 
 import telesign
 from telesign.util import AuthMethod
@@ -118,14 +119,14 @@ def generate_telesign_headers(customer_id,
             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 @@ def generate_telesign_headers(customer_id,
 
         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 @@ def post(self, resource, body=None, **query_params):
         :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 @@ def get(self, resource, body=None, **query_params):
         :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 @@ def put(self, resource, body=None, **query_params):
         :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 @@ def delete(self, resource, body=None, **query_params):
         :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 @@ def _execute(self, method_function, method_name, resource, body=None, **query_pa
         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 @@ def _execute(self, method_function, method_name, resource, body=None, **query_pa
                                                        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}
 

tests/test_phoneid.py

@@ -0,0 +1,48 @@
+from __future__ import unicode_literals
+import os
+from unittest import TestCase
+from telesign.phoneid import PhoneIdClient
+
+class TestPhoneId(TestCase):
+    def setUp(self):
+        self.customer_id = os.getenv('CUSTOMER_ID', 'FFFFFFFF-EEEE-DDDD-1234-AB1234567890')
+        self.api_key = os.getenv('API_KEY', 'EXAMPLE----TE8sTgg45yusumoN6BYsBVkh+yRJ5czgsnCehZaOYldPJdmFh6NeX8kunZ2zU1YWaUw/0wV6xfw==')
+        self.phone_number_test = "11234567890"
+
+    def test_phoneid_constructor(self):
+
+        client = PhoneIdClient(self.customer_id,
+                            self.api_key)
+
+        self.assertEqual(client.customer_id, self.customer_id)
+        self.assertEqual(client.api_key, self.api_key)
+        
+
+    def test_phoneid_pid_contact(self):
+
+        client = PhoneIdClient(self.customer_id, self.api_key)
+        content_type_expected = 'application/json'
+        status_code_expected = 200
+        
+        payload = {  
+            "addons": {
+                "contact": {}
+            },
+            "phone_number": self.phone_number_test
+        }
+
+        response = client.phoneid(**payload)
+
+        self.assertEqual(response.headers.get('Content-Type'), content_type_expected, "Content-Type args do not match expected")
+        self.assertEqual(response.status_code, status_code_expected, "Status code args do not match expected")
+
+    def test_phoneid_pid(self):
+
+        client = PhoneIdClient(self.customer_id, self.api_key)
+        content_type_expected = 'application/json'
+        status_code_expected = 200
+
+        response = client.phoneid(self.phone_number_test)
+
+        self.assertEqual(response.headers.get('Content-Type'), content_type_expected, "Content-Type args do not match expected")
+        self.assertEqual(response.status_code, status_code_expected, "Status code args do not match expected")