Add robots to the entity search.

endpoints/api.py

@@ -260,20 +260,26 @@ def get_matching_users(prefix):
 def get_matching_entities(prefix):
   teams = []
 
-  organization_name = request.args.get('organization', None)
+  namespace_name = request.args.get('namespace', None)
+  robot_namespace = None
   organization = None
-  if organization_name:
-    permission = OrganizationMemberPermission(organization_name)
+  try:
+    organization = model.get_organization(namespace_name)
+
+    # namespace name was an org
+    permission = OrganizationMemberPermission(namespace_name)
     if permission.can():
-      try:
-        organization = model.get_organization(organization_name)
-      except model.InvalidOrganizationException:
-        pass
+      robot_namespace = namespace_name
 
-      if organization:
-        teams = model.get_matching_teams(prefix, organization)
+      if request.args.get('includeTeams', False):
+        teams = model.get_matching_teams(prefix, organization)  
 
-  users = model.get_matching_users(prefix, organization)
+  except model.InvalidOrganizationException:
+    # namespace name was a user
+    if current_user.db_user().username == namespace_name:
+      robot_namespace = namespace_name
+
+  users = model.get_matching_users(prefix, robot_namespace, organization)
 
   def entity_team_view(team):
     result = {
@@ -286,7 +292,7 @@ def get_matching_entities(prefix):
   def user_view(user):
     user_json = {
       'name': user.username,
-      'kind': 'user',
+      'kind': 'robot' if user.is_robot else 'user',
     }
 
     if user.is_org_member is not None: