vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Delete old "license" checking code arounds user counts

Browse source 
This is legacy code that doesn't actually do anything of value
This commit is contained in:
Joseph Schorr 2016-10-20 14:58:35 -04:00
parent a74e94fb67
commit b7fc7999c3
4 changed files with 3 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
endpoints/api/user.py
View file

@ -21,7 +21,7 @@ from data.database import Repository as RepositoryTable
from endpoints.api import (ApiResource, nickname, resource, validate_json_request, request_error,
log_action, internal_only, require_user_admin, parse_args,
query_param, require_scope, format_date, show_if,
license_error, require_fresh_login, path_param, define_json_response,
require_fresh_login, path_param, define_json_response,
RepositoryParamResource, page_support)
from endpoints.exception import NotFound, InvalidToken
from endpoints.api.subscribe import subscribe
@ -367,9 +367,6 @@ class User(ApiResource):
else:
common_login(new_user)
return user_view(new_user)
except model.user.TooManyUsersException as ex:
raise license_error(exception=ex)
except model.user.DataModelException as ex:
raise request_error(exception=ex)
@ -439,13 +436,8 @@ class ClientKey(ApiResource):
def conduct_signin(username_or_email, password, invite_code=None):
needs_email_verification = False
invalid_credentials = False
found_user = None
try:
(found_user, error_message) = authentication.verify_and_link_user(username_or_email, password)
except model.user.TooManyUsersException as ex:
raise license_error(exception=ex)
(found_user, error_message) = authentication.verify_and_link_user(username_or_email, password)
if found_user:
# If there is an attached invitation code, handle it here. This will mark the
# user as verified if the code is valid.