Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 27 additions & 0 deletions admin/templates/users/add_email.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{% if perms.osf.change_osfuser %}
<a data-toggle="modal" data-target="#addEmailModal" class="btn btn-default">Add email</a>
<div class="modal" id="addEmailModal">
<div class="modal-dialog">
<div class="modal-content">
<form class="well" method="post" action="{% url 'users:add-email' guid=user.guid %}">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">x</button>
<h3>Add email to user</h3>
</div>
<div class="modal-body">
<h4>User: {{ user.guid }}</h4>
{% csrf_token %}
<label for="id_new_email">Email address</label>
<input type="email" name="new_email" id="id_new_email" class="form-control" required />
</div>
<div class="modal-footer">
<input class="btn btn-primary" type="submit" value="Add and send confirmation" />
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
</div>
</form>
</div>
</div>
</div>
{% endif %}


1 change: 1 addition & 0 deletions admin/templates/users/user.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<div class="btn-group" role="group">
<a href="{% url 'users:search' %}" class="btn btn-default"><i class="fa fa-search"></i></a>
{% include "users/reset_password.html" with user=user %}
{% include "users/add_email.html" with user=user %}
{% if perms.osf.change_osfuser %}
<a href="{% url 'users:get-reset-password' guid=user.guid %}" data-toggle="modal" data-target="#getResetModal" class="btn btn-default">Get password reset link</a>
{% if user.confirmed %}
Expand Down
4 changes: 4 additions & 0 deletions admin/users/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ class MergeUserForm(forms.Form):

class AddSystemTagForm(forms.Form):
system_tag_to_add = forms.CharField(label='system_tag_to_add', min_length=1, max_length=1024, required=True)


class AddEmailForm(forms.Form):
new_email = forms.EmailField(label='new_email', required=True)
1 change: 1 addition & 0 deletions admin/users/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
re_path(r'^(?P<guid>[a-z0-9]+)/get_reset_password/$', views.GetPasswordResetLink.as_view(), name='get-reset-password'),
re_path(r'^(?P<guid>[a-z0-9]+)/reindex_elastic_user/$', views.UserReindexElastic.as_view(),
name='reindex-elastic-user'),
re_path(r'^(?P<guid>[a-z0-9]+)/add_email/$', views.UserAddEmail.as_view(), name='add-email'),
re_path(r'^(?P<guid>[a-z0-9]+)/merge_accounts/$', views.UserMergeAccounts.as_view(), name='merge-accounts'),
re_path(r'^(?P<guid>[a-z0-9]+)/draft_registrations/$', views.UserDraftRegistrationsList.as_view(), name='draft-registrations'),
]
32 changes: 31 additions & 1 deletion admin/users/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
EmailResetForm,
UserSearchForm,
MergeUserForm,
AddSystemTagForm
AddSystemTagForm,
AddEmailForm
)
from admin.base.views import GuidView
from api.users.services import send_password_reset_email
Expand Down Expand Up @@ -408,6 +409,35 @@ def form_valid(self, form):
return super().form_valid(form)


class UserAddEmail(UserMixin, FormView):
"""Allows authorized users to add an email to a user's account and trigger confirmation."""
permission_required = 'osf.change_osfuser'
raise_exception = True
form_class = AddEmailForm

def form_valid(self, form):
from osf.exceptions import BlockedEmailError
from django.core.exceptions import ValidationError as DjangoValidationError
from framework.auth.views import send_confirm_email_async
from django.utils import timezone

user = self.get_object()
address = form.cleaned_data['new_email'].strip().lower()
try:
user.add_unconfirmed_email(address)

send_confirm_email_async(user, email=address)
user.email_last_sent = timezone.now()
user.save()
messages.success(self.request, f'Added unconfirmed email {address} and sent confirmation email.')
except (DjangoValidationError, ValueError) as e:
messages.error(self.request, f'Invalid email: {getattr(e, "message", str(e))}')
except BlockedEmailError:
messages.error(self.request, 'This email address domain is blocked.')

return super().form_valid(form)


class UserMergeAccounts(UserMixin, FormView):
""" Allows authorized users to merge a user's accounts using their guid.
"""
Expand Down
Loading