Make email addresses optional in external auth if email feature is turned off

Before this change, external auth such as Keystone would fail if a user without an email address tried to login, even if the email feature was disabled.

endpoints/api/organization.py

@@ -69,7 +69,6 @@ class OrganizationList(ApiResource):
       'description': 'Description of a new organization.',
       'required': [
         'name',
-        'email',
       ],
       'properties': {
         'name': {
@@ -105,8 +104,12 @@ class OrganizationList(ApiResource):
       msg = 'A user or organization with this name already exists'
       raise request_error(message=msg)
 
+    if features.MAILING and not org_data.get('email'):
+      raise request_error(message='Email address is required')
+
     try:
-      model.organization.create_organization(org_data['name'], org_data['email'], user)
+      model.organization.create_organization(org_data['name'], org_data.get('email'), user,
+                                             email_required=features.MAILING)
       return 'Created', 201
     except model.DataModelException as ex:
       raise request_error(exception=ex)

endpoints/api/superuser.py

@@ -210,7 +210,7 @@ class SuperUserList(ApiResource):
     'CreateInstallUser': {
       'id': 'CreateInstallUser',
       'description': 'Data for creating a user',
-      'required': ['username', 'email'],
+      'required': ['username'],
       'properties': {
         'username': {
           'type': 'string',
@@ -253,15 +253,15 @@ class SuperUserList(ApiResource):
 
     user_information = request.get_json()
     if SuperUserPermission().can():
-      username = user_information['username']
-      email = user_information['email']
-
       # Generate a temporary password for the user.
       random = SystemRandom()
       password = ''.join([random.choice(string.ascii_uppercase + string.digits) for _ in range(32)])
 
       # Create the user.
-      user = model.user.create_user(username, password, email, auto_verify=not features.MAILING)
+      username = user_information['username']
+      email = user_information.get('email')
+      user = model.user.create_user(username, password, email, auto_verify=not features.MAILING,
+                                    email_required=features.MAILING)
 
       # If mailing is turned on, send the user a verification email.
       if features.MAILING:

endpoints/api/user.py

@@ -163,7 +163,6 @@ class User(ApiResource):
       'required': [
         'username',
         'password',
-        'email',
       ],
       'properties': {
         'username': {
@@ -355,9 +354,14 @@ class User(ApiResource):
     if existing_user:
       raise request_error(message='The username already exists')
 
+    if features.MAILING and not user_data.get('email'):
+      raise request_error(message='Email address is required')
+
     try:
       new_user = model.user.create_user(user_data['username'], user_data['password'],
-                                   user_data['email'], auto_verify=not features.MAILING)
+                                        user_data.get('email'),
+                                        auto_verify=not features.MAILING,
+                                        email_required=features.MAILING)
 
       email_address_confirmed = handle_invite_code(invite_code, new_user)
       if features.MAILING and not email_address_confirmed: