Merge branch 'driversed' of ssh://bitbucket.org/yackob03/quay into driversed

endpoints/api/user.py

@@ -8,7 +8,7 @@ from flask.ext.principal import identity_changed, AnonymousIdentity
 from app import app, billing as stripe, authentication
 from endpoints.api import (ApiResource, nickname, resource, validate_json_request, request_error,
                            log_action, internal_only, NotFound, require_user_admin,
-                           InvalidToken, require_scope, format_date, hide_if, show_if)
+                           InvalidToken, require_scope, format_date, hide_if, show_if, license_error)
 from endpoints.api.subscribe import subscribe
 from endpoints.common import common_login
 from data import model
@@ -192,6 +192,8 @@ class User(ApiResource):
       code = model.create_confirm_email_code(new_user)
       send_confirmation_email(new_user.username, new_user.email, code.code)
       return 'Created', 201
+    except model.TooManyUsersException as ex:
+      raise license_error(exception=ex)
     except model.DataModelException as ex:
       raise request_error(exception=ex)
 
@@ -226,7 +228,12 @@ def conduct_signin(username_or_email, password):
   needs_email_verification = False
   invalid_credentials = False
 
-  verified = authentication.verify_user(username_or_email, password)
+  verified = None
+  try:
+    verified = authentication.verify_user(username_or_email, password)
+  except model.TooManyUsersException as ex:
+    raise license_error(exception=ex)
+
   if verified:
     if common_login(verified):
       return {'success': True}
@@ -244,6 +251,7 @@ def conduct_signin(username_or_email, password):
 
 @resource('/v1/user/convert')
 @internal_only
+@show_if(app.config['AUTHENTICATION_TYPE'] == 'Database')
 class ConvertToOrganization(ApiResource):
   """ Operations for converting a user to an organization. """
   schemas = {