Skip to content

Commit

Permalink
correct oath2 user creation error
Browse files Browse the repository at this point in the history
  • Loading branch information
michael7nightingale committed Aug 13, 2023
1 parent de477cb commit 661fb21
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions src/apps/users/routes.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from fastapi import APIRouter, Form, Request, Depends
from fastapi import APIRouter, Form, Request, Depends, BackgroundTasks
from fastapi.templating import Jinja2Templates
from fastapi.responses import RedirectResponse
from tortoise.exceptions import IntegrityError
Expand Down Expand Up @@ -30,10 +30,9 @@ async def provider_callback(request: Request, code: str, provider=Depends(get_oa
user_data = provider.provide()
if user_data is None:
return login_response
try:
user = await User.get_or_none(email=user_data['email'])
if user is None:
await User.create(**user_data)
except IntegrityError:
return login_response
user = UserCustomModel(**user_data)
request.app.state.auth_manager.login(homepage_response, user)
return homepage_response
Expand Down Expand Up @@ -75,15 +74,17 @@ async def register_get(request: Request):
@auth_router.post("/register")
async def register_post(
request: Request,
user_data: UserRegister = Depends(get_user_register_data),
background_tasks: BackgroundTasks,
user_data: UserRegister = Depends(get_user_register_data)
):
"""Registration POST view."""
new_user = await User.register(**user_data.model_dump())
if new_user is None:
return RedirectResponse(auth_router.url_path_for("register_get"), status_code=303)
# message = f"Activation link is sent on email {new_user.email}. Please follow the instructions."
link = generate_activation_link(request, new_user)
request.app.state.email_service.send_activation_email(
background_tasks.add_task(
request.app.state.email_service.send_activation_email,
name=new_user.username,
link=link,
email=new_user.email
Expand Down

0 comments on commit 661fb21

Please sign in to comment.