refactor(creds): remove per-tool elicitation from unraid_keys

This commit is contained in:
Jacob Magar
2026-03-14 14:18:20 -04:00
parent 23e70e46d0
commit ba7b8dfaa6

View File

@@ -6,21 +6,11 @@ creating, updating, and deleting API keys.
from typing import Any, Literal, get_args from typing import Any, Literal, get_args
from fastmcp import Context as _Context
from fastmcp import FastMCP from fastmcp import FastMCP
from ..config.logging import logger from ..config.logging import logger
from ..core.client import make_graphql_request from ..core.client import make_graphql_request
from ..core.exceptions import CredentialsNotConfiguredError as _CredErr
from ..core.exceptions import ToolError, tool_error_handler from ..core.exceptions import ToolError, tool_error_handler
from ..core.setup import elicit_and_configure as _elicit
# Re-export at module scope so tests can patch "unraid_mcp.tools.keys.elicit_and_configure"
# and "unraid_mcp.tools.keys.CredentialsNotConfiguredError"
elicit_and_configure = _elicit
CredentialsNotConfiguredError = _CredErr
Context = _Context
QUERIES: dict[str, str] = { QUERIES: dict[str, str] = {
@@ -85,7 +75,6 @@ def register_keys_tool(mcp: FastMCP) -> None:
name: str | None = None, name: str | None = None,
roles: list[str] | None = None, roles: list[str] | None = None,
permissions: list[str] | None = None, permissions: list[str] | None = None,
ctx: Context | None = None,
) -> dict[str, Any]: ) -> dict[str, Any]:
"""Manage Unraid API keys. """Manage Unraid API keys.
@@ -106,14 +95,6 @@ def register_keys_tool(mcp: FastMCP) -> None:
logger.info(f"Executing unraid_keys action={action}") logger.info(f"Executing unraid_keys action={action}")
if action == "list": if action == "list":
try:
data = await make_graphql_request(QUERIES["list"])
except CredentialsNotConfiguredError:
configured = await elicit_and_configure(ctx)
if not configured:
raise ToolError(
"Credentials required. Run `unraid_health action=setup` to configure."
)
data = await make_graphql_request(QUERIES["list"]) data = await make_graphql_request(QUERIES["list"])
keys = data.get("apiKeys", []) keys = data.get("apiKeys", [])
return {"keys": list(keys) if isinstance(keys, list) else []} return {"keys": list(keys) if isinstance(keys, list) else []}