Merge pull request #96 from NERSC/token

Add guard for token being None

Author: cjh1

src/sfapi_client/_async/client.py

@@ -276,9 +276,15 @@ async def _http_client(self):
 
                 await self.__http_client.fetch_token()
             else:
-                # We have a session
-                # Make sure it's still active
-                await self.__http_client.ensure_active_token(self.__http_client.token)
+                if self.__http_client.token is None:
+                    # We don't have a token, fetch one
+                    await self.__http_client.fetch_token()
+                else:
+                    # We have a session
+                    # Make sure it's still active
+                    await self.__http_client.ensure_active_token(
+                        self.__http_client.token
+                    )
         # Use regular client, but add the access token if we have one
         elif self.__http_client is None:
             # We already have an access token

src/sfapi_client/_sync/client.py

@@ -276,9 +276,15 @@ def _http_client(self):
 
                 self.__http_client.fetch_token()
             else:
-                # We have a session
-                # Make sure it's still active
-                self.__http_client.ensure_active_token(self.__http_client.token)
+                if self.__http_client.token is None:
+                    # We don't have a token, fetch one
+                    self.__http_client.fetch_token()
+                else:
+                    # We have a session
+                    # Make sure it's still active
+                    self.__http_client.ensure_active_token(
+                        self.__http_client.token
+                    )
         # Use regular client, but add the access token if we have one
         elif self.__http_client is None:
             # We already have an access token

tests/test_groups.py

@@ -3,15 +3,8 @@
 
 
 @pytest.mark.api_dev
-def test_group(
-    dev_client_id, dev_client_secret, test_group, dev_api_url, dev_token_url
-):
-    with Client(
-        client_id=dev_client_id,
-        secret=dev_client_secret,
-        api_base_url=dev_api_url,
-        token_url=dev_token_url,
-    ) as client:
+def test_group(authenticated_client, test_group):
+    with authenticated_client as client:
         group = client.group(test_group)
         assert group is not None
         assert group.name == test_group