From e76c0a0043fb6f3ae10a4152734ff439dd14cc59 Mon Sep 17 00:00:00 2001 From: Mawoka Date: Fri, 15 Apr 2022 11:52:35 +0200 Subject: [PATCH] :mute: Removed debug prints --- classquiz/routers/quiz.py | 2 -- classquiz/routers/users.py | 17 ++++++++++++++++- classquiz/socket_server/__init__.py | 2 -- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/classquiz/routers/quiz.py b/classquiz/routers/quiz.py index 9ab5305..ed240af 100644 --- a/classquiz/routers/quiz.py +++ b/classquiz/routers/quiz.py @@ -117,7 +117,6 @@ async def update_quiz(quiz_id: str, quiz_input: QuizInput, user: User = Depends( question.image = None if question.image is not None: if not bool(re.match(server_regex, question.image)) and not bool(re.match(imgur_regex, question.image)): - print("not valid", question.image) raise HTTPException(status_code=400, detail="image url is not valid") try: quiz_id = uuid.UUID(quiz_id) @@ -133,7 +132,6 @@ async def update_quiz(quiz_id: str, quiz_input: QuizInput, user: User = Depends( quiz_input.title = bleach.clean(quiz_input.title, tags=[], strip=True) meilisearch.index(settings.meilisearch_index).update_documents([await get_meili_data(quiz)]) if quiz.public and not quiz_input.public: - print("removing from meilisearch") meilisearch.index(settings.meilisearch_index).delete_document(str(quiz.id)) if not quiz.public and quiz_input.public: meilisearch.index(settings.meilisearch_index).add_documents([await get_meili_data(quiz)]) diff --git a/classquiz/routers/users.py b/classquiz/routers/users.py index 6e7ab11..971c597 100644 --- a/classquiz/routers/users.py +++ b/classquiz/routers/users.py @@ -94,7 +94,6 @@ async def login_for_cookie_access_token( user_agent=request.headers.get("User-Agent"), id=uuid.uuid4(), ) - print(request.headers) await user_session.save() # await user_session.save() access_token_expires = timedelta(minutes=settings.access_token_expire_minutes) @@ -237,3 +236,19 @@ async def reset_password_with_token(reset_password: ResetPassword, response: Res response.delete_cookie("rememberme") response.delete_cookie("rememberme_token") return {"message": "Password updated successfully"} + + +@router.get("/sessions/list", response_model=list[UserSession], response_model_exclude={"user", "session_key"}) +async def list_sessions(user: User = Depends(get_current_user)): + sessions = await UserSession.objects.filter(user=user).all() + return [session.dict() for session in sessions] + + +@router.delete("/sessions/{session_id}") +async def delete_session(session_id: str, user: User = Depends(get_current_user)): + try: + session_id = uuid.UUID(session_id) + except ValueError: + raise HTTPException(status_code=400, detail="Invalid session id") + await UserSession.objects.filter(user=user, id=session_id).delete() + return {"message": "Session deleted"} diff --git a/classquiz/socket_server/__init__.py b/classquiz/socket_server/__init__.py index fac49ba..2f27de2 100644 --- a/classquiz/socket_server/__init__.py +++ b/classquiz/socket_server/__init__.py @@ -158,14 +158,12 @@ async def submit_answer(sid, data): @sio.event async def get_final_results(sid, _data): session = await sio.get_session(sid) - print(session) game_data = PlayGame(**json.loads(await redis.get(f"game:{session['game_pin']}"))) results = {} if not session["admin"]: return for i in range(len(game_data.questions)): redis_res = await redis.get(f"game_session:{session['game_pin']}:{i}") - print(redis_res) if redis_res is None: break else: