Merge branch 'sunday'

endpoints/api/repoemail.py

@@ -3,7 +3,8 @@ import logging
 from flask import request, abort
 
 from endpoints.api import (resource, nickname, require_repo_admin, RepositoryParamResource,
-                           log_action, validate_json_request, NotFound, internal_only)
+                           log_action, validate_json_request, NotFound, internal_only,
+                           show_if)
 
 from app import tf
 from data import model
@@ -25,6 +26,7 @@ def record_view(record):
 
 
 @internal_only
+@show_if(features.MAILING)
 @resource('/v1/repository/<repopath:repository>/authorizedemail/<email>')
 class RepositoryAuthorizedEmail(RepositoryParamResource):
   """ Resource for checking and authorizing e-mail addresses to receive repo notifications. """

endpoints/api/team.py

@@ -2,7 +2,7 @@ from flask import request
 
 from endpoints.api import (resource, nickname, ApiResource, validate_json_request, request_error,
                            log_action, Unauthorized, NotFound, internal_only, require_scope,
-                           query_param, truthy_bool, parse_args, require_user_admin)
+                           query_param, truthy_bool, parse_args, require_user_admin, show_if)
 from auth.permissions import AdministerOrganizationPermission, ViewTeamPermission
 from auth.auth_context import get_authenticated_user
 from auth import scopes
@@ -10,6 +10,8 @@ from data import model
 from util.useremails import send_org_invite_email
 from util.gravatar import compute_hash
 
+import features
+
 def try_accept_invite(code, user):
   (team, inviter) = model.confirm_team_invite(code, user)
 
@@ -26,7 +28,8 @@ def try_accept_invite(code, user):
 
 
 def handle_addinvite_team(inviter, team, user=None, email=None):
-  invite = model.add_or_invite_to_team(inviter, team, user, email)
+  invite = model.add_or_invite_to_team(inviter, team, user, email, 
+    requires_invite = features.MAILING)
   if not invite:
     # User was added to the team directly.
     return
@@ -275,6 +278,7 @@ class TeamMember(ApiResource):
 
 
 @resource('/v1/organization/<orgname>/team/<teamname>/invite/<email>')
+@show_if(features.MAILING)
 class InviteTeamMember(ApiResource):
   """ Resource for inviting a team member via email address. """
   @require_scope(scopes.ORG_ADMIN)
@@ -331,6 +335,7 @@ class InviteTeamMember(ApiResource):
 
 @resource('/v1/teaminvite/<code>')
 @internal_only
+@show_if(features.MAILING)
 class TeamMemberInvite(ApiResource):
   """ Resource for managing invites to jon a team. """
   @require_user_admin

endpoints/api/user.py

@@ -168,7 +168,9 @@ class User(ApiResource):
         logger.debug('Changing password for user: %s', user.username)
         log_action('account_change_password', user.username)
         model.change_password(user, user_data['password'])
-        send_password_changed(user.username, user.email)
+
+        if features.MAILING:
+          send_password_changed(user.username, user.email)
 
       if 'invoice_email' in user_data:
         logger.debug('Changing invoice_email for user: %s', user.username)
@@ -180,10 +182,13 @@ class User(ApiResource):
           # Email already used.
           raise request_error(message='E-mail address already used')
         
-        logger.debug('Sending email to change email address for user: %s',
-                     user.username)
-        code = model.create_confirm_email_code(user, new_email=new_email)
-        send_change_email(user.username, user_data['email'], code.code)
+        if features.MAILING:          
+          logger.debug('Sending email to change email address for user: %s',
+                       user.username)
+          code = model.create_confirm_email_code(user, new_email=new_email)
+          send_change_email(user.username, user_data['email'], code.code)
+        else:
+          model.update_email(user, new_email, auto_verify=not features.MAILING)
         
     except model.InvalidPasswordException, ex:
       raise request_error(exception=ex)
@@ -207,9 +212,7 @@ class User(ApiResource):
 
     try:
       new_user = model.create_user(user_data['username'], user_data['password'],
-                                   user_data['email'])
-      code = model.create_confirm_email_code(new_user)
-      send_confirmation_email(new_user.username, new_user.email, code.code)
+                                   user_data['email'], auto_verify=not features.MAILING)
 
       # Handle any invite codes.
       parsed_invite = parse_single_urn(invite_code)
@@ -221,7 +224,17 @@ class User(ApiResource):
           except model.DataModelException:
             pass
 
-      return 'Created', 201
+
+      if features.MAILING:
+        code = model.create_confirm_email_code(new_user)
+        send_confirmation_email(new_user.username, new_user.email, code.code)
+        return {
+          'awaiting_verification': True
+        }
+      else:
+        common_login(new_user)
+        return user_view(new_user)
+
     except model.TooManyUsersException as ex:
       raise license_error(exception=ex)
     except model.DataModelException as ex:
@@ -441,6 +454,7 @@ class DetachExternal(ApiResource):
 
 
 @resource("/v1/recovery")
+@show_if(features.MAILING)
 @internal_only
 class Recovery(ApiResource):
   """ Resource for requesting a password recovery email. """

endpoints/web.py

@@ -223,6 +223,7 @@ def receipt():
 
 
 @web.route('/authrepoemail', methods=['GET'])
+@route_show_if(features.MAILING)
 def confirm_repo_email():
   code = request.values['code']
   record = None
@@ -243,6 +244,7 @@ def confirm_repo_email():
 
 
 @web.route('/confirm', methods=['GET'])
+@route_show_if(features.MAILING)
 def confirm_email():
   code = request.values['code']
   user = None