Merge branch 'master' into git

endpoints/web.py

@@ -3,7 +3,6 @@ import logging
 from flask import (abort, redirect, request, url_for, make_response, Response,
                    Blueprint, send_from_directory, jsonify, send_file)
 
-from avatar_generator import Avatar
 from flask.ext.login import current_user
 from urlparse import urlparse
 from health.healthcheck import get_healthchecker
@@ -39,7 +38,6 @@ STATUS_TAGS = app.config['STATUS_TAGS']
 
 
 @web.route('/', methods=['GET'], defaults={'path': ''})
-@web.route('/organization/<path:path>', methods=['GET'])
 @no_cache
 def index(path, **kwargs):
   return render_page_template('index.html', **kwargs)
@@ -50,6 +48,18 @@ def internal_error_display():
   return render_page_template('500.html')
 
 
+@web.route('/organization/<path:path>', methods=['GET'])
+@no_cache
+def org_view(path):
+  return index('')
+
+
+@web.route('/user/<path:path>', methods=['GET'])
+@no_cache
+def user_view(path):
+  return index('')
+
+
 @web.route('/snapshot', methods=['GET'])
 @web.route('/snapshot/', methods=['GET'])
 @web.route('/snapshot/<path:path>', methods=['GET'])
@@ -210,20 +220,6 @@ def endtoend_health():
   return response
 
 
-@app.route("/avatar/<avatar_hash>")
-@set_cache_headers
-def render_avatar(avatar_hash, headers):
-  try:
-    size = int(request.args.get('size', 16))
-  except ValueError:
-    size = 16
-
-  generated = Avatar.generate(size, avatar_hash, "PNG")
-  resp = make_response(generated, 200, {'Content-Type': 'image/png'})
-  resp.headers.extend(headers)
-  return resp
-
-
 @web.route('/tos', methods=['GET'])
 @no_cache
 def tos():
@@ -248,21 +244,6 @@ def robots():
   return send_from_directory('static', 'robots.txt')
 
 
-@web.route('/<path:repository>')
-@no_cache
-@process_oauth
-@parse_repository_name_and_tag
-def redirect_to_repository(namespace, reponame, tag):
-  permission = ReadRepositoryPermission(namespace, reponame)
-  is_public = model.repository_is_public(namespace, reponame)
-
-  if permission.can() or is_public:
-    repository_name = '/'.join([namespace, reponame])
-    return redirect(url_for('web.repository', path=repository_name, tag=tag))
-
-  abort(404)
-
-
 @web.route('/receipt', methods=['GET'])
 @route_show_if(features.BILLING)
 @require_session_login
@@ -449,15 +430,16 @@ def request_authorization_code():
 
     # Load the application information.
     oauth_app = provider.get_application_for_client_id(client_id)
+    app_email = oauth_app.email or organization.email
+
     oauth_app_view = {
       'name': oauth_app.name,
       'description': oauth_app.description,
       'url': oauth_app.application_uri,
-      'avatar': avatar.compute_hash(oauth_app.avatar_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)
       }
     }
 
@@ -533,3 +515,31 @@ def attach_custom_build_trigger(namespace, repository_name):
     return redirect(full_url)
 
   abort(403)
+
+@web.route('/<path:repository>')
+@no_cache
+@process_oauth
+@parse_repository_name_and_tag
+def redirect_to_repository(namespace, reponame, tag):
+  permission = ReadRepositoryPermission(namespace, reponame)
+  is_public = model.repository_is_public(namespace, reponame)
+
+  if permission.can() or is_public:
+    repository_name = '/'.join([namespace, reponame])
+    return redirect(url_for('web.repository', path=repository_name, tag=tag))
+
+  abort(404)
+
+
+@web.route('/<namespace>')
+@no_cache
+@process_oauth
+def redirect_to_namespace(namespace):
+  user_or_org = model.get_user_or_org(namespace)
+  if not user_or_org:
+    abort(404)
+
+  if user_or_org.organization:
+    return redirect(url_for('web.org_view', path=namespace))
+  else:
+    return redirect(url_for('web.user_view', path=namespace))