changing endpoint property to str and moving HttpEndpoint to __build_http_request

Author: david-schrenker

socketlabs/injectionapi/core/httpendpoint.py

@@ -1,18 +1,22 @@
+from urllib.parse import urlparse
+
 class HttpEndpoint(object):
     """
     The HTTP endpoint
     """
 
-    def __init__(self, host: str = None, url: str = None):
+    def __init__(self, url: str):
         """
         Create an instance of the HttpEndpoint class
         :param host: the host name
         :type host: str
         :param url: the url
         :type url: str
         """
-        self._host = host
-        self._url = url
+        parsed_url = urlparse(url)
+        self._host = parsed_url.hostname
+        self._url = parsed_url.path
+
 
     @property
     def url(self):

socketlabs/injectionapi/socketlabsclient.py

@@ -38,7 +38,7 @@ def __init__(self, server_id: int, api_key: str, proxy: Proxy = None):
         self._http_proxy = proxy
         self._request_timeout = 120
         self._number_of_retries = 0
-        self._http_endpoint = HttpEndpoint("inject.socketlabs.com", "/api/v1/email")
+        self._http_endpoint = "https://inject.socketlabs.com/api/v1/email"
 
     @property
     def endpoint(self):
@@ -49,8 +49,8 @@ def endpoint(self):
         """
         return self._http_endpoint
 
-    @property.setter
-    def endpoint(self, http_endpoint: HttpEndpoint):
+    @endpoint.setter
+    def endpoint(self, http_endpoint: str):
         """
         The SocketLabs Injection API endpoint
         :return the Http Endpoint for the request
@@ -101,7 +101,8 @@ def __build_http_request(self, authentication: str):
         :return the HttpRequest object to use for the request
         :rtype HttpRequest
         """
-        req = HttpRequest(HttpRequest.HttpRequestMethod.POST, self.__endpoint, self.request_timeout, authentication)
+        endpoint = HttpEndpoint(self.endpoint)
+        req = HttpRequest(HttpRequest.HttpRequestMethod.POST, endpoint, self.request_timeout, authentication)
         if self._http_proxy is not None:
             req.proxy = self._http_proxy
         return req