Skip to content
Snippets Groups Projects
Commit 2c42d8ff authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '507-2fa-login-form-requires-otp-multiple-times' into 'master' 

Resolve "[2FA] Login form requires otp multiple times"

Closes #507

See merge request AlekSIS/official/AlekSIS-Core!743
parents 963b8889 ded8106b
No related branches found
No related tags found
1 merge request!743Resolve "[2FA] Login form requires otp multiple times"
Pipeline #38070 failed
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Hide whitespace changes
Inline Side-by-side
CHANGELOG.rst
+ 9
− 0
View file @ 2c42d8ff
......@@ -6,6 +6,15 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_.
Unreleased
----------
Fixed
~~~~~
* Fix order of submit buttons in login form and restructure login template
to make 2FA work correctly.
`2.0rc7`_ - 2021-10-18
----------------------
......
aleksis/core/templates/two_factor/core/login.html
+ 100
− 92
View file @ 2c42d8ff
......@@ -9,110 +9,118 @@
{% block content %}
{% get_providers as socialaccount_providers %}
<div class="row">
<div class="col m1 l2 xl3"></div>
<div class="col s12 m10 l8 xl6">
<div class="card">
<div class="card-content">
{% if wizard.steps.current == 'auth' and socialaccount_providers %}
<div class="card-title">{% trans "Login with username and password" %}</div>
{% else %}
<div class="card-title">{% trans "Login" %}</div>
{% endif %}
{% if wizard.steps.current == "auth" and user.is_authenticated %}
<div class="alert warning">
<p>
<i class="material-icons left">warning</i>
{% blocktrans %}You have no permission to view this page. Please login with an other account.{% endblocktrans %}
</p>
</div>
{% elif wizard.steps.current == 'auth' %}
<div class="alert primary">
<p>
<i class="material-icons left">info</i>
{% blocktrans %}Please login to see this page.{% endblocktrans %}
</p>
</div>
{% endif %}
{% if not wizard.steps.current == "auth" %}
<div class="alert primary">
<p>
<i class="material-icons left">info</i>
{% if wizard.steps.current == 'token' %}
{% if device.method == 'call' %}
{% blocktrans %}
We are calling your phone right now, please enter the
digits you hear.
{% endblocktrans %}
{% elif device.method == 'sms' %}
{% blocktrans %}
We sent you a text message, please enter the tokens we
sent.
{% endblocktrans %}
{% else %}
<form action="" method="post">
{% csrf_token %}
<div class="row">
<div class="col m1 l2 xl3"></div>
<div class="col s12 m10 l8 xl6">
<div class="card">
<div class="card-content">
{% if wizard.steps.current == 'auth' and socialaccount_providers %}
<div class="card-title">{% trans "Login with username and password" %}</div>
{% else %}
<div class="card-title">{% trans "Login" %}</div>
{% endif %}
{% if wizard.steps.current == "auth" and user.is_authenticated %}
<div class="alert warning">
<p>
<i class="material-icons left">warning</i>
{% blocktrans %}You have no permission to view this page. Please login with an other
account.{% endblocktrans %}
</p>
</div>
{% elif wizard.steps.current == 'auth' %}
<div class="alert primary">
<p>
<i class="material-icons left">info</i>
{% blocktrans %}Please login to see this page.{% endblocktrans %}
</p>
</div>
{% endif %}
{% if not wizard.steps.current == "auth" %}
<div class="alert primary">
<p>
<i class="material-icons left">info</i>
{% if wizard.steps.current == 'token' %}
{% if device.method == 'call' %}
{% blocktrans %}
We are calling your phone right now, please enter the
digits you hear.
{% endblocktrans %}
{% elif device.method == 'sms' %}
{% blocktrans %}
We sent you a text message, please enter the tokens we
sent.
{% endblocktrans %}
{% else %}
{% blocktrans %}
Please enter the tokens generated by your token
generator.
{% endblocktrans %}
{% endif %}
{% elif wizard.steps.current == 'backup' %}
{% blocktrans %}
Please enter the tokens generated by your token
generator.
Use this form for entering backup tokens for logging in.
These tokens have been generated for you to print and keep safe. Please
enter one of these backup tokens to login to your account.
{% endblocktrans %}
{% endif %}
{% elif wizard.steps.current == 'backup' %}
{% blocktrans %}
Use this form for entering backup tokens for logging in.
These tokens have been generated for you to print and keep safe. Please
enter one of these backup tokens to login to your account.
{% endblocktrans %}
{% endif %}
</p>
</div>
{% endif %}
</p>
</div>
{% endif %}
<form id="login_form" action="" method="post">
{% csrf_token %}
{% include "two_factor/_wizard_forms.html" %}
{% if other_devices %}
<p>{% trans "Or, alternatively, use one of your backup phones:" %}</p>
<p>
{% for other in other_devices %}
<button name="challenge_device" value="{{ other.persistent_id }}" class="btn" type="submit">
{{ other|device_action }}
</button>
{% endfor %}
</p>
{% endif %}
{% if backup_tokens %}
<p>{% trans "As a last resort, you can use a backup token:" %}</p>
<p>
<button name="wizard_goto_step" type="submit" value="backup" class="btn">
{% trans "Use Backup Token" %}
</button>
</p>
</div>
<div class="card-action-light">
<button type="submit" class="btn green waves-effect waves-light">
{% trans "Login" %}
<i class="material-icons right">send</i>
</button>
{% if request.site.preferences.auth__allow_password_change and wizard.steps.current == "auth" %}
<a href="{% url "account_reset_password" %}" class="btn-flat right waves-effect waves-light">
{% trans "Reset password" %}
</a>
{% endif %}
</form>
</div>
<div class="card-action-light">
<button form="login_form" type="submit" class="btn green waves-effect waves-light">
{% trans "Login" %}
<i class="material-icons right">send</i>
</button>
{% if request.site.preferences.auth__allow_password_change %}
<a href="{% url "account_reset_password" %}" class="btn-flat right waves-effect waves-light">
{% trans "Reset password" %}
</a>
{% endif %}
</div>
</div>
</div>
{% if wizard.steps.current == 'auth' and socialaccount_providers %}
<div class="card">
<div class="card-content">
{% if other_devices or backup_tokens %}
<div class="card">
<div class="card-content">
<div class="card-title">{% trans "Device currently not available?" %}</div>
{% if other_devices %}
<p>{% trans "Or, alternatively, use one of your backup phones:" %}</p>
<p>
{% for other in other_devices %}
<button name="challenge_device" value="{{ other.persistent_id }}" class="btn" type="submit">
{{ other|device_action }}
</button>
{% endfor %}
</p>
{% endif %}
{% if backup_tokens %}
<p>{% trans "As a last resort, you can use a backup token:" %}</p>
<p>
<button name="wizard_goto_step" type="submit" value="backup" class="btn">
{% trans "Use Backup Token" %}
</button>
</p>
{% endif %}
</div>
</div>
{% endif %}
{% if wizard.steps.current == 'auth' and socialaccount_providers %}
<div class="card">
<div class="card-content">
<div class="card-title">
{% trans "Use alternative login options" %}
</div>
{% include "socialaccount/snippets/provider_list.html" with process="login" %}
</div>
</div>
</div>
{% endif %}
{% endif %}
</div>
</div>
</div>
</form>
{% endblock %}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment