From 1d13f0ab4f5e18cb206878edad9a8976c0d75615 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 11 Sep 2022 21:03:23 +1000 Subject: [PATCH] lint --- bookwyrm/views/__init__.py | 8 +++++++- bookwyrm/views/landing/login.py | 7 ++++++- bookwyrm/views/preferences/two_factor_auth.py | 13 ++++++++++--- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 52456ccc9..98bca4bf7 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -32,7 +32,13 @@ from .preferences.edit_user import EditUser from .preferences.export import Export from .preferences.delete_user import DeleteUser from .preferences.block import Block, unblock -from .preferences.two_factor_auth import Edit2FA, Confirm2FA, Disable2FA, LoginWith2FA, Prompt2FA +from .preferences.two_factor_auth import ( + Edit2FA, + Confirm2FA, + Disable2FA, + LoginWith2FA, + Prompt2FA, +) # books from .books.books import ( diff --git a/bookwyrm/views/landing/login.py b/bookwyrm/views/landing/login.py index 0c8d596d6..6feb1d5d0 100644 --- a/bookwyrm/views/landing/login.py +++ b/bookwyrm/views/landing/login.py @@ -54,7 +54,11 @@ class Login(View): # if 2fa is set, don't log them in until they enter the right code if user.two_factor_auth == True: form = forms.Confirm2FAForm(request.GET, user) - return TemplateResponse(request, "two_factor_auth/two_factor_login.html", {"form": form, "2fa_user": user}) + return TemplateResponse( + request, + "two_factor_auth/two_factor_login.html", + {"form": form, "2fa_user": user}, + ) # otherwise, successful login login(request, user) @@ -84,6 +88,7 @@ class Login(View): data = {"login_form": login_form, "register_form": register_form} return TemplateResponse(request, "landing/login.html", data) + @method_decorator(login_required, name="dispatch") class Logout(View): """log out""" diff --git a/bookwyrm/views/preferences/two_factor_auth.py b/bookwyrm/views/preferences/two_factor_auth.py index b98643abe..17cec5290 100644 --- a/bookwyrm/views/preferences/two_factor_auth.py +++ b/bookwyrm/views/preferences/two_factor_auth.py @@ -96,18 +96,25 @@ class LoginWith2FA(View): def post(self, request): """Check 2FA code and allow/disallow login""" - user = models.User.objects.get(username=request.POST.get('2fa_user')) + user = models.User.objects.get(username=request.POST.get("2fa_user")) form = forms.Confirm2FAForm(request.POST, instance=user) if not form.is_valid(): time.sleep(2) # make life slightly harder for bots - data = {"form": form, "2fa_user": user, "error": "Code does not match, try again"} - return TemplateResponse(request, "two_factor_auth/two_factor_login.html", data) + data = { + "form": form, + "2fa_user": user, + "error": "Code does not match, try again", + } + return TemplateResponse( + request, "two_factor_auth/two_factor_login.html", data + ) # log the user in - we are bypassing standard login login(request, user) user.update_active_date() return set_language(user, redirect("/")) + class Prompt2FA(View): """Alert user to the existence of 2FA"""