Skip to content

Require 2FA to accept an org invite #14485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 5, 2023
Merged

Require 2FA to accept an org invite #14485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d66bb0e
Require 2FA to accept an org invite
ristomcgehee Sep 4, 2023
06d11de
Merge branch 'main' into enforce-2fa-org-invite
miketheman Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions warehouse/locale/messages.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1345,14 +1345,14 @@ msgid ""
msgstr ""

#: warehouse/templates/accounts/invite-confirmation.html:32
#: warehouse/templates/accounts/organization-invite-confirmation.html:32
#: warehouse/templates/accounts/organization-invite-confirmation.html:40
#: warehouse/templates/manage/organizations.html:42
#: warehouse/templates/manage/projects.html:52
msgid "Accept"
msgstr ""

#: warehouse/templates/accounts/invite-confirmation.html:33
#: warehouse/templates/accounts/organization-invite-confirmation.html:33
#: warehouse/templates/accounts/organization-invite-confirmation.html:41
#: warehouse/templates/manage/organizations.html:46
#: warehouse/templates/manage/organizations.html:54
#: warehouse/templates/manage/projects.html:53
Expand Down Expand Up @@ -1402,13 +1402,20 @@ msgstr ""
msgid "Confirm Organization Invite"
msgstr ""

#: warehouse/templates/accounts/organization-invite-confirmation.html:26
#: warehouse/templates/accounts/organization-invite-confirmation.html:34
#, python-format
msgid ""
"Would you like to accept this invitation to join '%(organization_name)s' "
"as an organization %(role_name)s?"
msgstr ""

#: warehouse/templates/accounts/organization-invite-confirmation.html:45
#, python-format
msgid ""
"You must first enable <a href=\"%(href)s\">two-factor authentication</a> "
"on your account before accepting an invitation to join an organization."
msgstr ""

#: warehouse/templates/accounts/profile.html:16
#, python-format
msgid "Profile of %(username)s"
Expand Down
15 changes: 14 additions & 1 deletion warehouse/templates/accounts/organization-invite-confirmation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,16 @@
{% trans %}Confirm Organization Invite{% endtrans %}
{% endblock %}

{% block main %}
{% block prompt %}
{% if request.user.has_two_factor %}
{{ super() }}
{% else %}
<!-- Content hidden -->
{% endif %}
Comment on lines +21 to +25
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

praise: ‏I hadn't seen this pattern used, nice way to hide the confirmation.

{% endblock %}

{% block main %}
{% if request.user.has_two_factor %}
<form method="POST">
<div class="form-group">
<input name="csrf_token" type="hidden" value="{{ request.session.get_csrf_token() }}">
Expand All @@ -33,5 +41,10 @@
<input name="decline" type="submit" value="{% trans %}Decline{% endtrans %}" class="button">
</div>
</form>
{% else %}{# user has not enabled 2FA #}
{% trans href=request.route_path('manage.account.two-factor') %}
You must first enable <a href="{{ href }}">two-factor authentication</a> on your account before accepting an invitation to join an organization.
{% endtrans %}
{% endif %}

{% endblock %}