Merge branch 'fix_verification_url' into 'master'

Obtendo domínio a partir da requisição De acordo com o relatado na issue #107, havia um problema com a necessidade da configuração da variável SITE_URL. Agora o domínio é obtido através da própria requisição. See merge request !91

Merge branch 'fix_verification_url' into 'master'
Obtendo domínio a partir da requisição De acordo com o relatado na issue #107, havia um problema com a necessidade da configuração da variável SITE_URL. Agora o domínio é obtido através da própria requisição. See merge request !91
Lucas Kanashiro
2 parents 709bf66a 566ca024
Showing 5 changed files with 26 additions and 11 deletions Show diff stats
colab/accounts/views.py
colab/super_archives/models.py
colab/super_archives/templates/superarchives/emails/email_verification.txt
colab/super_archives/utils/email.py
colab/super_archives/views.py
@@ -103,7 +103,12 @@ def signup(request):
     user.is_active = False
     user.save()
-    EmailAddressValidation.create(user.email, user)
+    email = EmailAddressValidation.create(user.email, user)
+
+    location = reverse('archive_email_view',
+                       kwargs={'key': email.validation_key})
+    verification_url = request.build_absolute_uri(location)
+    EmailAddressValidation.verify_email(email, verification_url)
     # Check if the user's email have been used previously
     #   in the mainling lists to link the user to old messages
@@ -41,11 +41,17 @@ class EmailAddressValidation(models.Model):
     def create(cls, address, user):
         email_address_validation = cls.objects.create(address=address,
                                                       user=user)
-        email.send_verification_email(email_address_validation.address,
-                                      email_address_validation.user,
-                                      email_address_validation.validation_key)
         return email_address_validation
+    @classmethod
+    def verify_email(cls, email_address_validation, verification_url):
+        return email.send_verification_email(
+            email_address_validation.address,
+            email_address_validation.user,
+            email_address_validation.validation_key,
+            verification_url
+            )
+
 class EmailAddress(models.Model):
     user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True,
 {% load i18n %}
 {% blocktrans with fullname=user.get_full_name|title username=user.username|lower %}Hey, we want to verify that you are indeed "{{ fullname }} ({{ username }})".  If that's the case, please follow the link below:{% endblocktrans %}
-{{ SITE_URL }}{% url 'archive_email_view' key %}
+{{ verification_url }}
 {% blocktrans with username=user.username %}If you're not {{ username }} or didn't request verification you can ignore this email.{% endblocktrans %}
@@ -10,11 +10,11 @@ def colab_send_email(subject, message, to):
     return mail.send_mail(subject, message, from_email, [to])
-def send_verification_email(to, user, validation_key):
+def send_verification_email(to, user, validation_key, verification_url):
     subject = _('Please verify your email ') + u'{}'.format(to)
     msg_tmpl = \
         loader.get_template('superarchives/emails/email_verification.txt')
     message = msg_tmpl.render(Context({'to': to, 'user': user,
-                                       'key': validation_key,
-                                       'SITE_URL': settings.SITE_URL}))
+                                       'verification_url': verification_url
+                                       }))
     return colab_send_email(subject, message, to)
@@ -9,6 +9,7 @@ import requests
 from django import http
 from django.conf import settings
 from django.contrib import messages
+from django.core.urlresolvers import reverse
 from django.db import IntegrityError
 from django.views.generic import View
 from django.utils.translation import ugettext as _
@@ -177,7 +178,7 @@ class EmailView(View):
         except EmailAddressValidation.DoesNotExist:
             messages.error(request, _('The email address you are trying to '
                                       'verify either has already been verified'
-                                      'or does not exist.'))
+                                      ' or does not exist.'))
             return redirect('/')
         try:
@@ -289,8 +290,11 @@ class EmailValidationView(View):
             raise http.Http404
         try:
-            send_verification_email(email_addr, email.user,
-                                    email.validation_key)
+            location = reverse('archive_email_view',
+                               kwargs={'key': email.validation_key})
+            verification_url = request.build_absolute_uri(location)
+            send_verification_email(request, email_addr, email.user,
+                                    email.validation_key, verification_url)
         except smtplib.SMTPException:
             logging.exception('Error sending validation email')
             return http.HttpResponseServerError()
1	{% load i18n %}	1	{% load i18n %}
2	{% blocktrans with fullname=user.get_full_name\|title username=user.username\|lower %}Hey, we want to verify that you are indeed "{{ fullname }} ({{ username }})". If that's the case, please follow the link below:{% endblocktrans %}	2	{% blocktrans with fullname=user.get_full_name\|title username=user.username\|lower %}Hey, we want to verify that you are indeed "{{ fullname }} ({{ username }})". If that's the case, please follow the link below:{% endblocktrans %}
3		3
4	-{{ SITE_URL }}{% url 'archive_email_view' key %}	4	+{{ verification_url }}
5		5
6	{% blocktrans with username=user.username %}If you're not {{ username }} or didn't request verification you can ignore this email.{% endblocktrans %}	6	{% blocktrans with username=user.username %}If you're not {{ username }} or didn't request verification you can ignore this email.{% endblocktrans %}