Merge branch 'master' into nomenclature

Conflicts:
	test/data/test.db

endpoints/common.py

@@ -11,7 +11,8 @@ from random import SystemRandom
 
 from data import model
 from data.database import db
-from app import app, login_manager, dockerfile_build_queue, notification_queue
+from app import app, login_manager, dockerfile_build_queue, notification_queue, oauth_apps
+
 from auth.permissions import QuayDeferredPermissionUser
 from auth import scopes
 from endpoints.api.discovery import swagger_route_data
@@ -20,6 +21,7 @@ from functools import wraps
 from config import getFrontendVisibleConfig
 from external_libraries import get_external_javascript, get_external_css
 from endpoints.notificationhelper import spawn_notification
+from util.useremails import CannotSendEmailException
 
 import features
 
@@ -129,6 +131,10 @@ def handle_dme(ex):
   logger.exception(ex)
   return make_response(json.dumps({'message': ex.message}), 400)
 
+@app.errorhandler(CannotSendEmailException)
+def handle_emailexception(ex):
+  message = 'Could not send email. Please contact an administrator and report this problem.'
+  return make_response(json.dumps({'message': message}), 400)
 
 def random_string():
   random = SystemRandom()
@@ -171,6 +177,13 @@ def render_page_template(name, **kwargs):
   external_styles = get_external_css(local=not app.config.get('USE_CDN', True))
   external_scripts = get_external_javascript(local=not app.config.get('USE_CDN', True))
 
+  def get_oauth_config():
+    oauth_config = {}
+    for oauth_app in oauth_apps:
+      oauth_config[oauth_app.key_name] = oauth_app.get_public_config()
+
+    return oauth_config
+
   contact_href = None
   if len(app.config.get('CONTACT_INFO', [])) == 1:
     contact_href = app.config['CONTACT_INFO'][0]
@@ -184,6 +197,7 @@ def render_page_template(name, **kwargs):
                                        library_scripts=library_scripts,
                                        feature_set=json.dumps(features.get_features()),
                                        config_set=json.dumps(getFrontendVisibleConfig(app.config)),
+                                       oauth_set=json.dumps(get_oauth_config()),
                                        mixpanel_key=app.config.get('MIXPANEL_KEY', ''),
                                        google_analytics_key=app.config.get('GOOGLE_ANALYTICS_KEY', ''),
                                        sentry_public_dsn=app.config.get('SENTRY_PUBLIC_DSN', ''),
@@ -265,5 +279,4 @@ def start_build(repository, dockerfile_id, tags, build_name, subdir, manual,
   spawn_notification(repository, 'build_queued', event_data,
                      subpage='build?current=%s' % build_request.uuid,
                      pathargs=['build', build_request.uuid])
-  return build_request
-
+  return build_request