From 5c05f471b3297b8eb84ce359958786e6b0e16b24 Mon Sep 17 00:00:00 2001 From: king Date: Wed, 14 Oct 2026 12:47:59 +0900 Subject: [PATCH] =?UTF-8?q?fix(project):=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EC=A0=84=20=ED=99=94=EB=A9=B4=20=EC=A3=BC=EC=86=8C=EB=8A=94=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20JSON=20=EB=8C=80=EC=8B=A0=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=ED=99=94=EB=A9=B4=20=E2=86=92=20=EC=9B=90?= =?UTF-8?q?=EB=9E=98=20=EC=A3=BC=EC=86=8C=EB=A1=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 공유한 회의록·업무 링크를 로그인 안 된 브라우저에서 열면 {"detail":"로그인이 필요합니다."} 가 보이던 문제. 내 업무·프로젝트·휴지통·도움말·수신함·목표·회의록 화면은 /login?next= 로 보낸다. API 는 그대로 401. Co-Authored-By: Claude Opus 5.5 --- app/modules/project/router.py | 45 +++++++++++++++++++++++++------ docs/PROJECT_MODULE.md | 6 ++++- tests/test_project_meeting_nav.py | 37 ++++++++++++++++++++++++- 3 files changed, 78 insertions(+), 10 deletions(-) diff --git a/app/modules/project/router.py b/app/modules/project/router.py index cd6d2b8..0e076bd 100644 --- a/app/modules/project/router.py +++ b/app/modules/project/router.py @@ -86,6 +86,19 @@ def _require_user(request: Request) -> dict[str, Any]: return user +def _page_user(request: Request) -> Any: + """화면(HTML) 주소용 — 로그인 전이면 오류 JSON 대신 로그인 화면으로 보냈다가 이 주소로 되돌아온다 + (공유한 회의록·업무 링크를 로그인 안 된 브라우저에서 열 때, 2026-10-14). 로그인했으면 _require_user 와 같다.""" + from urllib.parse import quote # noqa: WPS433 + + from app.main import get_current_user_record # noqa: WPS433 + + if get_current_user_record(request) is None: + here = str(request.url.path) + ("?" + request.url.query if request.url.query else "") + return RedirectResponse(url="/login?next=" + quote(here, safe=""), status_code=303) + return _require_user(request) + + def _require_pro(request: Request) -> dict[str, Any]: """Pro user 이상(수퍼관리자·Admin·Pro user) — access.is_pro.""" user = _require_user(request) @@ -636,7 +649,9 @@ def my_tasks_page(request: Request) -> HTMLResponse: from app.main import build_erp_nav, render_template # noqa: WPS433 from app.store import is_admin # noqa: WPS433 - user = _require_user(request) + user = _page_user(request) + if not isinstance(user, dict): + return user st = _store(request) if st is None: return _render_config_needed(request, user) @@ -764,7 +779,9 @@ def project_page(request: Request, project_id: int) -> HTMLResponse: from app.main import build_erp_nav, render_template # noqa: WPS433 from app.store import is_admin # noqa: WPS433 - user = _require_user(request) + user = _page_user(request) + if not isinstance(user, dict): + return user st = _store(request) if st is None: return _render_config_needed(request, user) @@ -2832,7 +2849,9 @@ def trash_page(request: Request) -> HTMLResponse: """휴지통 — Pro user 이상. 지운 업무(세부 업무 포함)를 3개월 보관, 복구(멤버인 프로젝트 것만).""" from app.main import build_erp_nav, render_template # noqa: WPS433 - user = _require_user(request) + user = _page_user(request) + if not isinstance(user, dict): + return user if not access.is_pro(user): raise HTTPException(status_code=403, detail="Pro user 이상만 볼 수 있습니다.") st = _store(request) @@ -2914,7 +2933,9 @@ def help_page(request: Request) -> HTMLResponse: DB 없이 그리는 정적 안내라 DB 설정 전에도 열린다.""" from app.main import build_erp_nav, render_template # noqa: WPS433 - user = _require_user(request) + user = _page_user(request) + if not isinstance(user, dict): + return user return render_template( request, "project/help.html", @@ -2933,7 +2954,9 @@ def inbox_page(request: Request) -> HTMLResponse: from app.main import build_erp_nav, render_template # noqa: WPS433 from app.store import is_admin # noqa: WPS433 - user = _require_user(request) + user = _page_user(request) + if not isinstance(user, dict): + return user st = _store(request) if st is None: return _render_config_needed(request, user) @@ -3099,7 +3122,9 @@ def _goal_call(fn: Any, *args: Any, **kwargs: Any) -> Any: @router.get("/goals") def goals_home(request: Request) -> RedirectResponse: """사이드바 "목표" 자체 주소 — 가장 최근 연도(없으면 올해)로.""" - _require_user(request) + user = _page_user(request) + if not isinstance(user, dict): + return user st = _store(request) years = _goal_years_nav(st) if st is not None else [today_kst().year] return RedirectResponse(url=f"/project/goals/{years[0]}", status_code=303) @@ -3112,7 +3137,9 @@ def goals_page(request: Request, year: int) -> HTMLResponse: from app.main import build_erp_nav, render_template # noqa: WPS433 from app.store import is_admin # noqa: WPS433 - user = _require_user(request) + user = _page_user(request) + if not isinstance(user, dict): + return user st = _store(request) if st is None: return _render_config_needed(request, user) @@ -3644,7 +3671,9 @@ def goal_meeting_page(request: Request, year: int, month: int, week: str | None from app.main import build_erp_nav, render_template # noqa: WPS433 from app.store import has_module, is_admin # noqa: WPS433 - user = _require_user(request) + user = _page_user(request) + if not isinstance(user, dict): + return user st = _store(request) if st is None: return _render_config_needed(request, user) diff --git a/docs/PROJECT_MODULE.md b/docs/PROJECT_MODULE.md index a56f375..36c1d09 100644 --- a/docs/PROJECT_MODULE.md +++ b/docs/PROJECT_MODULE.md @@ -1333,7 +1333,11 @@ Windows 트레이 프로그램 **DBX 알림**(`desktop/notifier/`, C# .NET Frame 메인 업무는 그대로 만든 사람 자동 협업자. 화면 `newTaskFollowers` 도 같은 규칙(고른 사람만). 이미 만든 세부 업무의 협업자는 그대로. - **업무 창 세부 업무 줄 마감일 아이콘** — 마감일이 없을 때 점선 원 달력 아이콘을 협업자 아이콘처럼 늘 옅게(`opacity .5`, 줄 hover = 진하게). - **대시보드 담당자별 합계 → 오른쪽 업무 목록 패널** — 오른쪽 날짜 `mm/dd(요일)`(예: 10/07(수)), 마감이 지난 미완료 업무는 빨간 굵은 글씨(`em.is-overdue`). -- 검증: `test_create_with_followers_and_my_overdue`(세부 = 고른 사람만, 메인 = 만든 사람), `project_ui.test.js` [대시보드 담당자별] 패널 날짜. +- **로그인 전 화면 주소 → 로그인 화면**: 공유한 회의록·업무 주소를 로그인 안 된(세션 만료·다른 브라우저) 상태로 열면 + 예전엔 `{"detail":"로그인이 필요합니다."}` JSON 이 보였다. 화면 주소(내 업무·프로젝트·휴지통·도움말·수신함·목표·회의록)는 + `_page_user` 가 `/login?next=<원래 주소>` 로 보내 로그인 뒤 그 주소로 돌아온다(`/t/{id}`·`/notifier` 는 원래 그렇게 동작). API 는 그대로 401. +- 검증: `test_create_with_followers_and_my_overdue`(세부 = 고른 사람만, 메인 = 만든 사람), `project_ui.test.js` [대시보드 담당자별] 패널 날짜, + `tests/test_project_meeting_nav.py::PageLoginRedirectTests`. ## 7. 추후 단계 diff --git a/tests/test_project_meeting_nav.py b/tests/test_project_meeting_nav.py index eb4e794..c84d404 100644 --- a/tests/test_project_meeting_nav.py +++ b/tests/test_project_meeting_nav.py @@ -52,10 +52,45 @@ class MeetingNavTests(unittest.TestCase): def test_other_month_redirect_keeps_content_only_mode(self): # 다른 달의 월요일 링크가 들어와도 오른쪽 전용 화면을 유지한다. - main_stub = SimpleNamespace(build_erp_nav=Mock(), render_template=Mock()) + main_stub = SimpleNamespace(build_erp_nav=Mock(), render_template=Mock(), get_current_user_record=Mock(return_value={})) with patch.dict(sys.modules, {"app.main": main_stub}), patch.object(api, "_require_user", return_value={}), \ patch.object(api, "_store", return_value=SimpleNamespace()): response = self.client.get("/project/goals/2026/meetings/10?week=2026-09-28&content=1", follow_redirects=False) self.assertEqual(response.status_code, 303) self.assertEqual(response.headers["location"], "/project/goals/2026/meetings/9?week=2026-09-28&content=1") main_stub.render_template.assert_not_called() + + +class PageLoginRedirectTests(unittest.TestCase): + """로그인 전에 프로젝트 화면 주소(공유한 회의록·업무 링크 등)를 열면 오류 JSON 대신 로그인 화면 → 이 주소로 돌아온다(2026-10-14). + API 는 그대로 401.""" + + def setUp(self): + app = FastAPI() + app.include_router(api.router) + self.client = TestClient(app) + self.main_stub = SimpleNamespace(build_erp_nav=Mock(), render_template=Mock(), get_current_user_record=Mock(return_value=None)) + + def test_pages_redirect_to_login_with_next(self): + cases = { + "/project/goals/2026/meetings/10?week=2026-10-12": "%2Fproject%2Fgoals%2F2026%2Fmeetings%2F10%3Fweek%3D2026-10-12", + "/project/": "%2Fproject%2F", + "/project/p/7?task=12": "%2Fproject%2Fp%2F7%3Ftask%3D12", + "/project/inbox": "%2Fproject%2Finbox", + "/project/trash": "%2Fproject%2Ftrash", + "/project/help": "%2Fproject%2Fhelp", + "/project/goals": "%2Fproject%2Fgoals", + "/project/goals/2026": "%2Fproject%2Fgoals%2F2026", + } + with patch.dict(sys.modules, {"app.main": self.main_stub}), patch.object(api, "_store") as query: + for url, nxt in cases.items(): + with self.subTest(url=url): + r = self.client.get(url, follow_redirects=False) + self.assertEqual(r.status_code, 303) + self.assertEqual(r.headers["location"], "/login?next=" + nxt) + query.assert_not_called() + self.main_stub.render_template.assert_not_called() + + def test_api_still_401(self): + with patch.dict(sys.modules, {"app.main": self.main_stub}): + self.assertEqual(self.client.get("/project/api/goals/meeting-nav").status_code, 401)