Remove partial urls (#33)

Author: katarina-vardic-4ss

docs/user_guide/api_calls.rst

@@ -9,11 +9,6 @@ For the complete overview of available API calls see `4Insight REST API`_.
 
     response = session.get("https://api.4insight.io/v1.1/Campaigns")
 
-    # or with relative url
-
-    response = session.get("/v1.1/Campaigns")
-
-
 Some API endpoints support OData and have paging, which returns a limited number of responses per page. 
 For these endpoints, the ``get_pages`` method can be useful:
 

docs/user_guide/logging.rst

@@ -18,7 +18,7 @@ For instance, outputing the log to ``stdout`` can be done in the following manne
     logger.addHandler(handler)
 
     session = UserSession()
-    response = session.get("/v1.0/Campaigns")
+    response = session.get("https://api.4insight.io/v1.1/Campaigns")
 
 
 If you require even more detailed logging, consider using loggers from

fourinsight/api/__init__.py

@@ -4,4 +4,4 @@
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 
-__version__ = "0.0.3"
+__version__ = "0.0.1"

fourinsight/api/authenticate.py

@@ -184,32 +184,13 @@ def _prepare_refresh_token_args(self):
     @_request_logger
     def request(self, *args, **kwargs):
         """
-        Extend the ``requests_oauthlib.OAuth2Session.request`` method to
-        allow relative urls and supply default arguments.
+        Extend the ``requests_oauthlib.OAuth2Session.request`` method
+        to supply default arguments.
         """
-        args, kwargs = self._update_args_kwargs(args, kwargs)
-        response = super().request(*args, **kwargs)
-        return response
-
-    def _update_args_kwargs(self, args, kwargs):
-        """
-        Update args and kwargs before passing on to request.
-        """
-        if not args:
-            method = kwargs.pop("method")
-            url = kwargs.pop("url")
-        elif len(args) == 1:
-            method = args[0]
-            url = kwargs.pop("url")
-        else:
-            method, url = args[:2]
-
-        if not url.startswith("https://"):
-            url = self._api_base_url + url
-
         for key in self._defaults:
             kwargs.setdefault(key, self._defaults[key])
-        return (method, url, *args[2:]), kwargs
+        response = super().request(*args, **kwargs)
+        return response
 
     def get_pages(self, url, **kwargs):
         r"""

tests/test_authenticator.py

@@ -425,77 +425,59 @@ class Test_BaseAuthSession:
     provided by BaseAuthSession.
     """
 
-    def test_update_args_kwargs_error(self, mock_fetch, mock_refresh):
-        auth = authenticate.ClientSession("my_client_id", "my_client_secret")
-
-        args = ()
-        kwargs = {"something": 1}
-
-        with pytest.raises(KeyError):
-            auth._update_args_kwargs(args, kwargs)
-
-    def test_update_args_kwargs_args_none(self, mock_fetch, mock_refresh):
+    @patch("fourinsight.api.authenticate.OAuth2Session.request")
+    def test_request_check_default(self, mock_request, mock_fetch, mock_refresh):
         auth = authenticate.ClientSession("my_client_id", "my_client_secret")
+        args = ("https://api.4insight.io/v1.0/Campaigns",)
+        kwargs = {
+            "other": "thing",
+        }
 
-        args = ()
-        kwargs = {"method": "GET", "url": "/v1.0/ding/dong", "other": "thing"}
-
-        args_out, kwargs_out = auth._update_args_kwargs(args, kwargs)
+        auth.get(*args, **kwargs)
 
-        assert (
-            args
-            + (
-                "GET",
-                auth._api_base_url + "/v1.0/ding/dong",
-            )
-            == args_out
+        mock_request.assert_called_with(
+            "GET",
+            "https://api.4insight.io/v1.0/Campaigns",
+            other="thing",
+            allow_redirects=True,
+            timeout=auth._defaults["timeout"],
         )
-        assert {"timeout": auth._defaults["timeout"], "other": "thing"} == kwargs_out
-
-    def test_update_args_kwargs_args_len_1(self, mock_fetch, mock_refresh):
-        auth = authenticate.ClientSession("my_client_id", "my_client_secret")
-
-        args = ("get",)
-        kwargs = {"url": "/v1.0/ding/dong", "other": "thing"}
 
-        args_out, kwargs_out = auth._update_args_kwargs(args, kwargs)
-
-        assert args + (auth._api_base_url + "/v1.0/ding/dong",) == args_out
-        assert {"timeout": auth._defaults["timeout"], "other": "thing"} == kwargs_out
-
-    def test_update_args_kwargs_args(self, mock_fetch, mock_refresh):
-        auth = authenticate.ClientSession("my_client_id", "my_client_secret")
-
-        args = ("get", "/v1.0/ding/dong")
-        kwargs = {"other": "thing"}
-
-        args_out, kwargs_out = auth._update_args_kwargs(args, kwargs)
-
-        assert args[:1] + (auth._api_base_url + "/v1.0/ding/dong",) == args_out
-        assert {"timeout": auth._defaults["timeout"], "other": "thing"} == kwargs_out
-
-    def test_update_args_kwargs_args_long(self, mock_fetch, mock_refresh):
+    @patch("fourinsight.api.authenticate.OAuth2Session.request")
+    def test_request_args(self, mock_request, mock_fetch, mock_refresh):
         auth = authenticate.ClientSession("my_client_id", "my_client_secret")
-
-        args = ("get", "/v1.0/ding/dong", "something")
+        args = ("https://api.4insight.io/v1.0/Campaigns",)
         kwargs = {"other": "thing"}
 
-        args_out, kwargs_out = auth._update_args_kwargs(args, kwargs)
+        auth.get(*args, **kwargs)
 
-        assert (
-            args[:1] + (auth._api_base_url + "/v1.0/ding/dong",) + args[2:] == args_out
+        mock_request.assert_called_with(
+            "GET",
+            "https://api.4insight.io/v1.0/Campaigns",
+            other="thing",
+            allow_redirects=True,
+            **auth._defaults,
         )
-        assert {"timeout": auth._defaults["timeout"], "other": "thing"} == kwargs_out
 
     @patch("fourinsight.api.authenticate.OAuth2Session.request")
-    def test_request_relative_path(self, mock_request, mock_fetch, mock_refresh):
+    def test_request_args_none(self, mock_request, mock_fetch, mock_refresh):
         auth = authenticate.ClientSession("my_client_id", "my_client_secret")
-        args = ("/v1.0/ding/dong",)
+        args = ()
+        kwargs = {
+            "url": "https://api.4insight.io/v1.0/Campaigns",
+            "other": "thing",
+            "another": "one",
+        }
 
-        auth.get(*args)
+        auth.get(*args, **kwargs)
 
         mock_request.assert_called_with(
-            "GET", auth._api_base_url + args[0], allow_redirects=True, **auth._defaults
+            "GET",
+            "https://api.4insight.io/v1.0/Campaigns",
+            other="thing",
+            another="one",
+            allow_redirects=True,
+            **auth._defaults,
         )
 
     @patch("fourinsight.api.authenticate.OAuth2Session.request")