Switch avatars to be built out of CSS and only overlayed with the gravatar when a non-default exists

endpoints/api/organization.py

@@ -30,13 +30,15 @@ def org_view(o, teams):
   view = {
     'name': o.username,
     'email': o.email if is_admin else '',
-    'avatar': avatar.compute_hash(o.email, name=o.username),
+    'avatar': avatar.get_data_for_user(o),
     'is_admin': is_admin,
     'is_member': is_member
   }
 
   if teams is not None:
+    teams = sorted(teams, key=lambda team:team.id)
     view['teams'] = {t.name : team_view(o.username, t) for t in teams}
+    view['ordered_teams'] = [team.name for team in teams]
 
   if is_admin:
     view['invoice_email'] = o.invoice_email
@@ -301,16 +303,14 @@ class ApplicationInformation(ApiResource):
     if not application:
       raise NotFound()
 
-    org_hash = avatar.compute_hash(application.organization.email,
-                                   name=application.organization.username)
-    app_hash = (avatar.compute_hash(application.avatar_email, name=application.name) if
-                application.avatar_email else org_hash)
+    app_email = application.avatar_email or application.organization.email
+    app_data = avatar.get_data(application.name, app_email, 'app')
 
     return {
       'name': application.name,
       'description': application.description,
       'uri': application.application_uri,
-      'avatar': app_hash,
+      'avatar': app_data,
       'organization': org_view(application.organization, [])
     }
 

endpoints/api/permission.py

@@ -2,6 +2,7 @@ import logging
 
 from flask import request
 
+from app import avatar
 from endpoints.api import (resource, nickname, require_repo_admin, RepositoryParamResource,
                            log_action, request_error, validate_json_request, path_param)
 from data import model
@@ -17,6 +18,8 @@ def role_view(repo_perm_obj):
 
 def wrap_role_view_user(role_json, user):
   role_json['is_robot'] = user.robot
+  if not user.robot:
+    role_json['avatar'] =  avatar.get_data_for_user(user)
   return role_json
 
 
@@ -25,6 +28,11 @@ def wrap_role_view_org(role_json, user, org_members):
   return role_json
 
 
+def wrap_role_view_team(role_json, team):
+  role_json['avatar'] = avatar.get_data_for_team(team)
+  return role_json
+
+
 @resource('/v1/repository/<repopath:repository>/permissions/team/')
 @path_param('repository', 'The full path of the repository. e.g. namespace/name')
 class RepositoryTeamPermissionList(RepositoryParamResource):
@@ -35,8 +43,11 @@ class RepositoryTeamPermissionList(RepositoryParamResource):
     """ List all team permission. """
     repo_perms = model.get_all_repo_teams(namespace, repository)
 
+    def wrapped_role_view(repo_perm):
+      return wrap_role_view_team(role_view(repo_perm), repo_perm.team)
+
     return {
-      'permissions': {repo_perm.team.name: role_view(repo_perm)
+      'permissions': {repo_perm.team.name: wrapped_role_view(repo_perm)
                       for repo_perm in repo_perms}
     }
 

endpoints/api/search.py

@@ -45,7 +45,7 @@ class EntitySearch(ApiResource):
             'name': namespace_name,
             'kind': 'org',
             'is_org_member': True,
-            'avatar': avatar.compute_hash(organization.email, name=organization.username),
+            'avatar': avatar.get_data_for_org(organization),
           }]
 
     except model.InvalidOrganizationException:
@@ -63,7 +63,8 @@ class EntitySearch(ApiResource):
       result = {
         'name': team.name,
         'kind': 'team',
-        'is_org_member': True
+        'is_org_member': True,
+        'avatar': avatar.get_data_for_team(team)
       }
       return result
 
@@ -71,11 +72,12 @@ class EntitySearch(ApiResource):
       user_json = {
         'name': user.username,
         'kind': 'user',
-        'is_robot': user.is_robot,
+        'is_robot': user.robot,
+        'avatar': avatar.get_data_for_user(user)
       }
 
       if organization is not None:
-        user_json['is_org_member'] = user.is_robot or user.is_org_member
+        user_json['is_org_member'] = user.robot or user.is_org_member
 
       return user_json
 

endpoints/api/superuser.py

@@ -108,7 +108,7 @@ def user_view(user):
     'username': user.username,
     'email': user.email,
     'verified': user.verified,
-    'avatar': avatar.compute_hash(user.email, name=user.username),
+    'avatar': avatar.get_data_for_user(user),
     'super_user': superusers.is_superuser(user.username)
   }
 

endpoints/api/team.py

@@ -52,11 +52,11 @@ def team_view(orgname, team):
   view_permission = ViewTeamPermission(orgname, team.name)
   role = model.get_team_org_role(team).name
   return {
-    'id': team.id,
     'name': team.name,
     'description': team.description,
     'can_view': view_permission.can(),
-    'role': role
+    'role': role,
+    'avatar': avatar.get_data_for_team(team)
   }
 
 def member_view(member, invited=False):
@@ -64,7 +64,7 @@ def member_view(member, invited=False):
     'name': member.username,
     'kind': 'user',
     'is_robot': member.robot,
-    'avatar': avatar.compute_hash(member.email, name=member.username) if not member.robot else None,
+    'avatar': avatar.get_data_for_user(member),
     'invited': invited,
   }
 
@@ -76,7 +76,7 @@ def invite_view(invite):
     return {
       'email': invite.email,
       'kind': 'invite',
-      'avatar': avatar.compute_hash(invite.email),
+      'avatar': avatar.get_data(invite.email, invite.email, 'user'),
       'invited': True
     }
 

endpoints/api/user.py

@@ -35,7 +35,7 @@ def user_view(user):
     admin_org = AdministerOrganizationPermission(o.username)
     return {
       'name': o.username,
-      'avatar': avatar.compute_hash(o.email, name=o.username),
+      'avatar': avatar.get_data_for_org(o),
       'is_org_admin': admin_org.can(),
       'can_create_repo': admin_org.can() or CreateRepositoryPermission(o.username).can(),
       'preferred_namespace': not (o.stripe_id is None)
@@ -61,7 +61,7 @@ def user_view(user):
     'verified': user.verified,
     'anonymous': False,
     'username': user.username,
-    'avatar': avatar.compute_hash(user.email, name=user.username),
+    'avatar': avatar.get_data_for_user(user)
   }
 
   user_admin = UserAdminPermission(user.username)
@@ -621,17 +621,16 @@ class UserNotification(ApiResource):
 
 def authorization_view(access_token):
   oauth_app = access_token.application
+  app_email = oauth_app.avatar_email or oauth_app.organization.email
   return {
     'application': {
       'name': oauth_app.name,
       'description': oauth_app.description,
       'url': oauth_app.application_uri,
-      'avatar': avatar.compute_hash(oauth_app.avatar_email or oauth_app.organization.email,
-                                    name=oauth_app.name),
+      'avatar': avatar.get_data(oauth_app.name, app_email, 'app'),
       'organization': {
         'name': oauth_app.organization.username,
-        'avatar': avatar.compute_hash(oauth_app.organization.email,
-                                      name=oauth_app.organization.username)
+        'avatar': avatar.get_data_for_org(oauth_app.organization)
       }
     },
     'scopes': scopes.get_scope_information(access_token.scope),