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

Merge pull request #681 from coreos-inc/userorg

Browse source 
Return user orgs when making a call via OAuth
This commit is contained in:
josephschorr 2015-10-21 16:41:43 -04:00
commit 5dae970787
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
endpoints/api/user.py
View file

@ -62,16 +62,22 @@ def handle_invite_code(invite_code, user):
def user_view(user): def user_view(user):
def org_view(o): def org_view(o, user_admin=True):
admin_org = AdministerOrganizationPermission(o.username) admin_org = AdministerOrganizationPermission(o.username)
return { org_response = {
'name': o.username, 'name': o.username,
'avatar': avatar.get_data_for_org(o), 'avatar': avatar.get_data_for_org(o),
'is_org_admin': admin_org.can(), 'can_create_repo': CreateRepositoryPermission(o.username).can(),
'can_create_repo': admin_org.can() or CreateRepositoryPermission(o.username).can(),
'preferred_namespace': not (o.stripe_id is None)
} }
if user_admin:
org_response.update({
'is_org_admin': admin_org.can(),
'preferred_namespace': not (o.stripe_id is None),
})
return org_response
organizations = model.organization.get_user_organizations(user.username) organizations = model.organization.get_user_organizations(user.username)
def login_view(login): def login_view(login):
@ -91,23 +97,29 @@ def user_view(user):
user_response = { user_response = {
'anonymous': False, 'anonymous': False,
'username': user.username, 'username': user.username,
'avatar': avatar.get_data_for_user(user) 'avatar': avatar.get_data_for_user(user),
} }
user_admin = UserAdminPermission(user.username) user_admin = UserAdminPermission(user.username)
if user_admin.can(): if user_admin.can():
user_response.update({ user_response.update({
'can_create_repo': True,
'is_me': True, 'is_me': True,
'verified': user.verified, 'verified': user.verified,
'email': user.email, 'email': user.email,
'organizations': [org_view(o) for o in organizations],
'logins': [login_view(login) for login in logins], 'logins': [login_view(login) for login in logins],
'can_create_repo': True,
'invoice_email': user.invoice_email, 'invoice_email': user.invoice_email,
'preferred_namespace': not (user.stripe_id is None), 'preferred_namespace': not (user.stripe_id is None),
'tag_expiration': user.removed_tag_expiration_s, 'tag_expiration': user.removed_tag_expiration_s,
}) })
user_view_perm = UserReadPermission(user.username)
if user_view_perm.can():
user_response.update({
'organizations': [org_view(o, user_admin=user_admin.can()) for o in organizations],
})
if features.SUPER_USERS and SuperUserPermission().can(): if features.SUPER_USERS and SuperUserPermission().can():
user_response.update({ user_response.update({
'super_user': user and user == get_authenticated_user() and SuperUserPermission().can() 'super_user': user and user == get_authenticated_user() and SuperUserPermission().can()