feat: use each user's local NocoBase login
This commit is contained in:
+76
-19
@@ -4,8 +4,8 @@ from contextlib import asynccontextmanager
|
||||
from unittest.mock import patch
|
||||
|
||||
import httpx
|
||||
from starlette.responses import JSONResponse
|
||||
from starlette.applications import Starlette
|
||||
from starlette.responses import JSONResponse
|
||||
|
||||
from nocobase_crm_mcp import server as server_module
|
||||
from nocobase_crm_mcp.nb_client import NbAuthenticationError, NbCommandError
|
||||
@@ -15,9 +15,10 @@ from nocobase_crm_mcp.server import (
|
||||
DEFAULT_HTTP_PORT,
|
||||
BearerTokenAuthMiddleware,
|
||||
FastMCP,
|
||||
_make_write_services,
|
||||
_read_nocobase_environment,
|
||||
create_http_app,
|
||||
create_server,
|
||||
_read_nocobase_environment,
|
||||
run_http_server,
|
||||
)
|
||||
|
||||
@@ -199,6 +200,19 @@ class ServerTests(unittest.TestCase):
|
||||
self.assertIn("include_raw", tools["get_customer"].inputSchema["properties"])
|
||||
self.assertIn("include_details", tools["list_contacts"].inputSchema["properties"])
|
||||
|
||||
def test_raw_rows_require_explicit_local_policy_opt_in(self) -> None:
|
||||
if FastMCP is None:
|
||||
self.skipTest("MCP SDK is not installed")
|
||||
|
||||
server = create_server(crm_service=FakeCrmService(), readonly=True)
|
||||
with patch.dict("os.environ", {}, clear=True):
|
||||
_content, blocked = asyncio.run(server.call_tool("list_customers", {"include_raw": True}))
|
||||
with patch.dict("os.environ", {"NOCOBASE_MCP_ENABLE_RAW_DATA": "1"}, clear=True):
|
||||
_content, allowed = asyncio.run(server.call_tool("list_customers", {"include_raw": True}))
|
||||
|
||||
self.assertEqual(blocked["error"]["code"], "raw_data_disabled")
|
||||
self.assertEqual(allowed, {"results": []})
|
||||
|
||||
def test_tools_return_structured_error_for_nb_failures(self) -> None:
|
||||
if FastMCP is None:
|
||||
self.skipTest("MCP SDK is not installed")
|
||||
@@ -211,7 +225,7 @@ class ServerTests(unittest.TestCase):
|
||||
self.assertIn("denied", structured["error"]["message"])
|
||||
self.assertFalse(structured["error"]["retryable"])
|
||||
|
||||
def test_tools_return_specific_error_for_invalid_nocobase_api_key(self) -> None:
|
||||
def test_tools_return_specific_error_for_missing_or_expired_user_login(self) -> None:
|
||||
if FastMCP is None:
|
||||
self.skipTest("MCP SDK is not installed")
|
||||
|
||||
@@ -220,7 +234,7 @@ class ServerTests(unittest.TestCase):
|
||||
_content, structured = asyncio.run(server.call_tool("list_customers", {}))
|
||||
|
||||
self.assertEqual(structured["error"]["code"], "nb_auth_failed")
|
||||
self.assertIn("NOCOBASE_MCP_API_TOKEN", structured["error"]["hint"])
|
||||
self.assertIn("nb env auth", structured["error"]["hint"])
|
||||
self.assertFalse(structured["error"]["retryable"])
|
||||
|
||||
def test_tools_return_specific_error_when_nb_is_not_found(self) -> None:
|
||||
@@ -239,7 +253,9 @@ class ServerTests(unittest.TestCase):
|
||||
with (
|
||||
patch.dict("os.environ", {"NOCOBASE_MCP_NB_BIN": "/opt/node/bin/nb"}),
|
||||
patch.object(server_module, "NbClient") as nb_client,
|
||||
patch.object(server_module, "CrmService", side_effect=lambda config, client: {"config": config, "client": client}),
|
||||
patch.object(
|
||||
server_module, "CrmService", side_effect=lambda config, client: {"config": config, "client": client}
|
||||
),
|
||||
):
|
||||
service = server_module._make_service()
|
||||
|
||||
@@ -267,7 +283,9 @@ class ServerTests(unittest.TestCase):
|
||||
app = create_http_app(server, "secret", upload_endpoint=upload_endpoint)
|
||||
|
||||
async def request_upload() -> httpx.Response:
|
||||
async with httpx.AsyncClient(transport=httpx.ASGITransport(app=app), base_url="http://testserver") as client:
|
||||
async with httpx.AsyncClient(
|
||||
transport=httpx.ASGITransport(app=app), base_url="http://testserver"
|
||||
) as client:
|
||||
return await client.post("/uploads", headers={"Authorization": "Bearer secret"})
|
||||
|
||||
response = asyncio.run(request_upload())
|
||||
@@ -309,6 +327,10 @@ class ServerTests(unittest.TestCase):
|
||||
("https://nb.example/api", "shared-key", 123),
|
||||
)
|
||||
|
||||
def test_nocobase_environment_defaults_to_the_users_saved_cli_login(self) -> None:
|
||||
with patch.dict("os.environ", {}, clear=True):
|
||||
self.assertEqual(_read_nocobase_environment(), (None, None, 26214400))
|
||||
|
||||
def test_nocobase_environment_accepts_matching_legacy_credentials(self) -> None:
|
||||
with patch.dict(
|
||||
"os.environ",
|
||||
@@ -339,20 +361,55 @@ class ServerTests(unittest.TestCase):
|
||||
with self.assertRaises(RuntimeError):
|
||||
_read_nocobase_environment()
|
||||
|
||||
def test_http_write_mode_requires_shared_api_base_url(self) -> None:
|
||||
def test_write_services_use_the_selected_nb_environment_credentials_by_default(self) -> None:
|
||||
with (
|
||||
patch.object(server_module, "NbClient") as nb_client,
|
||||
patch.object(server_module, "CrmService") as crm_service,
|
||||
patch.object(server_module, "ProjectService") as project_service,
|
||||
patch.object(server_module, "NocoBaseHttpClient") as http_client,
|
||||
):
|
||||
result = _make_write_services()
|
||||
|
||||
nb_client.assert_called_once_with(
|
||||
env_name="nb-mcp",
|
||||
data_source="main",
|
||||
nb_bin="nb",
|
||||
api_base_url=None,
|
||||
api_token=None,
|
||||
)
|
||||
http_client.assert_called_once_with(credential_provider=nb_client.return_value.environment_credentials)
|
||||
crm_service.assert_called_once()
|
||||
project_service.assert_called_once()
|
||||
self.assertEqual(result, (crm_service.return_value, project_service.return_value, http_client.return_value))
|
||||
|
||||
def test_http_write_mode_uses_saved_cli_login_without_shared_api_credentials(self) -> None:
|
||||
with patch.dict("os.environ", {"NOCOBASE_MCP_TOKEN": "secret"}, clear=True):
|
||||
with patch("uvicorn.run") as uvicorn_run:
|
||||
with self.assertRaisesRegex(RuntimeError, "NOCOBASE_MCP_API_BASE_URL"):
|
||||
run_http_server(
|
||||
config_path=None,
|
||||
host=DEFAULT_HTTP_HOST,
|
||||
port=DEFAULT_HTTP_PORT,
|
||||
token_env="NOCOBASE_MCP_TOKEN",
|
||||
streamable_http_path=DEFAULT_HTTP_PATH,
|
||||
allowed_hosts=None,
|
||||
allowed_origins=None,
|
||||
)
|
||||
uvicorn_run.assert_not_called()
|
||||
with (
|
||||
patch.object(server_module, "_make_write_services") as make_services,
|
||||
patch.object(server_module, "create_server") as create_server_mock,
|
||||
patch.object(server_module, "UploadEndpoint"),
|
||||
patch.object(server_module, "create_http_app", return_value="app"),
|
||||
patch("uvicorn.run") as uvicorn_run,
|
||||
):
|
||||
make_services.return_value = ("crm", "projects", "http")
|
||||
run_http_server(
|
||||
config_path=None,
|
||||
host=DEFAULT_HTTP_HOST,
|
||||
port=DEFAULT_HTTP_PORT,
|
||||
token_env="NOCOBASE_MCP_TOKEN",
|
||||
streamable_http_path=DEFAULT_HTTP_PATH,
|
||||
allowed_hosts=None,
|
||||
allowed_origins=None,
|
||||
)
|
||||
|
||||
make_services.assert_called_once_with(None, api_base_url=None, api_token=None)
|
||||
create_server_mock.assert_called_once()
|
||||
uvicorn_run.assert_called_once_with(
|
||||
"app",
|
||||
host=DEFAULT_HTTP_HOST,
|
||||
port=DEFAULT_HTTP_PORT,
|
||||
log_level="info",
|
||||
)
|
||||
|
||||
def test_config_template_tool_is_opt_in(self) -> None:
|
||||
if FastMCP is None:
|
||||
|
||||
Reference in New Issue
Block a user