pacnpal/thrillwiki_django_no_react
1
1
Fork 0
mirror of https://github.com/pacnpal/thrillwiki_django_no_react.git synced 2025-12-20 16:51:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve code readability with boolean expressions and better control flow

Browse Source
This commit is contained in:
pacnpal
2024-11-13 15:50:38 +00:00
parent 4bf3500e7b
commit ebfcd299a1
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
accounts/views.py
View File

@@ -47,10 +47,7 @@ class CustomLoginView(TurnstileMixin, LoginView):
return self.form_invalid(form) return self.form_invalid(form)
response = super().form_valid(form) response = super().form_valid(form)
return HttpResponseClientRefresh() if getattr(self.request, 'htmx', False) else response
if getattr(self.request, 'htmx', False):
return HttpResponseClientRefresh()
return response
def form_invalid(self, form): def form_invalid(self, form):
if getattr(self.request, 'htmx', False): if getattr(self.request, 'htmx', False):
@@ -79,10 +76,7 @@ class CustomSignupView(TurnstileMixin, SignupView):
return self.form_invalid(form) return self.form_invalid(form)
response = super().form_valid(form) response = super().form_valid(form)
return HttpResponseClientRefresh() if getattr(self.request, 'htmx', False) else response
if getattr(self.request, 'htmx', False):
return HttpResponseClientRefresh()
return response
def form_invalid(self, form): def form_invalid(self, form):
if getattr(self.request, 'htmx', False): if getattr(self.request, 'htmx', False):
@@ -114,7 +108,6 @@ def handle_social_login(request: HttpRequest, email: str) -> HttpResponse:
login(request, sociallogin.user) login(request, sociallogin.user)
del request.session['socialaccount_sociallogin'] del request.session['socialaccount_sociallogin']
messages.success(request, 'Successfully logged in') messages.success(request, 'Successfully logged in')
return redirect('/')
return redirect('/') return redirect('/')
def email_required(request: HttpRequest) -> HttpResponse: def email_required(request: HttpRequest) -> HttpResponse:
@@ -196,15 +189,12 @@ class SettingsView(LoginRequiredMixin, TemplateView):
def _validate_password(self, password: str) -> bool: def _validate_password(self, password: str) -> bool:
"""Validate password meets requirements.""" """Validate password meets requirements."""
if len(password) < 8: return (
return False len(password) >= 8 and
if not re.search(r'[A-Z]', password): bool(re.search(r'[A-Z]', password)) and
return False bool(re.search(r'[a-z]', password)) and
if not re.search(r'[a-z]', password): bool(re.search(r'[0-9]', password))
return False )
if not re.search(r'[0-9]', password):
return False
return True
def _send_password_change_confirmation(self, request: HttpRequest, user: User) -> None: def _send_password_change_confirmation(self, request: HttpRequest, user: User) -> None:
"""Send password change confirmation email.""" """Send password change confirmation email."""
@@ -245,19 +235,16 @@ class SettingsView(LoginRequiredMixin, TemplateView):
user.set_password(new_password) user.set_password(new_password)
user.save() user.save()
# Send confirmation email
self._send_password_change_confirmation(request, user) self._send_password_change_confirmation(request, user)
messages.success(request, 'Password changed successfully. Please check your email for confirmation.') messages.success(request, 'Password changed successfully. Please check your email for confirmation.')
return HttpResponseRedirect(reverse('account_login')) return HttpResponseRedirect(reverse('account_login'))
def _handle_email_change(self, request: HttpRequest) -> None: def _handle_email_change(self, request: HttpRequest) -> None:
if not (new_email := request.POST.get('new_email')): if new_email := request.POST.get('new_email'):
self._send_email_verification(request, new_email)
messages.success(request, 'Verification email sent to your new email address')
else:
messages.error(request, 'New email is required') messages.error(request, 'New email is required')
return
self._send_email_verification(request, new_email)
messages.success(request, 'Verification email sent to your new email address')
def _send_email_verification(self, request: HttpRequest, new_email: str) -> None: def _send_email_verification(self, request: HttpRequest, new_email: str) -> None:
user = cast(User, request.user) user = cast(User, request.user)