Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

API - refacto auth route to user user manager service

Browse Source
This commit is contained in:
Sam 2023-03-12 11:15:31 +01:00
parent 01ae44c68b
commit b04bcd0447
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
fittrackee/users/auth.py
View File

@ -40,9 +40,11 @@ from fittrackee.responses import (
from fittrackee.utils import get_readable_duration from fittrackee.utils import get_readable_duration
from fittrackee.workouts.models import Sport from fittrackee.workouts.models import Sport
from .exceptions import UserControlsException, UserCreationException
from .models import BlacklistedToken, User, UserDataExport, UserSportPreference from .models import BlacklistedToken, User, UserDataExport, UserSportPreference
from .tasks import export_data from .tasks import export_data
from .utils.controls import check_password, is_valid_email, register_controls from .utils.admin import UserManagerService
from .utils.controls import check_password, is_valid_email
from .utils.language import get_language from .utils.language import get_language
from .utils.token import decode_user_token from .utils.token import decode_user_token
@ -160,32 +162,12 @@ def register_user() -> Union[Tuple[Dict, int], HttpResponse]:
language = get_language(post_data.get('language')) language = get_language(post_data.get('language'))
try: try:
ret = register_controls(username, email, password) user_manager_service = UserManagerService(username=username)
except TypeError as e: new_user, _ = user_manager_service.create_user(email, password)
return handle_error_and_return_response(e, db=db) # if a user exists with same email address (returned new_user is None),
# no error is returned since a user has to confirm his email to
if ret != '': # activate his account
return InvalidPayloadErrorResponse(ret) if new_user:
try:
user = User.query.filter(
func.lower(User.username) == func.lower(username)
).first()
if user:
return InvalidPayloadErrorResponse(
'sorry, that username is already taken'
)
# if a user exists with same email address, no error is returned
# since a user has to confirm his email to activate his account
user = User.query.filter(
func.lower(User.email) == func.lower(email)
).first()
if not user:
new_user = User(username=username, email=email, password=password)
new_user.timezone = 'Europe/Paris'
new_user.date_format = 'MM/dd/yyyy'
new_user.confirmation_token = secrets.token_urlsafe(30)
new_user.language = language new_user.language = language
new_user.accepted_policy_date = datetime.datetime.utcnow() new_user.accepted_policy_date = datetime.datetime.utcnow()
db.session.add(new_user) db.session.add(new_user)
@ -195,7 +177,14 @@ def register_user() -> Union[Tuple[Dict, int], HttpResponse]:
return {'status': 'success'}, 200 return {'status': 'success'}, 200
# handler errors # handler errors
except (exc.IntegrityError, exc.OperationalError, ValueError) as e: except (UserControlsException, UserCreationException) as e:
return InvalidPayloadErrorResponse(str(e))
except (
exc.IntegrityError,
exc.OperationalError,
TypeError,
ValueError,
) as e:
return handle_error_and_return_response(e, db=db) return handle_error_and_return_response(e, db=db)