소스 검색

fixup(api): include domain name in lock email

Nils Wisiol 8 년 전
부모
커밋
c9417bab93
3개의 변경된 파일6개의 추가작업 그리고 5개의 파일을 삭제
  1. 4 3
      api/desecapi/emails.py
  2. 1 1
      api/desecapi/templates/emails/captcha/subject.txt
  3. 1 1
      api/desecapi/views.py

+ 4 - 3
api/desecapi/emails.py

@@ -3,15 +3,16 @@ from django.template import Context
 from django.core.mail import EmailMessage
 from rest_framework.reverse import reverse
 
-def send_account_lock_email(request, email):
+def send_account_lock_email(request, user):
     content_tmpl = get_template('emails/captcha/content.txt')
     subject_tmpl = get_template('emails/captcha/subject.txt')
     from_tmpl = get_template('emails/from.txt')
     context = Context({
-        'url': reverse('unlock/byEmail', args=[email], request=request),
+        'url': reverse('unlock/byEmail', args=[user.email], request=request),
+        'domainname': user.domains[0].name if user.domains.count() > 0 else 'deSEC dedyn.io'
     })
     email = EmailMessage(subject_tmpl.render(context),
                          content_tmpl.render(context),
                          from_tmpl.render(context),
-                         [email])
+                         [user.email])
     email.send()

+ 1 - 1
api/desecapi/templates/emails/captcha/subject.txt

@@ -1 +1 @@
-deSEC dedyn.io Account Suspended
+{{domainname}} Account Suspended

+ 1 - 1
api/desecapi/views.py

@@ -296,7 +296,7 @@ class RegistrationView(views.RegistrationView):
             ).exists()
         user = serializer.save(registration_remote_ip=remote_ip, captcha_required=captcha)
         if captcha:
-            send_account_lock_email(self.request, user.email)
+            send_account_lock_email(self.request, user)
         signals.user_registered.send(sender=self.__class__, user=user, request=self.request)