Web: Allow to resend email confirmation mail from admin interface

Closes: #93

Co-authored-by: Simon Ruderich <simon@ruderich.org>

Author: F30

src/ctf_gameserver/web/admin.py

@@ -6,6 +6,7 @@
 
 from .registration.models import Team
 from .registration.admin_inline import InlineTeamAdmin
+from .registration.util import send_confirmation_mail
 from .scoring.models import GameControl
 from .util import format_lazy
 
@@ -32,6 +33,13 @@ def site_title(cls):    # pylint: disable=no-self-argument
 admin_site = CTFAdminSite()    # pylint: disable=invalid-name
 
 
+@admin.action(description=_('Resend email confirmation mail'))
+def resend_confirmation_mail(_model_admin, request, queryset):
+
+    for user in queryset:
+        send_confirmation_mail(user, request)
+
+
 @admin.register(User, site=admin_site)
 class CTFUserAdmin(UserAdmin):
     """
@@ -79,6 +87,7 @@ def team_net_number(self, user):
     list_filter = ('is_active', 'is_staff', 'is_superuser', TeamListFilter, 'date_joined')
     search_fields = ('username', 'email', 'team__net_number', 'team__informal_email', 'team__affiliation',
                      'team__country')
+    actions = [resend_confirmation_mail]
 
     fieldsets = (
         (None, {'fields': ('username', 'password', 'email')}),

src/ctf_gameserver/web/registration/forms.py

@@ -1,17 +1,13 @@
 from django import forms
-from django.core.mail import send_mail
-from django.template import loader
-from django.conf import settings
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.models import User
-from django.contrib.sites.shortcuts import get_current_site
 
 import ctf_gameserver.web.scoring.models as scoring_models
 
 from .models import Team
 from .fields import ClearableThumbnailImageInput
-from .util import email_token_generator, get_country_names
+from .util import get_country_names
 
 FIVE_MB = 5 * 1024**2
 
@@ -85,28 +81,6 @@ def save(self, commit=True):
 
         return user
 
-    def send_confirmation_mail(self, request):
-        """
-        Sends an email containing the address confirmation link to the user associated with this form. As it
-        requires a User instance, it should only be called after the object has initially been saved.
-
-        Args:
-            request: The HttpRequest from which this function is being called
-        """
-        competition_name = scoring_models.GameControl.get_instance().competition_name
-
-        context = {
-            'competition_name': competition_name,
-            'protocol': 'https' if request.is_secure() else 'http',
-            'domain': get_current_site(request),
-            'user': self.instance.pk,
-            'token': email_token_generator.make_token(self.instance)
-        }
-        message = loader.render_to_string('confirmation_mail.txt', context)
-
-        send_mail(competition_name+' email confirmation', message, settings.DEFAULT_FROM_EMAIL,
-                  [self.instance.email])
-
 
 class TeamForm(forms.ModelForm):
     """

src/ctf_gameserver/web/registration/util.py

@@ -2,7 +2,37 @@
 import locale
 import csv
 
+from django.conf import settings
+from django.core.mail import send_mail
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
+from django.contrib.sites.shortcuts import get_current_site
+from django.template import loader
+
+import ctf_gameserver.web.scoring.models as scoring_models
+
+
+def send_confirmation_mail(user, request):
+    """
+    Sends an email containing the email address confirmation link to the given user. As it requires a User
+    instance, it should only be called after the User object has initially been saved.
+
+    Args:
+        request: An HttpRequest from which this function is being called
+    """
+
+    email_token_generator = EmailConfirmationTokenGenerator()
+    competition_name = scoring_models.GameControl.get_instance().competition_name
+
+    context = {
+        'competition_name': competition_name,
+        'protocol': 'https' if request.is_secure() else 'http',
+        'domain': get_current_site(request),
+        'user': user.pk,
+        'token': email_token_generator.make_token(user)
+    }
+    message = loader.render_to_string('confirmation_mail.txt', context)
+
+    send_mail(competition_name+' email confirmation', message, settings.DEFAULT_FROM_EMAIL, [user.email])
 
 
 class EmailConfirmationTokenGenerator(PasswordResetTokenGenerator):
@@ -23,9 +53,6 @@ def _make_hash_value(self, user, timestamp):
         return str(user.pk) + user.email + str(login_timestamp) + str(timestamp)
 
 
-email_token_generator = EmailConfirmationTokenGenerator()    # pylint: disable=invalid-name
-
-
 def get_country_names():
     """
     Returns a list of (English) country names from the OKFN/Core Datasets "List of all countries with their

src/ctf_gameserver/web/registration/views.py

@@ -17,7 +17,7 @@
 import ctf_gameserver.web.scoring.models as scoring_models
 from . import forms
 from .models import Team, TeamDownload
-from .util import email_token_generator
+from .util import EmailConfirmationTokenGenerator, send_confirmation_mail
 
 User = get_user_model()    # pylint: disable=invalid-name
 
@@ -40,7 +40,7 @@ def register(request):
         if user_form.is_valid() and team_form.is_valid():
             user = user_form.save()
             team_form.save(user)
-            user_form.send_confirmation_mail(request)
+            send_confirmation_mail(user, request)
 
             messages.success(request,
                              mark_safe(_('Successful registration! A confirmation mail has been sent to '
@@ -75,7 +75,7 @@ def edit_team(request):
             team_form.save(user)
 
             if 'email' in user_form.changed_data:
-                user_form.send_confirmation_mail(request)
+                send_confirmation_mail(user, request)
                 logout(request)
 
                 messages.warning(request, _('A confirmation mail has been sent to your new formal email '
@@ -164,6 +164,7 @@ def confirm_email(request):
         messages.error(request, error_message)
         return render(request, '400.html', status=400)
 
+    email_token_generator = EmailConfirmationTokenGenerator()
     if not email_token_generator.check_token(user, token):
         messages.error(request, error_message)
         return render(request, '400.html', status=400)