External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-03 02:28:12 -03:30
Code Issues Packages Projects Releases Wiki Activity

cleanup up some unused code/comments, and simplify the license migration

Browse Source
This commit is contained in:
Ryan Petrello
2020-10-22 11:39:42 -04:00
parent afc028147a
commit fcf56b4ba6
5 changed files with 3 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/views/root.py
View File

@@ -358,8 +358,6 @@ class ApiV2ConfigView(APIView):
return Response({"error": 'Invalid license submitted.'}, status=status.HTTP_400_BAD_REQUEST)
try:
# Validate entitlement cert and get subscription metadata
# validate() will clear the entitlement cert if not valid
license_data_validated = get_licenser().license_from_manifest(license_data)
except Exception:
logger.warning(smart_text(u"Invalid license submitted."),
@@ -379,11 +377,9 @@ class ApiV2ConfigView(APIView):
return Response({"error": _("Invalid license")}, status=status.HTTP_400_BAD_REQUEST)
def delete(self, request):
# Clear license and entitlement certificate
try:
settings.LICENSE = {}
return Response(status=status.HTTP_204_NO_CONTENT)
except Exception:
# FIX: Log
return Response({"error": _("Failed to remove license.")}, status=status.HTTP_400_BAD_REQUEST)