handling the API key as bearer token

Author: david-schrenker

socketlabs/injectionapi/core/httprequest.py

@@ -9,6 +9,7 @@
 from ..version import __version__
 from ..proxy import Proxy
 
+from .stringextension import StringExtension
 from .httpendpoint import HttpEndpoint
 from .injectionresponseparser import InjectionResponseParser
 from .serialization.injectionrequest import InjectionRequest
@@ -28,7 +29,7 @@ class HttpRequestMethod(Enum):
         PUT = 2
         DELETE = 3
 
-    def __init__(self, method: HttpRequestMethod, endpoint: HttpEndpoint, timeout: int):
+    def __init__(self, method: HttpRequestMethod, endpoint: HttpEndpoint, timeout: int, authentication: str):
         """
         Creates a new instance of the HTTP Request class
         :param method: the HTTP request method
@@ -40,6 +41,14 @@ def __init__(self, method: HttpRequestMethod, endpoint: HttpEndpoint, timeout: i
         self._endpoint = endpoint
         self._http_proxy = None
         self._timeout = timeout
+        self._authentication = authentication
+        self._headers = {
+            'User-Agent': self.__user_agent,
+            'Content-Type': 'application/json; charset=utf-8',
+            'Accept': 'application/json',
+        }
+        if not StringExtension.is_none_or_white_space(authentication):
+            self._headers["Authorization"] = "Bearer " + authentication
 
     @property
     def __user_agent(self):
@@ -108,7 +117,7 @@ def send_async_request(self, request: InjectionRequest, on_success_callback, on_
         """
 
         try:
-
+            print (request)
             th = threading.Thread(target=self.__queue_request,
                                   kwargs={
                                       "request": request,
@@ -143,17 +152,12 @@ def send_request(self, request: InjectionRequest):
         :return the injection response received from the request
         :rtype InjectionResponse
         """
-        headers = {
-            'User-Agent': self.__user_agent,
-            'Content-Type': 'application/json; charset=utf-8',
-            'Accept': 'application/json',
-        }
 
         json_body = json.dumps(request.to_json())
 
         try:
             connection = self.__get_connection()
-            connection.request("POST", self._endpoint.url, json_body, headers)
+            connection.request("POST", self._endpoint.url, json_body, self._headers)
             response = connection.getresponse()
 
         except Exception as e:

socketlabs/injectionapi/core/injectionresponseparser.py

@@ -60,7 +60,7 @@ def get_injection_response_dto(response: str):
 
     if 'MessageResults' in dct:
         resp_dto.message_results = []
-        for item in dct['MessageResults']:
+        for item in dct['MessageResults'] or []:
             message_dto = MessageResultDto()
             if 'Index' in item:
                 message_dto.index = item['Index']