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

Fix UI for real license handling

Browse source 
Following this change, the user gets detailed errors and entitlement information
This commit is contained in:
Joseph Schorr 2016-10-19 15:35:34 -04:00
parent e450b109a2
commit 213cc856e4
9 changed files with 172 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

20
endpoints/api/superuser.py
View file

@ -856,12 +856,10 @@ class SuperUserLicense(ApiResource):
statuses = decoded_license.validate(app.config)
all_met = all(status.is_met() for status in statuses)
if not all_met:
raise InvalidRequest('License is insufficient')
return {
'decoded': {},
'success': True
'status': [status.as_dict(for_private=True) for status in statuses],
'success': all_met,
}
abort(403)
@ -882,16 +880,14 @@ class SuperUserLicense(ApiResource):
statuses = decoded_license.validate(app.config)
all_met = all(status.is_met() for status in statuses)
if not all_met:
raise InvalidRequest('License is insufficient')
config_provider.save_license(license_contents)
license_validator.compute_license_sufficiency()
if all_met:
# Save the license and update the license check thread.
config_provider.save_license(license_contents)
license_validator.compute_license_sufficiency()
return {
'decoded': {},
'success': True
'status': [status.as_dict(for_private=True) for status in statuses],
'success': all_met,
}
abort(403)