chore: minor refactoring

dreadnode_cli/api.py

@@ -1,13 +1,12 @@
 import asyncio
-import base64
 import json
 from datetime import datetime, timezone
 from typing import Any
 
 import httpx
 from rich import print
 
-from dreadnode_cli import __version__
+from dreadnode_cli import __version__, utils
 from dreadnode_cli.config import ServerConfig, UserConfig
 from dreadnode_cli.defaults import (
     DEFAULT_MAX_POLL_TIME,
@@ -17,12 +16,6 @@
 )
 
 
-def _parse_jwt_expiration(token: str) -> datetime:
-    _, b64payload, _ = token.split(".")
-    payload = base64.urlsafe_b64decode(b64payload + "==").decode("utf-8")
-    return datetime.fromtimestamp(json.loads(payload).get("exp"))
-
-
 class Token:
     """A JWT token with an expiration time."""
 
@@ -31,7 +24,7 @@ class Token:
 
     def __init__(self, token: str):
         self.data = token
-        self.expires_at = _parse_jwt_expiration(token)
+        self.expires_at = utils.parse_jwt_token_expiration(token)
 
     def ttl(self) -> int:
         """Get number of seconds left until the token expires."""
@@ -226,7 +219,7 @@ async def setup_authenticated_client(config: ServerConfig, force_refresh: bool =
     client = Client(base_url=config.url, auth=auth)
 
     if auth.is_expired():
-        raise Exception("authentication expired")
+        raise Exception("authentication expired, use [bold]dreadnode login[/] to authenticate again")
     elif force_refresh or auth.is_close_to_expiry():
         # update the auth data
         new_auth = await client.refresh_auth()

dreadnode_cli/utils.py

@@ -1,3 +1,5 @@
+import base64
+import json
 import pathlib
 import typing as t
 from datetime import datetime
@@ -31,6 +33,14 @@ def time_to(future_datetime: datetime) -> str:
     return ", ".join(result) if result else "Just now"
 
 
+def parse_jwt_token_expiration(token: str) -> datetime:
+    """Return the expiration date from a JWT token."""
+
+    _, b64payload, _ = token.split(".")
+    payload = base64.urlsafe_b64decode(b64payload + "==").decode("utf-8")
+    return datetime.fromtimestamp(json.loads(payload).get("exp"))
+
+
 def copy_template(src: pathlib.Path, dest: pathlib.Path, context: dict[str, t.Any]) -> None:
     env = Environment(loader=FileSystemLoader(src))