feat: add proxy support to OAuth sessions

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pysnc"
-version = "1.1.6a0"
+version = "1.1.7a0"
 description = "Python SNC (REST) API"
 authors = ["Matthew Gill <[email protected]>"]
 license = "MIT"

pysnc/auth.py

@@ -36,7 +36,7 @@ def __init__(self, username, password, client_id, client_secret):
     def authorization_url(self, authorization_base_url):
         return f"{authorization_base_url}/oauth_token.do"
 
-    def authenticate(self, instance: str) -> requests.Session:
+    def authenticate(self, instance: str, proxies: dict) -> requests.Session:
         """
         Designed to be called by ServiceNowClient - internal method.
         """
@@ -49,7 +49,7 @@ def authenticate(self, instance: str) -> requests.Session:
                                   auto_refresh_kwargs=dict(client_id=self.client_id, client_secret=self.__secret))
             oauth.fetch_token(token_url=self.authorization_url(instance),
                               username=self.__username, password=self.__password, client_id=self.client_id,
-                              client_secret=self.__secret)
+                              client_secret=self.__secret, proxies=proxies)
             self.__password = None  # no longer need this.
             return oauth
         except ImportError:

pysnc/client.py

@@ -33,6 +33,15 @@ def __init__(self, instance, auth, proxy=None, verify=None, cert=None, auto_retr
         self._log = logging.getLogger(__name__)
         self.__instance = get_instance(instance)
 
+        if proxy:
+            if type(proxy) != dict:
+                proxies = dict(http=proxy, https=proxy)
+            else:
+                proxies = proxy
+            self.__proxies = proxies
+            if verify is None:
+                verify = True  # default to verify with proxy
+
         if auth is not None and cert is not None:
             raise AuthenticationException('Cannot specify both auth and cert')
         elif isinstance(auth, (list, tuple)) and len(auth) == 2:
@@ -48,20 +57,15 @@ def __init__(self, instance, auth, proxy=None, verify=None, cert=None, auto_retr
             # maybe we've got an oauth token? Let this be permissive
             self.__session = auth
         elif isinstance(auth, ServiceNowFlow):
-            self.__session = auth.authenticate(self.__instance)
+            self.__session = auth.authenticate(self.__instance, self.__proxies)
         elif cert is not None:
             self.__session.cert = cert
         else:
             raise AuthenticationException('No valid authentication method provided')
 
         if proxy:
-            if type(proxy) != dict:
-                proxies = dict(http=proxy, https=proxy)
-            else:
-                proxies = proxy
-            self.__session.proxies = proxies
-            if verify is None:
-                verify = True  # default to verify with proxy
+            self.__session.proxies = self.__proxies
+
         if verify is not None:
             self.__session.verify = verify