Address comments on code review

endpoints/api/team.py

@@ -10,6 +10,24 @@ from data import model
 from util.useremails import send_org_invite_email
 from util.gravatar import compute_hash
 
+def try_accept_invite(code, user):
+  try:
+    (team, inviter) = model.confirm_team_invite(code, user)
+  except model.DataModelException:
+    return None
+
+  model.delete_matching_notifications(user, 'org_team_invite', code=code)
+
+  orgname = team.organization.username
+  log_action('org_team_member_invite_accepted', orgname, {
+    'member': user.username,
+    'team': team.name,
+    'inviter': inviter.username
+  })
+
+  return team
+
+
 def handle_addinvite_team(inviter, team, user=None, email=None):
   invite = model.add_or_invite_to_team(inviter, team, user, email)
   if not invite:
@@ -323,20 +341,11 @@ class TeamMemberInvite(ApiResource):
   def put(self, code):
     """ Accepts an invite to join a team in an organization. """
     # Accept the invite for the current user.
-    try:
-      (team, inviter) = model.confirm_team_invite(code, get_authenticated_user())
-    except model.DataModelException:
+    team = try_accept_invite(code, get_authenticated_user())
+    if not team:
       raise NotFound()      
 
-    model.delete_matching_notifications(get_authenticated_user(), 'org_team_invite', code=code)
-
     orgname = team.organization.username
-    log_action('org_team_member_invite_accepted', orgname, {
-        'member': get_authenticated_user().username,
-        'team': team.name,
-        'inviter': inviter.username
-    })
-
     return {
       'org': orgname,
       'team': team.name