Merge pull request #2810 from coreos-inc/joseph.schorr/QUAY-747/common-data-interface

Convert endpoints/common into using a data interface
This commit is contained in:
josephschorr 2017-07-24 15:59:13 -04:00 committed by GitHub
commit 074b4e4981
21 changed files with 217 additions and 175 deletions

View file

@ -401,7 +401,7 @@ class SuperUserCreateInitialSuperUser(ApiResource):
superusers.register_superuser(username)
# Conduct login with that user.
common_login(superuser)
common_login(superuser.uuid)
return {
'status': True

View file

@ -317,7 +317,7 @@ class User(ApiResource):
model.user.change_password(user, user_data['password'])
# Login again to reset their session cookie.
common_login(user)
common_login(user.uuid)
if features.MAILING:
send_password_changed(user.username, user.email)
@ -436,7 +436,7 @@ class User(ApiResource):
'awaiting_verification': True
}
else:
common_login(new_user)
common_login(new_user.uuid)
return user_view(new_user)
except model.user.DataModelException as ex:
raise request_error(exception=ex)
@ -528,7 +528,7 @@ def conduct_signin(username_or_email, password, invite_code=None):
if invite_code:
handle_invite_code(invite_code, found_user)
if common_login(found_user):
if common_login(found_user.uuid):
return {'success': True}
else:
needs_email_verification = True
@ -688,7 +688,7 @@ class VerifyUser(ApiResource):
'invalidCredentials': True,
}, 403
common_login(result)
common_login(result.uuid)
return {'success': True}