From 5934d06c7f88dc5007f14b5c96bbb4664a44f02f Mon Sep 17 00:00:00 2001 From: Mawoka Date: Sat, 3 Dec 2022 15:14:42 +0100 Subject: [PATCH] :bug: Fixed skip_email_verification --- classquiz/emails/__init__.py | 11 +++-------- classquiz/routers/users.py | 8 +++++++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/classquiz/emails/__init__.py b/classquiz/emails/__init__.py index cd7cd02..a398acc 100644 --- a/classquiz/emails/__init__.py +++ b/classquiz/emails/__init__.py @@ -40,14 +40,9 @@ def _sendMail(template: str, to: str, subject: str): async def send_register_email(user: User): if user is None: raise ValueError("User not found") - if settings.skip_email_verification: - user.verify_key = None - user.verified = True - await user.update() - else: - template = jinja.get_template("register.jinja2") - template = await template.render_async(base_url=settings.root_address, token=user.verify_key) - _sendMail(template=template, to=user.email, subject="Verify your email") + template = jinja.get_template("register.jinja2") + template = await template.render_async(base_url=settings.root_address, token=user.verify_key) + _sendMail(template=template, to=user.email, subject="Verify your email") async def send_forgotten_password_email(email: str): diff --git a/classquiz/routers/users.py b/classquiz/routers/users.py index ceae893..2b0d48d 100644 --- a/classquiz/routers/users.py +++ b/classquiz/routers/users.py @@ -73,7 +73,13 @@ async def create_user(user: RouteUser, background_task: BackgroundTasks) -> User if len(user.username) == 32: return JSONResponse({"details": "Username mustn't be 32 characters long"}, 400) await user.save() - background_task.add_task(send_register_email, user) + print(settings.skip_email_verification) + if settings.skip_email_verification: + user.verify_key = None + user.verified = True + await user.update() + else: + background_task.add_task(send_register_email, user) await redis.delete("global_user_count") return user