zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-07-31 21:13:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor user REST API (#14334)

Browse Source 
### What problem does this PR solve?
Refactor user REST API

### Type of change
- [x] Refactoring
This commit is contained in:
Wang Qi
2026-04-24 10:25:15 +08:00
committed by GitHub
parent c41b5e8a5d
commit 199fbceb72
17 changed files with 58 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

232
test/testcases/test_web_api/test_user_app/test_user_app_unit.py
View File

@@ -450,7 +450,7 @@ def _load_user_app(monkeypatch):
monkeypatch.setitem(sys.modules, "rag.utils.redis_conn", redis_mod)
module_name = "test_user_app_unit_module"
module_path = repo_root / "api" / "apps" / "user_app.py"
module_path = repo_root / "api" / "apps" / "restful_apis" / "user_api.py"
spec = importlib.util.spec_from_file_location(module_name, module_path)
module = importlib.util.module_from_spec(spec)
module.manager = _DummyManager()
@@ -689,236 +689,6 @@ def test_oauth_callback_matrix_unit(monkeypatch):
assert login_calls and login_calls[-1] is existing_user
@pytest.mark.p2
def test_github_callback_matrix_unit(monkeypatch):
module = _load_user_app(monkeypatch)
_set_request_args(monkeypatch, module, {"code": "code"})
module.session.clear()
async def _request_error(_method, _url, **_kwargs):
return _DummyHTTPResponse({"error": "bad", "error_description": "boom"})
monkeypatch.setattr(module, "async_request", _request_error)
res = _run(module.github_callback())
assert res["redirect"] == "/?error=boom"
async def _request_scope_missing(_method, _url, **_kwargs):
return _DummyHTTPResponse({"scope": "repo", "access_token": "token-gh"})
monkeypatch.setattr(module, "async_request", _request_scope_missing)
res = _run(module.github_callback())
assert res["redirect"] == "/?error=user:email not in scope"
async def _request_token(_method, _url, **_kwargs):
return _DummyHTTPResponse({"scope": "user:email,repo", "access_token": "token-gh"})
monkeypatch.setattr(module, "async_request", _request_token)
monkeypatch.setattr(
module,
"user_info_from_github",
lambda _token: _AwaitableValue({"email": "gh@example.com", "avatar_url": "http://img", "login": "gh-user"}),
)
monkeypatch.setattr(module.UserService, "query", lambda **_kwargs: [])
rollback_calls = []
monkeypatch.setattr(module, "rollback_user_registration", lambda user_id: rollback_calls.append(user_id))
monkeypatch.setattr(module, "get_uuid", lambda: "gh-user-id")
def _raise_download(_url):
raise RuntimeError("download explode")
monkeypatch.setattr(module, "download_img", _raise_download)
monkeypatch.setattr(module, "user_register", lambda _user_id, _user: None)
res = _run(module.github_callback())
assert "Fail to register gh@example.com." in res["redirect"]
assert rollback_calls == ["gh-user-id"]
monkeypatch.setattr(module, "download_img", lambda _url: "avatar")
monkeypatch.setattr(
module,
"user_register",
lambda _user_id, _user: [_DummyUser("dup-1", "gh@example.com"), _DummyUser("dup-2", "gh@example.com")],
)
rollback_calls.clear()
res = _run(module.github_callback())
assert "Same email: gh@example.com exists!" in res["redirect"]
assert rollback_calls == ["gh-user-id"]
new_user = _DummyUser("gh-new-user", "gh@example.com")
login_calls = []
monkeypatch.setattr(module, "login_user", lambda user: login_calls.append(user))
monkeypatch.setattr(module, "user_register", lambda _user_id, _user: [new_user])
res = _run(module.github_callback())
assert res["redirect"] == "/?auth=gh-new-user"
assert login_calls and login_calls[-1] is new_user
inactive_user = _DummyUser("gh-existing", "gh@example.com", is_active="0")
monkeypatch.setattr(module.UserService, "query", lambda **_kwargs: [inactive_user])
res = _run(module.github_callback())
assert res["redirect"] == "/?error=user_inactive"
existing_user = _DummyUser("gh-existing", "gh@example.com")
login_calls.clear()
monkeypatch.setattr(module.UserService, "query", lambda **_kwargs: [existing_user])
monkeypatch.setattr(module, "login_user", lambda user: login_calls.append(user))
monkeypatch.setattr(module, "get_uuid", lambda: "gh-existing-token")
res = _run(module.github_callback())
assert res["redirect"] == "/?auth=gh-existing"
assert existing_user.access_token == "gh-existing-token"
assert existing_user.save_calls == 1
assert login_calls and login_calls[-1] is existing_user
@pytest.mark.p2
def test_feishu_callback_matrix_unit(monkeypatch):
module = _load_user_app(monkeypatch)
_set_request_args(monkeypatch, module, {"code": "code"})
module.session.clear()
def _patch_async_queue(payloads):
queue = list(payloads)
async def _request(_method, _url, **_kwargs):
return _DummyHTTPResponse(queue.pop(0))
monkeypatch.setattr(module, "async_request", _request)
_patch_async_queue([{"code": 1}])
res = _run(module.feishu_callback())
assert "/?error=" in res["redirect"]
_patch_async_queue(
[
{"code": 0, "app_access_token": "app-token"},
{"code": 1, "message": "bad token"},
]
)
res = _run(module.feishu_callback())
assert res["redirect"] == "/?error=bad token"
_patch_async_queue(
[
{"code": 0, "app_access_token": "app-token"},
{"code": 0, "data": {"scope": "other", "access_token": "feishu-access"}},
]
)
res = _run(module.feishu_callback())
assert "contact:user.email:readonly not in scope" in res["redirect"]
_patch_async_queue(
[
{"code": 0, "app_access_token": "app-token"},
{"code": 0, "data": {"scope": "contact:user.email:readonly", "access_token": "feishu-access"}},
]
)
monkeypatch.setattr(
module,
"user_info_from_feishu",
lambda _token: _AwaitableValue({"email": "fs@example.com", "avatar_url": "http://img", "en_name": "fs-user"}),
)
monkeypatch.setattr(module.UserService, "query", lambda **_kwargs: [])
rollback_calls = []
monkeypatch.setattr(module, "rollback_user_registration", lambda user_id: rollback_calls.append(user_id))
monkeypatch.setattr(module, "get_uuid", lambda: "fs-user-id")
def _raise_download(_url):
raise RuntimeError("download explode")
monkeypatch.setattr(module, "download_img", _raise_download)
monkeypatch.setattr(module, "user_register", lambda _user_id, _user: None)
res = _run(module.feishu_callback())
assert "Fail to register fs@example.com." in res["redirect"]
assert rollback_calls == ["fs-user-id"]
_patch_async_queue(
[
{"code": 0, "app_access_token": "app-token"},
{"code": 0, "data": {"scope": "contact:user.email:readonly", "access_token": "feishu-access"}},
]
)
monkeypatch.setattr(module, "download_img", lambda _url: "avatar")
monkeypatch.setattr(
module,
"user_register",
lambda _user_id, _user: [_DummyUser("dup-1", "fs@example.com"), _DummyUser("dup-2", "fs@example.com")],
)
rollback_calls.clear()
res = _run(module.feishu_callback())
assert "Same email: fs@example.com exists!" in res["redirect"]
assert rollback_calls == ["fs-user-id"]
_patch_async_queue(
[
{"code": 0, "app_access_token": "app-token"},
{"code": 0, "data": {"scope": "contact:user.email:readonly", "access_token": "feishu-access"}},
]
)
new_user = _DummyUser("fs-new-user", "fs@example.com")
login_calls = []
monkeypatch.setattr(module, "login_user", lambda user: login_calls.append(user))
monkeypatch.setattr(module, "user_register", lambda _user_id, _user: [new_user])
res = _run(module.feishu_callback())
assert res["redirect"] == "/?auth=fs-new-user"
assert login_calls and login_calls[-1] is new_user
_patch_async_queue(
[
{"code": 0, "app_access_token": "app-token"},
{"code": 0, "data": {"scope": "contact:user.email:readonly", "access_token": "feishu-access"}},
]
)
inactive_user = _DummyUser("fs-existing", "fs@example.com", is_active="0")
monkeypatch.setattr(module.UserService, "query", lambda **_kwargs: [inactive_user])
res = _run(module.feishu_callback())
assert res["redirect"] == "/?error=user_inactive"
_patch_async_queue(
[
{"code": 0, "app_access_token": "app-token"},
{"code": 0, "data": {"scope": "contact:user.email:readonly", "access_token": "feishu-access"}},
]
)
existing_user = _DummyUser("fs-existing", "fs@example.com")
login_calls.clear()
monkeypatch.setattr(module.UserService, "query", lambda **_kwargs: [existing_user])
monkeypatch.setattr(module, "login_user", lambda user: login_calls.append(user))
monkeypatch.setattr(module, "get_uuid", lambda: "fs-existing-token")
res = _run(module.feishu_callback())
assert res["redirect"] == "/?auth=fs-existing"
assert existing_user.access_token == "fs-existing-token"
assert existing_user.save_calls == 1
assert login_calls and login_calls[-1] is existing_user
@pytest.mark.p2
def test_oauth_user_info_helpers_unit(monkeypatch):
module = _load_user_app(monkeypatch)
async def _request_feishu(_method, _url, **_kwargs):
return _DummyHTTPResponse({"data": {"email": "", "en_name": "Feishu User"}})
monkeypatch.setattr(module, "async_request", _request_feishu)
feishu_user = _run(module.user_info_from_feishu("token-feishu"))
assert feishu_user["email"] is None
assert feishu_user["en_name"] == "Feishu User"
async def _request_github(_method, url, **_kwargs):
if "emails" in url:
return _DummyHTTPResponse(
[
{"email": "secondary@example.com", "primary": False},
{"email": "primary@example.com", "primary": True},
]
)
return _DummyHTTPResponse({"login": "gh-user"})
monkeypatch.setattr(module, "async_request", _request_github)
github_user = _run(module.user_info_from_github("token-github"))
assert github_user["login"] == "gh-user"
assert github_user["email"] == "primary@example.com"
@pytest.mark.p2
def test_logout_setting_profile_matrix_unit(monkeypatch):
module = _load_user_app(monkeypatch)