Enforce academic email requirements for students, postdocs, and academic researchers

physionet-django/user/fixtures/demo-user.json

@@ -89,7 +89,7 @@
   "pk": 6,
   "fields": {
     "password": "pbkdf2_sha256$150000$6e8RyzxeUEDC$XjhKiSVwTTucKJIvpC2gYWL/6jCeSBWuZQRMSe8bm3g=",
-    "email": "eula_easley@fake_gmail.com",
+    "email": "eula_easley@mit.edu",
     "username": "eulaeasley",
     "join_date": "2020-03-29",
     "last_login": null,
@@ -3438,7 +3438,7 @@
     "user": [
       "eulaeasley"
     ],
-    "email": "eula_easley@fake_gmail.com",
+    "email": "eula_easley@mit.edu",
     "is_primary_email": true,
     "added_date": "2020-03-29T21:51:08.458Z",
     "verification_date": "2020-03-29T21:51:08.458Z",

physionet-django/user/forms.py

@@ -5,6 +5,7 @@
 from django.conf import settings
 from django.contrib.auth import forms as auth_forms
 from django.contrib.auth import password_validation
+from django.core.exceptions import ValidationError
 from django.core.files.uploadedfile import UploadedFile
 from django.db import transaction
 from django.db.models import F, Q
@@ -474,7 +475,6 @@ def __init__(self, user, *args, **kwargs):
             'organization_name':self.profile.affiliation,
             'webpage':self.profile.website}
 
-
 class ResearchCAF(forms.ModelForm):
     """
     Credential application form research attributes
@@ -599,6 +599,7 @@ def clean(self):
         ref_required = True
         supervisor_required = data['researcher_category'] in [0, 1, 7]
         state_required = data['country'] in ['US', 'CA']
+        category = data['researcher_category']
 
         # Students and postdocs must provide their supervisor as a reference
         if supervisor_required and data['reference_category'] != 0:
@@ -624,6 +625,21 @@ def clean(self):
                 .filter(user=self.user, status=CredentialApplication.Status.PENDING)):
             raise forms.ValidationError('Outstanding application exists.')
 
+        # If the user is a student, postdoc, or academic researcher, an associated email should be provided
+        if category in [0, 1, 2, 7]:
+            has_institutional_email = False
+            for email in self.user.get_emails():
+                try:
+                    validate_institutional_email(email)
+                    has_institutional_email = True
+                except ValidationError:
+                    pass
+            if not has_institutional_email:
+                raise ValidationError(
+                    'Please provide your academic email address'
+                    ' in your email settings.'
+                )
+
     def save(self):
         credential_application = super().save(commit=False)
         slug = get_random_string(20)

physionet-django/user/validators.py

@@ -257,7 +257,8 @@ def validate_institutional_email(value):
     Validate that the email address is from an institutional domain.
     """
     validate_email(value)
-    domains = ["yahoo.com", "163.com", "126.com", "outlook.com", "gmail.com", "qq.com", "foxmail.com"]
+    domains = ["yahoo.com", "163.com", "126.com", "outlook.com", "gmail.com", "qq.com",
+               "foxmail.com", "hotmail.com", "168.com"]
     if value.split('@')[-1].lower() in domains:
         raise ValidationError('Please provide an academic or institutional email address.')