@@ -152,13 +140,7 @@
Please provide your Quay Enterprise License. It can be found under the "Raw Format" tab
of your Quay Enterprise subscription in the Tectonic Account.
-
-
-
Validation Failed
-
{{ currentState.licenseError }}
- Please try copying your license from the Tectonic Account again.
-
-
+
-
-
-
diff --git a/util/license.py b/util/license.py
index 694a0b54b..663349a31 100644
--- a/util/license.py
+++ b/util/license.py
@@ -61,6 +61,20 @@ class Entitlement(object):
expiration=repr(self.expiration),
))
+ def as_dict(self, for_private=False):
+ data = {
+ 'name': self.name,
+ }
+
+ if for_private:
+ data.update({
+ 'count': self.count,
+ 'product_name': self.product_name,
+ 'expiration': self.expiration.as_dict(for_private=True),
+ })
+
+ return data
+
class ExpirationType(Enum):
""" An enum which represents the different possible types of expirations. If
you posess an expired enum, you can use this to figure out at what level
@@ -105,6 +119,19 @@ class Expiration(object):
grace_period=repr(self.grace_period),
))
+ def as_dict(self, for_private=False):
+ data = {
+ 'expiration_type': str(self.expiration_type),
+ }
+
+ if for_private:
+ data.update({
+ 'expiration_date': str(self.expiration_date),
+ 'grace_period': str(self.grace_period),
+ })
+
+ return data
+
class EntitlementStatus(IntEnum):
""" An EntitlementStatus represent the current effectiveness of an
@@ -162,6 +189,23 @@ class EntitlementValidationResult(object):
entitlement=repr(self.entitlement),
))
+ def as_dict(self, for_private=False):
+ def req_view():
+ return {
+ 'name': self.requirement.name,
+ 'count': self.requirement.count,
+ }
+
+ data = {
+ 'requirement': req_view(),
+ 'status': str(self.get_status()),
+ }
+
+ if self.entitlement is not None:
+ data['entitlement'] = self.entitlement.as_dict(for_private=for_private)
+
+ return data
+
class License(object):
""" License represents a fully decoded and validated (but potentially expired) license. """