add models and update imports

Author: jtcorbett

src/mcp_agent/cli/auth/__init__.py

@@ -3,6 +3,18 @@
 This package provides utilities for authentication (for now, api keys).
 """
 
-from .main import load_api_key_credentials, save_api_key_credentials
+from .main import (
+    clear_credentials,
+    load_api_key_credentials,
+    load_credentials,
+    save_credentials,
+)
+from .models import UserCredentials
 
-__all__ = ["load_api_key_credentials", "save_api_key_credentials"]
+__all__ = [
+    "clear_credentials",
+    "load_api_key_credentials",
+    "load_credentials",
+    "save_credentials",
+    "UserCredentials",
+]

src/mcp_agent/cli/auth/constants.py

@@ -1,4 +1,4 @@
 """Constants for the MCP Agent auth utilities."""
 
 # Default values
-DEFAULT_CREDENTIALS_PATH = "~/.mcp_agent/cloud/auth/credentials"
+DEFAULT_CREDENTIALS_PATH = "~/.mcp-agent/credentials.json"

src/mcp_agent/cli/auth/main.py

@@ -1,32 +1,64 @@
+import json
 import os
 from typing import Optional
 
 from .constants import DEFAULT_CREDENTIALS_PATH
+from .models import UserCredentials
 
 
-def save_api_key_credentials(api_key: str):
-    """Save an API key to the credentials file.
+def save_credentials(credentials: UserCredentials) -> None:
+    """Save user credentials to the credentials file.
 
     Args:
-        api_key: API key to persist
+        credentials: UserCredentials object to persist
 
     Returns:
         None
     """
     credentials_path = os.path.expanduser(DEFAULT_CREDENTIALS_PATH)
     os.makedirs(os.path.dirname(credentials_path), exist_ok=True)
+
+    # Create file with restricted permissions (0600) to prevent leakage
     with open(credentials_path, "w", encoding="utf-8") as f:
-        f.write(api_key)
+        f.write(credentials.to_json())
+    os.chmod(credentials_path, 0o600)
 
 
-def load_api_key_credentials() -> Optional[str]:
-    """Load an API key from the credentials file.
+def load_credentials() -> Optional[UserCredentials]:
+    """Load user credentials from the credentials file.
 
     Returns:
-        String. API key if it exists, None otherwise
+        UserCredentials object if it exists, None otherwise
     """
     credentials_path = os.path.expanduser(DEFAULT_CREDENTIALS_PATH)
     if os.path.exists(credentials_path):
-        with open(credentials_path, "r", encoding="utf-8") as f:
-            return f.read().strip()
+        try:
+            with open(credentials_path, "r", encoding="utf-8") as f:
+                return UserCredentials.from_json(f.read())
+        except (json.JSONDecodeError, KeyError, ValueError):
+            # Handle corrupted or old format credentials
+            return None
     return None
+
+
+def clear_credentials() -> bool:
+    """Clear stored credentials.
+
+    Returns:
+        bool: True if credentials were cleared, False if none existed
+    """
+    credentials_path = os.path.expanduser(DEFAULT_CREDENTIALS_PATH)
+    if os.path.exists(credentials_path):
+        os.remove(credentials_path)
+        return True
+    return False
+
+
+def load_api_key_credentials() -> Optional[str]:
+    """Load an API key from the credentials file (backward compatibility).
+
+    Returns:
+        String. API key if it exists, None otherwise
+    """
+    credentials = load_credentials()
+    return credentials.api_key if credentials else None

src/mcp_agent/cli/auth/models.py

@@ -0,0 +1,64 @@
+"""Authentication models for MCP Agent Cloud CLI."""
+
+import json
+from dataclasses import dataclass
+from datetime import datetime
+from typing import List, Optional
+
+
+@dataclass
+class UserCredentials:
+    """User authentication credentials and identity information."""
+
+    # Authentication
+    api_key: str
+    token_expires_at: Optional[datetime] = None
+
+    # Identity
+    username: Optional[str] = None
+    email: Optional[str] = None
+
+    @property
+    def is_token_expired(self) -> bool:
+        """Check if the token is expired."""
+        if not self.token_expires_at:
+            return False
+        return datetime.now() > self.token_expires_at
+
+    def to_dict(self) -> dict:
+        """Convert to dictionary for JSON serialization."""
+        result = {
+            "api_key": self.api_key,
+            "username": self.username,
+            "email": self.email,
+        }
+
+        if self.token_expires_at:
+            result["token_expires_at"] = self.token_expires_at.isoformat()
+
+        return result
+
+    @classmethod
+    def from_dict(cls, data: dict) -> "UserCredentials":
+        """Create from dictionary loaded from JSON."""
+
+        token_expires_at = None
+        if "token_expires_at" in data:
+            token_expires_at = datetime.fromisoformat(data["token_expires_at"])
+
+        return cls(
+            api_key=data["api_key"],
+            token_expires_at=token_expires_at,
+            username=data.get("username"),
+            email=data.get("email"),
+        )
+
+    def to_json(self) -> str:
+        """Convert to JSON string."""
+        return json.dumps(self.to_dict(), indent=2)
+
+    @classmethod
+    def from_json(cls, json_str: str) -> "UserCredentials":
+        """Create from JSON string."""
+        data = json.loads(json_str)
+        return cls.from_dict(data)

src/mcp_agent/cli/cloud/commands/auth/login/main.py

@@ -4,15 +4,15 @@
 import typer
 from rich.prompt import Confirm, Prompt
 
-from mcp_agent_cloud.auth import (
+from mcp_agent.cli.auth import (
     UserCredentials,
     load_credentials,
     save_credentials,
 )
-from mcp_agent_cloud.config import settings
-from mcp_agent_cloud.core.api_client import APIClient
-from mcp_agent_cloud.exceptions import CLIError
-from mcp_agent_cloud.ux import (
+from mcp_agent.cli.config import settings
+from mcp_agent.cli.core.api_client import APIClient
+from mcp_agent.cli.exceptions import CLIError
+from mcp_agent.cli.utils.ux import (
     print_info,
     print_success,
     print_warning,

src/mcp_agent/cli/cloud/commands/auth/logout/main.py

@@ -3,8 +3,8 @@
 import typer
 from rich.prompt import Confirm
 
-from mcp_agent_cloud.auth import clear_credentials, load_credentials
-from mcp_agent_cloud.ux import print_info, print_success
+from mcp_agent.cli.auth import clear_credentials, load_credentials
+from mcp_agent.cli.utils.ux import print_info, print_success
 
 
 def logout() -> None:

src/mcp_agent/cli/cloud/commands/auth/whoami/main.py

@@ -7,9 +7,9 @@
 from rich.panel import Panel
 from rich.table import Table
 
-from mcp_agent_cloud.auth import load_credentials
-from mcp_agent_cloud.exceptions import CLIError
-from mcp_agent_cloud.ux import print_error, print_info
+from mcp_agent.cli.auth import load_credentials
+from mcp_agent.cli.exceptions import CLIError
+from mcp_agent.cli.utils.ux import print_error, print_info
 
 
 def whoami() -> None: