zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

fix error messages when setting up 2FA

Browse source
This commit is contained in:
Hugh Rundle 2022-09-18 17:10:51 +10:00
parent 6db4fb39ed
commit 5b244f06d6
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bookwyrm/templates/preferences/2fa.html
View file

@ -32,7 +32,7 @@
<div class="field"> <div class="field">
<label class="label" for="id_otp">{% trans "Enter the code from your authenticator app:" %}</label> <label class="label" for="id_otp">{% trans "Enter the code from your authenticator app:" %}</label>
{{ form.otp }} {{ form.otp }}
{% include 'snippets/form_errors.html' with errors_list=form.current_password.errors id="desc_current_password" %} {% include 'snippets/form_errors.html' with errors_list=form.otp.errors id="desc_otp" %}
</div> </div>
<button class="button is-primary" type="submit">{% trans "Confirm" %}</button> <button class="button is-primary" type="submit">{% trans "Confirm" %}</button>
</form> </form>
@ -46,7 +46,7 @@
<div class="field"> <div class="field">
<label class="label" for="id_password">{% trans "Password:" %}</label> <label class="label" for="id_password">{% trans "Password:" %}</label>
{{ form.password }} {{ form.password }}
{% include 'snippets/form_errors.html' with errors_list=form.current_password.errors id="desc_current_password" %} {% include 'snippets/form_errors.html' with errors_list=form.password.errors id="desc_password" %}
</div> </div>
<button class="button is-primary" type="submit">{% trans "Set up 2FA" %}</button> <button class="button is-primary" type="submit">{% trans "Set up 2FA" %}</button>
</form> </form>

14
bookwyrm/views/preferences/two_factor_auth.py
View file

@ -31,11 +31,10 @@ class Edit2FA(View):
def post(self, request): def post(self, request):
"""check the user's password""" """check the user's password"""
form = forms.ConfirmPasswordForm(request.POST, instance=request.user) form = forms.ConfirmPasswordForm(request.POST, instance=request.user)
# TODO: display an error
if not form.is_valid(): if not form.is_valid():
data = {"form": form} data = {"form": form}
return TemplateResponse(request, "preferences/2fa.html", data) return TemplateResponse(request, "preferences/2fa.html", data)
qr_form = forms.Confirm2FAForm(request.POST, instance=request.user) qr_form = forms.Confirm2FAForm()
data = { data = {
"password_confirmed": True, "password_confirmed": True,
"qrcode": self.create_qr_code(request.user), "qrcode": self.create_qr_code(request.user),
@ -66,10 +65,15 @@ class Confirm2FA(View):
def post(self, request): def post(self, request):
"""confirm the 2FA works before requiring it""" """confirm the 2FA works before requiring it"""
form = forms.Confirm2FAForm(request.POST, instance=request.user) form = forms.Confirm2FAForm(request.POST, instance=request.user)
# TODO: show an error here
if not form.is_valid(): if not form.is_valid():
data = {"form": form} data = {
return redirect("prefs-2fa") "password_confirmed": True,
"qrcode": Edit2FA.create_qr_code(self, request.user),
"form": form,
}
return TemplateResponse(request, "preferences/2fa.html", data)
# set the user's 2FA setting on # set the user's 2FA setting on
request.user.two_factor_auth = True request.user.two_factor_auth = True
request.user.save(broadcast=False, update_fields=["two_factor_auth"]) request.user.save(broadcast=False, update_fields=["two_factor_auth"])