Merge pull request xolphin#8 from dtsander/master

Added additional properties

Author: fukszssl247

xolphin/certificate_requests/create_certificate_request.py

@@ -21,13 +21,15 @@ def __init__(self, product, years, csr, dcv_type):
         self.kvk = ''
         self.reference = ''
         self.language = ''
+        self.disable_free_san = False
 
     def toDict(self):
         result = {
             'product': self.product,
             'years': self.years,
             'csr': self.csr,
             'dcvType': self.dcv_type,
+            'disableFreeSan': int(self.disable_free_san),  # int cast is a workaround, booleans don't work here.
         }
 
         if len(self.subject_alternative_names) > 0: result['subjectAlternativeNames'] = ','.join(self.subject_alternative_names)

xolphin/certificate_requests/reissue_certificate_request.py

@@ -19,11 +19,13 @@ def __init__(self, csr, dcv_type):
         self.kvk = ''
         self.reference = ''
         self.language = ''
+        self.disable_free_san = False
 
     def toDict(self):
         result = {
             'csr': self.csr,
             'dcvType': self.dcv_type,
+            'disableFreeSan': int(self.disable_free_san),  # int cast is a workaround, booleans don't work here.
         }
 
         if len(self.subject_alternative_names) > 0: result['subjectAlternativeNames'] = ','.join(self.subject_alternative_names)

xolphin/certificate_requests/renew_certificate_request.py

@@ -21,13 +21,15 @@ def __init__(self, product, years, csr, dcv_type):
         self.kvk = ''
         self.reference = ''
         self.language = ''
+        self.disable_free_san = False
 
     def toDict(self):
         result = {
             'product': self.product,
             'years': self.years,
             'csr': self.csr,
             'dcvType': self.dcv_type,
+            'disableFreeSan': int(self.disable_free_san),  # int cast is a workaround, booleans don't work here.
         }
 
         if len(self.subject_alternative_names) > 0: result['subjectAlternativeNames'] = ','.join(self.subject_alternative_names)

xolphin/responses/certificate.py

@@ -12,11 +12,12 @@ def __init__(self, data):
             if 'subjectAlternativeNames' in data: self.subject_alternative_names = data['subjectAlternativeNames']
             if 'dateIssued' in data: self.date_issued = datetime.datetime.strptime(data['dateIssued'].split('T')[0], '%Y-%m-%d')
             if 'dateExpired' in data: self.date_expired = datetime.datetime.strptime(data['dateExpired'].split('T')[0], '%Y-%m-%d')
+            if 'dateSubscriptionExpired' in data: self.date_subscription_expired = datetime.datetime.strptime(data['dateSubscriptionExpired'].split('T')[0], '%Y-%m-%d') if data['dateSubscriptionExpired'] is not None else None
             if 'company' in data: self.company = data['company']
             if 'customerId' in data: self.customer_id = data['customerId']
 
             if ('_embedded' in data) and ('product' in data['_embedded']):
                 self.product = Product(data['_embedded']['product'])
 
     def isExpired(self):
-        return self.date_expired <= datetime.datetime.now()
+        return self.date_expired <= datetime.datetime.now()