From 01698e8d16a56a16bd8a2a78e90900f854591227 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <joseph.schorr@coreos.com>
Date: Fri, 24 Apr 2015 16:42:31 -0400
Subject: [PATCH] Fix OAuth 500 error

---
 endpoints/web.py          | 7 ++++---
 templates/oauthorize.html | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/endpoints/web.py b/endpoints/web.py
index 46a0b1502..13f8cbc55 100644
--- a/endpoints/web.py
+++ b/endpoints/web.py
@@ -27,6 +27,7 @@ from util.systemlogs import build_logs_archive
 from auth import scopes
 
 import features
+import json
 
 logger = logging.getLogger(__name__)
 
@@ -431,16 +432,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
+    app_email = oauth_app.avatar_email or oauth_app.organization.email
 
     oauth_app_view = {
       'name': oauth_app.name,
       'description': oauth_app.description,
       'url': oauth_app.application_uri,
-      'avatar': avatar.get_data(oauth_app.name, app_email, 'app'),
+      'avatar': json.dumps(avatar.get_data(oauth_app.name, app_email, 'app')),
       'organization': {
         'name': oauth_app.organization.username,
-        'avatar': avatar.get_data_for_org(oauth_app.organization)
+        'avatar': json.dumps(avatar.get_data_for_org(oauth_app.organization))
       }
     }
 
diff --git a/templates/oauthorize.html b/templates/oauthorize.html
index 0997f1e1b..42aa44e08 100644
--- a/templates/oauthorize.html
+++ b/templates/oauthorize.html
@@ -13,10 +13,10 @@
 
   <div class="container auth-container" ng-if="!user.anonymous">
     <div class="auth-header">
-      <span class="avatar" size="48" hash="'{{ application.avatar }}'"></span>
+      <span class="avatar" size="48" data="{{ application.avatar }}"></span>
       <h2><a href="{{ application.url }}" target="_blank">{{ application.name }}</a></h2>
       <h4>
-        <span class="avatar" size="24" hash="'{{ application.organization.avatar }}'"
+        <span class="avatar" size="24" data="{{ application.organization.avatar }}"
               style="vertical-align: middle; margin-right: 4px;"></span>
         <span style="vertical-align: middle">{{ application.organization.name }}</span>
       </h4>