Merge branch 'master' of https://github.com/sassoftware/python-sasctl

Author: smlindauer

src/sasctl/core.py

@@ -377,12 +377,15 @@ def is_ipaddress(hst):
             # Try to get credentials from .authinfo or .netrc files.
             # If no file path was specified, the default locations will
             # be checked.
-            if "swat" in sys.modules:
+            try:
                 auth = swat.utils.authinfo.query_authinfo(
                     domain, user=username, path=authinfo
                 )
                 self._settings["username"] = auth.get("user")
                 self._settings["password"] = auth.get("password")
+            except AttributeError:
+                # If swat package or authinfo module not available
+                pass
 
             # Not able to load credentials using SWAT.  Try Netrc.
             # TODO: IF a username was specified, verify that the credentials
@@ -508,11 +511,11 @@ def as_swat(self, server=None, **kwargs):
 
         # Starting in SWAT v1.8 oauth tokens could be passed directly in the password param.
         # Otherwise, use the username & password to re-authenticate.
+        # Use this sessions info to connect to CAS unless user has explicitly give a value (even if None)
         if version.parse(swat.__version__) >= version.parse("1.8"):
-            kwargs["username"] = None
-            kwargs["password"] = self.auth.access_token
+            kwargs.setdefault("username", None)
+            kwargs.setdefault("password", self.auth.access_token)
         else:
-            # Use this sessions info to connect to CAS unless user has explicitly give a value (even if None)
             kwargs.setdefault("username", self.username)
             kwargs.setdefault("password", self._settings["password"])
 

tests/unit/test_session.py

@@ -403,31 +403,44 @@ def test_as_swat():
     HOST = 'example.com'
     USERNAME = 'username'
     PASSWORD = 'password'
+    AUTH_TOKEN = 'token'
 
     with mock.patch('sasctl.core.Session.get_auth'):
         with Session(HOST, USERNAME, PASSWORD) as s:
             with mock.patch('swat.CAS') as CAS:
-                # Verify default parameters were passed
-                _ = s.as_swat()
-                CAS.assert_called_with(
-                    hostname='https://%s/cas-shared-default-http/' % HOST,
-                    username=USERNAME,
-                    password=PASSWORD,
-                )
-
-                # Verify connection to a non-default CAS instance
-                SERVER_NAME = 'my-cas-server'
-                _ = s.as_swat(SERVER_NAME)
-                CAS.assert_called_with(
-                    hostname='https://%s/%s-http/' % (HOST, SERVER_NAME),
-                    username=USERNAME,
-                    password=PASSWORD,
-                )
 
-                # Verify default parameters can be overridden
-                _ = s.as_swat(username='testuser', password=None)
-                CAS.assert_called_with(
-                    hostname='https://%s/cas-shared-default-http/' % HOST,
-                    username='testuser',
-                    password=None,
-                )
+                # Verify default username/password parameters were passed.
+                with mock.patch('swat.__version__', '1.6.1'):
+                    _ = s.as_swat()
+                    CAS.assert_called_with(
+                        hostname='https://%s/cas-shared-default-http/' % HOST,
+                        username=USERNAME,
+                        password=PASSWORD,
+                    )
+
+                # Verify auth token is passed with new SWAT versions
+                with mock.patch('swat.__version__', '1.9'):
+                    s.auth.access_token = AUTH_TOKEN
+                    _ = s.as_swat()
+                    CAS.assert_called_with(
+                        hostname='https://%s/cas-shared-default-http/' % HOST,
+                        username=None,
+                        password=AUTH_TOKEN,
+                    )
+
+                    # Verify connection to a non-default CAS instance
+                    SERVER_NAME = 'my-cas-server'
+                    _ = s.as_swat(SERVER_NAME)
+                    CAS.assert_called_with(
+                        hostname='https://%s/%s-http/' % (HOST, SERVER_NAME),
+                        username=None,
+                        password=AUTH_TOKEN,
+                    )
+
+                    # Verify default parameters can be overridden
+                    _ = s.as_swat(username='testuser', password=None)
+                    CAS.assert_called_with(
+                        hostname='https://%s/cas-shared-default-http/' % HOST,
+                        username='testuser',
+                        password=None,
+                    )