diff --git a/ecs/jskult-webapp/src/controller/logout.py b/ecs/jskult-webapp/src/controller/logout.py index 69de2c22..bae8a3aa 100644 --- a/ecs/jskult-webapp/src/controller/logout.py +++ b/ecs/jskult-webapp/src/controller/logout.py @@ -8,16 +8,14 @@ from src.model.internal.session import UserSession from src.model.view.logout_view_model import LogoutViewModel from src.system_var import constants from src.templates import templates +from src.services.session_service import SessionService router = APIRouter() ######################### # Views # ######################### - -def delete_session(session: Union[UserSession, None] = Depends(get_current_session)): - if session: - session.delete() + @router.get('/', response_class=HTMLResponse) @@ -53,6 +51,7 @@ def logout_view( template_response.delete_cookie('session') # セッション削除 - delete_session(session) + if session: + SessionService.delete_session(session) return template_response diff --git a/ecs/jskult-webapp/src/services/session_service.py b/ecs/jskult-webapp/src/services/session_service.py index 48edbcd4..b58d7241 100644 --- a/ecs/jskult-webapp/src/services/session_service.py +++ b/ecs/jskult-webapp/src/services/session_service.py @@ -18,11 +18,9 @@ def get_session(key: str) -> UserSession: logger.debug(f'セッション取得失敗:{e}') return None -def delete_session (key: str) -> bool: +def delete_session (session: UserSession): try: - session = UserSession.get(hash_key=key, consistent_read=True) session.delete() - return True - except UserSession.DoesNotExist as e: - logger.debug(f'セッション削除失敗:{e}') - return False \ No newline at end of file + return + except: + return \ No newline at end of file