simplify code

Signed-off-by: Benny Zlotnik <bzlotnik@redhat.com>

Author: bennyz

packages/jumpstarter-cli-common/jumpstarter_cli_common/oidc.py

@@ -167,6 +167,10 @@ def get_token_remaining_seconds(token: str) -> float | None:
     return exp - time.time()
 
 
+# Token expiry warning threshold in seconds (5 minutes)
+TOKEN_EXPIRY_WARNING_SECONDS = 300
+
+
 def is_token_expired(token: str, buffer_seconds: int = 0) -> bool:
     """Check if token is expired or will expire within buffer_seconds.
 
@@ -182,3 +186,24 @@ def is_token_expired(token: str, buffer_seconds: int = 0) -> bool:
     if remaining is None:
         return False
     return remaining < buffer_seconds
+
+
+def format_duration(seconds: float) -> str:
+    """Format a duration in seconds as a human-readable string.
+
+    Args:
+        seconds: Duration in seconds (can be negative for past times)
+
+    Returns:
+        Formatted string like "2h 30m" or "5m 10s"
+    """
+    abs_seconds = abs(seconds)
+    hours = int(abs_seconds // 3600)
+    mins = int((abs_seconds % 3600) // 60)
+    secs = int(abs_seconds % 60)
+
+    if hours > 0:
+        return f"{hours}h {mins}m"
+    if mins > 0:
+        return f"{mins}m {secs}s"
+    return f"{secs}s"

packages/jumpstarter-cli/jumpstarter_cli/auth.py

@@ -1,24 +1,40 @@
-import time
 from datetime import datetime, timezone
 
 import click
 from jumpstarter_cli_common.config import opt_config
-from jumpstarter_cli_common.oidc import decode_jwt
+from jumpstarter_cli_common.oidc import (
+    TOKEN_EXPIRY_WARNING_SECONDS,
+    decode_jwt,
+    format_duration,
+    get_token_remaining_seconds,
+)
 
 
 @click.group()
 def auth():
-    """
-    Authentication and token management commands
-    """
+    """Authentication and token management commands."""
+
+
+def _print_token_status(remaining: float) -> None:
+    """Print token status message based on remaining time."""
+    duration = format_duration(remaining)
+
+    if remaining < 0:
+        click.echo(click.style(f"Status: EXPIRED ({duration} ago)", fg="red", bold=True))
+        click.echo(click.style("Run 'jmp login' to refresh your credentials.", fg="yellow"))
+    elif remaining < TOKEN_EXPIRY_WARNING_SECONDS:
+        click.echo(click.style(f"Status: EXPIRING SOON ({duration} remaining)", fg="red", bold=True))
+        click.echo(click.style("Run 'jmp login' to refresh your credentials.", fg="yellow"))
+    elif remaining < 3600:
+        click.echo(click.style(f"Status: Valid ({duration} remaining)", fg="yellow"))
+    else:
+        click.echo(click.style(f"Status: Valid ({duration} remaining)", fg="green"))
 
 
 @auth.command(name="status")
 @opt_config(exporter=False)
 def token_status(config):
-    """
-    Display token status and expiry information
-    """
+    """Display token status and expiry information."""
     token_str = getattr(config, "token", None)
 
     if not token_str:
@@ -27,40 +43,25 @@ def token_status(config):
 
     try:
         payload = decode_jwt(token_str)
-    except Exception as e:
+    except ValueError as e:
         click.echo(click.style(f"Failed to decode token: {e}", fg="red"))
         return
 
-    exp = payload.get("exp")
-    if not exp:
+    remaining = get_token_remaining_seconds(token_str)
+    if remaining is None:
         click.echo(click.style("Token has no expiry claim", fg="yellow"))
         return
 
-    remaining = exp - time.time()
+    exp = payload.get("exp")
     exp_dt = datetime.fromtimestamp(exp, tz=timezone.utc)
+    click.echo(f"Token expiry: {exp_dt.strftime('%Y-%m-%d %H:%M:%S %Z')}")
 
-    click.echo(f"Token expiry: {exp_dt.strftime('%Y-%m-%d %H:%M:%S')}")
-
-    if remaining < 0:
-        hours = int(abs(remaining) / 3600)
-        mins = int((abs(remaining) % 3600) / 60)
-        click.echo(click.style(f"Status: EXPIRED ({hours}h {mins}m ago)", fg="red", bold=True))
-        click.echo(click.style("Run 'jmp login' to refresh your credentials.", fg="yellow"))
-    elif remaining < 300:  # Less than 5 minutes
-        mins = int(remaining / 60)
-        secs = int(remaining % 60)
-        click.echo(click.style(f"Status: EXPIRING SOON ({mins}m {secs}s remaining)", fg="red", bold=True))
-        click.echo(click.style("Run 'jmp login' to refresh your credentials.", fg="yellow"))
-    elif remaining < 3600:  # Less than 1 hour
-        mins = int(remaining / 60)
-        click.echo(click.style(f"Status: Valid ({mins}m remaining)", fg="yellow"))
-    else:
-        hours = int(remaining / 3600)
-        mins = int((remaining % 3600) / 60)
-        click.echo(click.style(f"Status: Valid ({hours}h {mins}m remaining)", fg="green"))
+    _print_token_status(remaining)
 
     # Show additional token info
-    if payload.get("sub"):
-        click.echo(f"Subject: {payload.get('sub')}")
-    if payload.get("iss"):
-        click.echo(f"Issuer: {payload.get('iss')}")
+    sub = payload.get("sub")
+    iss = payload.get("iss")
+    if sub:
+        click.echo(f"Subject: {sub}")
+    if iss:
+        click.echo(f"Issuer: {iss}")

packages/jumpstarter-cli/jumpstarter_cli/shell.py

@@ -6,7 +6,11 @@
 from anyio import create_task_group, get_cancelled_exc_class
 from jumpstarter_cli_common.config import opt_config
 from jumpstarter_cli_common.exceptions import handle_exceptions_with_reauthentication
-from jumpstarter_cli_common.oidc import get_token_remaining_seconds
+from jumpstarter_cli_common.oidc import (
+    TOKEN_EXPIRY_WARNING_SECONDS,
+    format_duration,
+    get_token_remaining_seconds,
+)
 from jumpstarter_cli_common.signal import signal_handler
 
 from .common import opt_acquisition_timeout, opt_duration_partial, opt_selector
@@ -16,14 +20,14 @@
 from jumpstarter.config.exporter import ExporterConfigV1Alpha1
 
 
-def _warn_about_expired_token(lease_name: str, selector: str):
+def _warn_about_expired_token(lease_name: str, selector: str) -> None:
     """Warn user that lease won't be cleaned up due to expired token."""
     click.echo(click.style("\nToken expired - lease cleanup will fail.", fg="yellow", bold=True))
     click.echo(click.style(f"Lease '{lease_name}' will remain active.", fg="yellow"))
     click.echo(click.style(f"To reconnect: JMP_LEASE={lease_name} jmp shell -s {selector}", fg="cyan"))
 
 
-async def _monitor_token_expiry(config, cancel_scope):
+async def _monitor_token_expiry(config, cancel_scope) -> None:
     """Monitor token expiry and warn user."""
     token = getattr(config, "token", None)
     if not token:
@@ -40,11 +44,12 @@ async def _monitor_token_expiry(config, cancel_scope):
                 click.echo(click.style("\nToken expired! Exiting shell.", fg="red", bold=True))
                 cancel_scope.cancel()
                 return
-            elif remaining <= 300 and not warned:  # 5 minutes
-                mins, secs = int(remaining // 60), int(remaining % 60)
+
+            if remaining <= TOKEN_EXPIRY_WARNING_SECONDS and not warned:
+                duration = format_duration(remaining)
                 click.echo(
                     click.style(
-                        f"\nToken expires in {mins}m {secs}s. Session will continue but cleanup may fail on exit.",
+                        f"\nToken expires in {duration}. Session will continue but cleanup may fail on exit.",
                         fg="yellow",
                         bold=True,
                     )