Code review changes

endpoints/api/team.py

@@ -211,7 +211,11 @@ class TeamMember(ApiResource):
         return member_view(user, invited=False)
     
       # User was invited.
-      log_action('org_invite_team_member', orgname, {'member': membername, 'team': teamname})
+      log_action('org_invite_team_member', orgname, {
+        'user': membername,
+        'member': membername,
+        'team': teamname
+      })
       return member_view(user, invited=True)
 
     raise Unauthorized()
@@ -219,11 +223,35 @@ class TeamMember(ApiResource):
   @require_scope(scopes.ORG_ADMIN)
   @nickname('deleteOrganizationTeamMember')
   def delete(self, orgname, teamname, membername):
-    """ Delete an existing member of a team. """
+    """ Delete a member of a team. If the user is merely invited to join
+        the team, then the invite is removed instead.
+    """
     permission = AdministerOrganizationPermission(orgname)
     if permission.can():
       # Remote the user from the team.
       invoking_user = get_authenticated_user().username
+
+      # Find the team.
+      try:
+        team = model.get_organization_team(orgname, teamname)
+      except model.InvalidTeamException:
+        raise NotFound()
+     
+      # Find the member.
+      member = model.get_user(membername)
+      if not member:
+        raise NotFound()
+
+      # First attempt to delete an invite for the user to this team. If none found,
+      # then we try to remove the user directly.
+      if model.delete_team_user_invite(team, member):
+        log_action('org_delete_team_member_invite', orgname, {
+          'user': membername,
+          'team': teamname,
+          'member': membername
+        })
+        return 'Deleted', 204
+
       model.remove_user_from_team(orgname, teamname, membername, invoking_user)
       log_action('org_remove_team_member', orgname, {'member': membername, 'team': teamname})
       return 'Deleted', 204
@@ -251,11 +279,40 @@ class InviteTeamMember(ApiResource):
       # Invite the email to the team.
       inviter = get_authenticated_user()
       invite = handle_addinvite_team(inviter, team, email=email)
-      log_action('org_invite_team_member', orgname, {'email': email, 'team': teamname})
+      log_action('org_invite_team_member', orgname, {
+        'email': email,
+        'team': teamname,
+        'member': email
+      })
       return invite_view(invite)
 
     raise Unauthorized()
 
+  @require_scope(scopes.ORG_ADMIN)
+  @nickname('deleteTeamMemberEmailInvite')
+  def delete(self, orgname, teamname, email):
+    """ Delete an invite of an email address to join a team. """
+    permission = AdministerOrganizationPermission(orgname)
+    if permission.can():
+      team = None
+
+      # Find the team.
+      try:
+        team = model.get_organization_team(orgname, teamname)
+      except model.InvalidTeamException:
+        raise NotFound()
+     
+      # Delete the invite.
+      model.delete_team_email_invite(team, email)
+      log_action('org_delete_team_member_invite', orgname, {
+        'email': email,
+        'team': teamname,
+        'member': email
+      })
+      return 'Deleted', 204
+
+    raise Unauthorized()
+
 
 @resource('/v1/teaminvite/<code>')
 @internal_only
@@ -269,7 +326,7 @@ class TeamMemberInvite(ApiResource):
     try:
       (team, inviter) = model.confirm_team_invite(code, get_authenticated_user())
     except model.DataModelException:
-      raise NotFound()
+      raise NotFound()      
 
     model.delete_matching_notifications(get_authenticated_user(), 'org_team_invite', code=code)