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

Add the APIs required to change the time machine policy for users and organizations.

Browse source
This commit is contained in:
Jake Moshenko 2015-02-12 14:37:11 -05:00
parent 872539bdbf
commit 990739b1e5
3 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
data/model/legacy.py
View file

@ -937,6 +937,11 @@ def change_invoice_email(user, invoice_email):
user.save() user.save()
def change_user_tag_expiration(user, tag_expiration_s):
user.removed_tag_expiration_s = tag_expiration_s
user.save()
def update_email(user, new_email, auto_verify=False): def update_email(user, new_email, auto_verify=False):
user.email = new_email user.email = new_email
user.verified = auto_verify user.verified = auto_verify

9
endpoints/api/organization.py
View file

@ -116,6 +116,11 @@ class Organization(ApiResource):
'type': 'boolean', 'type': 'boolean',
'description': 'Whether the organization desires to receive emails for invoices', 'description': 'Whether the organization desires to receive emails for invoices',
}, },
'tag_expiration': {
'type': 'integer',
'maximum': 2592000,
'minimum': 0,
},
}, },
}, },
} }
@ -161,6 +166,10 @@ class Organization(ApiResource):
logger.debug('Changing email address for organization: %s', org.username) logger.debug('Changing email address for organization: %s', org.username)
model.update_email(org, new_email) model.update_email(org, new_email)
if 'tag_expiration' in org_data:
logger.debug('Changing organization tag expiration to: %ss', org_data['tag_expiration'])
model.change_user_tag_expiration(org, org_data['tag_expiration'])
teams = model.get_teams_within_org(org) teams = model.get_teams_within_org(org)
return org_view(org, teams) return org_view(org, teams)
raise Unauthorized() raise Unauthorized()

10
endpoints/api/user.py
View file

@ -71,6 +71,7 @@ def user_view(user):
'can_create_repo': True, '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,
}) })
if features.SUPER_USERS: if features.SUPER_USERS:
@ -142,6 +143,11 @@ class User(ApiResource):
'type': 'string', 'type': 'string',
'description': 'The user\'s email address', 'description': 'The user\'s email address',
}, },
'tag_expiration': {
'type': 'integer',
'maximum': 2592000,
'minimum': 0,
},
'username': { 'username': {
'type': 'string', 'type': 'string',
'description': 'The user\'s username', 'description': 'The user\'s username',
@ -225,6 +231,10 @@ class User(ApiResource):
logger.debug('Changing invoice_email for user: %s', user.username) logger.debug('Changing invoice_email for user: %s', user.username)
model.change_invoice_email(user, user_data['invoice_email']) model.change_invoice_email(user, user_data['invoice_email'])
if 'tag_expiration' in user_data:
logger.debug('Changing user tag expiration to: %ss', user_data['tag_expiration'])
model.change_user_tag_expiration(user, user_data['tag_expiration'])
if 'email' in user_data and user_data['email'] != user.email: if 'email' in user_data and user_data['email'] != user.email:
new_email = user_data['email'] new_email = user_data['email']
if model.find_user_by_email(new_email): if model.find_user_by_email(new_email):