codeforlife-portal 1.0.0.post.dev99__tar.gz → 1.0.0.post.dev101__tar.gz

{codeforlife-portal-1.0.0.post.dev99 → codeforlife-portal-1.0.0.post.dev101}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: codeforlife-portal
-Version: 1.0.0.post.dev99
+Version: 1.0.0.post.dev101
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

{codeforlife-portal-1.0.0.post.dev99 → codeforlife-portal-1.0.0.post.dev101}/codeforlife_portal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: codeforlife-portal
-Version: 1.0.0.post0.dev99
+Version: 1.0.0.post0.dev101
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

{codeforlife-portal-1.0.0.post.dev99 → codeforlife-portal-1.0.0.post.dev101}/codeforlife_portal.egg-info/SOURCES.txt

@@ -60,6 +60,7 @@ portal/migrations/0045_auto_20150430_1446.py
 portal/migrations/0046_auto_20150723_1101.py
 portal/migrations/0047_remove_userprofile_avatar.py
 portal/migrations/0048_plural_management_frontnews.py
+portal/migrations/0049_refactor_emailverifications.py
 portal/migrations/__init__.py
 portal/static/email_media/cfl_logo_blue_rounded.png
 portal/static/email_media/cfllogo.png
@@ -213,7 +214,6 @@ portal/tests/test_emails.py
 portal/tests/test_independent_student.py
 portal/tests/test_independent_student_joins_a_class.py
 portal/tests/test_location.py
-portal/tests/test_migration_country.py
 portal/tests/test_navigation.py
 portal/tests/test_organisation.py
 portal/tests/test_school_student.py

{codeforlife-portal-1.0.0.post.dev99 → codeforlife-portal-1.0.0.post.dev101}/portal/_version.py

@@ -11,8 +11,8 @@ version_json = '''
 {
  "dirty": false,
  "error": null,
- "full-revisionid": "0e0e11a4fb459e32dff0fa6b14e8c9a2a2374a5a",
- "version": "1.0.0.post.dev99"
+ "full-revisionid": "3cbd62f08b1654d196c2bde3e2b7025696047ce7",
+ "version": "1.0.0.post.dev101"
 }
 '''  # END VERSION_JSON
 

{codeforlife-portal-1.0.0.post.dev99 → codeforlife-portal-1.0.0.post.dev101}/portal/helpers/email.py

@@ -43,7 +43,10 @@ from django.core.mail import EmailMultiAlternatives
 from django.template import Context, loader
 
 from portal.models import EmailVerification
-from portal import app_settings, emailMessages
+from portal import app_settings
+from portal.emailMessages import emailVerificationNeededEmail
+from portal.emailMessages import emailChangeNotificationEmail
+from portal.emailMessages import emailChangeVerificationEmail
 
 NOTIFICATION_EMAIL = 'Code For Life Notification <' + app_settings.EMAIL_ADDRESS + '>'
 VERIFICATION_EMAIL = 'Code For Life Verification <' + app_settings.EMAIL_ADDRESS + '>'
@@ -86,24 +89,48 @@ def send_email(sender, recipients, subject, text_content, html_content=None,
     message.send()
 
 
-def send_verification_email(request, userProfile, new_email=None):
-    verification = EmailVerification.objects.create(
-        user=userProfile,
-        email=new_email,
+def generate_token(user, email="", preverified=False):
+    return EmailVerification.objects.create(
+        user=user.userprofile,
+        new_user=user,
+        email=email,
         token=uuid4().hex[:30],
-        expiry=timezone.now() + timedelta(hours=1))
+        expiry=timezone.now() + timedelta(hours=1),
+        verified=preverified
+    )
 
-    if new_email:
-        emailMessage = emailMessages.emailChangeVerificationEmail(request, verification.token)
-        send_email(VERIFICATION_EMAIL, [new_email], emailMessage['subject'],
-                   emailMessage['message'])
 
-        emailMessage = emailMessages.emailChangeNotificationEmail(request, new_email)
-        send_email(VERIFICATION_EMAIL, [userProfile.user.email], emailMessage['subject'],
-                   emailMessage['message'])
+def send_verification_email(request, user, new_email=None):
+    """Send an email prompting the user to verify their email address."""
 
-    else:
-        emailMessage = emailMessages.emailVerificationNeededEmail(request, verification.token)
+    if not new_email:  # verifying first email address
+        user.email_verifications_old.all().delete()
 
-        send_email(VERIFICATION_EMAIL, [userProfile.user.email], emailMessage['subject'],
-                   emailMessage['message'])
+        verification = generate_token(user)
+
+        message = emailVerificationNeededEmail(request, verification.token)
+        send_email(VERIFICATION_EMAIL,
+                   [user.email],
+                   message['subject'],
+                   message['message'])
+
+    else:  # verifying change of email address.
+        verification = generate_token(user, new_email)
+
+        message = emailChangeVerificationEmail(request, verification.token)
+        send_email(VERIFICATION_EMAIL,
+                   [new_email],
+                   message['subject'],
+                   message['message'])
+
+        message = emailChangeNotificationEmail(request, new_email)
+        send_email(VERIFICATION_EMAIL,
+                   [user.email],
+                   message['subject'],
+                   message['message'])
+
+
+def is_verified(user):
+    """Check that a user has verified their email address."""
+    verifications = user.email_verifications_old.filter(verified=True)
+    return len(verifications) != 0

codeforlife-portal-1.0.0.post.dev101/portal/migrations/0049_refactor_emailverifications.py

@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+def copy_users(apps, schema_editor):
+    model = apps.get_model('portal', 'EmailVerification')
+    for ev in model.objects.all():
+        if ev.user is not None:
+            ev.new_user = ev.user.user
+            ev.save()
+        if ev.used is not None:
+            ev.verified = ev.used
+            ev.save()
+
+
+def restore_users(apps, schema_editor):
+    model = apps.get_model('portal', 'EmailVerification')
+    for ev in model.objects.all():
+        if ev.new_user is not None:
+            ev.user = ev.new_user.userprofile
+            ev.save()
+        if ev.verified is not None:
+            ev.used = ev.verified
+            ev.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('portal', '0048_plural_management_frontnews'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='emailverification',
+            name='new_user',
+            field=models.ForeignKey(
+                to=settings.AUTH_USER_MODEL,
+                related_name='email_verifications_old',
+                null=True,
+                blank=True
+            )
+        ),
+        migrations.AddField(
+            model_name='emailverification',
+            name='verified',
+            field=models.BooleanField(
+                default=False
+            )
+        ),
+        migrations.RunPython(
+            code=copy_users,
+            reverse_code=restore_users
+        ),
+    ]

{codeforlife-portal-1.0.0.post.dev99 → codeforlife-portal-1.0.0.post.dev101}/portal/models.py

@@ -50,10 +50,11 @@ from online_status.status import CACHE_USERS
 
 class UserProfile(models.Model):
     user = models.OneToOneField(User)
-    awaiting_email_verification = models.BooleanField(default=False)
     can_view_aggregated_data = models.BooleanField(default=False)
     developer = models.BooleanField(default=False)
 
+    awaiting_email_verification = models.BooleanField(default=False)
+
     def __unicode__(self):
         return self.user.username
 
@@ -91,7 +92,7 @@ class TeacherModelManager(models.Manager):
             first_name=first_name,
             last_name=last_name)
 
-        userProfile = UserProfile.objects.create(user=user, awaiting_email_verification=True)
+        userProfile = UserProfile.objects.create(user=user)
 
         return Teacher.objects.create(user=userProfile, title=title)
 
@@ -159,7 +160,7 @@ class StudentModelManager(models.Manager):
             password=password,
             first_name=name)
 
-        userProfile = UserProfile.objects.create(user=user, awaiting_email_verification=True)
+        userProfile = UserProfile.objects.create(user=user)
 
         return Student.objects.create(user=userProfile)
 
@@ -193,10 +194,12 @@ class Guardian(models.Model):
 
 class EmailVerification(models.Model):
     user = models.ForeignKey(UserProfile, related_name='email_verifications')
+    new_user = models.ForeignKey(User, related_name='email_verifications_old', null=True, blank=True)
     token = models.CharField(max_length=30)
     email = models.CharField(max_length=200, null=True, default=None, blank=True)
     expiry = models.DateTimeField()
     used = models.BooleanField(default=False)
+    verified = models.BooleanField(default=False)
 
 
 class FrontPageNews(models.Model):

{codeforlife-portal-1.0.0.post.dev99 → codeforlife-portal-1.0.0.post.dev101}/portal/tests/test_independent_student.py

@@ -37,16 +37,14 @@
 import re
 
 from django.core import mail
-
+from django_selenium_clean import selenium
 from selenium.webdriver.support.wait import WebDriverWait
 
 from base_test import BaseTest
-from utils.student import create_independent_student
-from utils.student import submit_independent_student_signup_form
+from utils.student import create_independent_student, submit_independent_student_signup_form
 from utils.messages import is_email_verified_message_showing
 from utils import email as email_utils
 
-from django_selenium_clean import selenium
 
 class TestIndependentStudent(BaseTest):
     def test_signup(self):
@@ -79,7 +77,6 @@ class TestIndependentStudent(BaseTest):
         })
 
     def test_reset_password(self):
-
         homepage = self.go_to_homepage()
 
         username = create_independent_student(homepage)[2]

{codeforlife-portal-1.0.0.post.dev99 → codeforlife-portal-1.0.0.post.dev101}/portal/tests/test_teacher.py

@@ -34,17 +34,18 @@
 # copyright notice and these terms. You must not misrepresent the origins of this
 # program; modified versions of the program must be marked as such and not
 # identified as the original program.
-from django.core import mail
 import re
 
-from base_test import BaseTest
-from portal.tests.pageObjects.portal.home_page import HomePage
+from django.core import mail
+from django_selenium_clean import selenium
 from selenium.webdriver.support.wait import WebDriverWait
+
+from base_test import BaseTest
+from pageObjects.portal.home_page import HomePage
 from utils.teacher import signup_teacher, signup_teacher_directly
 from utils.messages import is_email_verified_message_showing, is_teacher_details_updated_message_showing, is_teacher_email_updated_message_showing
 from utils import email as email_utils
 
-from django_selenium_clean import selenium
 
 class TestTeacher(BaseTest):
     def test_signup(self):

{codeforlife-portal-1.0.0.post.dev99 → codeforlife-portal-1.0.0.post.dev101}/portal/tests/utils/teacher.py

@@ -39,6 +39,8 @@ from django.core import mail
 import sys
 
 from portal.models import Teacher
+from portal.helpers.email import generate_token
+
 
 def generate_details(**kwargs):
     title = kwargs.get('title','Mr')
@@ -53,16 +55,17 @@ def generate_details(**kwargs):
 def signup_teacher_directly(**kwargs):
     title, first_name, last_name, email_address, password = generate_details(**kwargs)
     teacher = Teacher.objects.factory(title, first_name, last_name, email_address, password)
-    teacher.user.awaiting_email_verification = False
+    generate_token(teacher.user.user, preverified=True)
     teacher.user.save()
     return email_address, password
 
+
 def signup_teacher(page):
     page = page.go_to_teach_page()
 
     title, first_name, last_name, email_address, password = generate_details()
     page = page.signup(title, first_name, last_name, email_address, password, password)
-    
+
     page = page.return_to_home_page()
 
     page = email.follow_verify_email_link_to_teach(page, mail.outbox[0])
@@ -70,4 +73,4 @@ def signup_teacher(page):
 
     return page, email_address, password
 
-import email
+import email