pyGuardPoint 2.0.0__tar.gz → 2.0.1__tar.gz

{pyguardpoint-2.0.0 → pyguardpoint-2.0.1}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: pyGuardPoint
-Version: 2.0.0
+Version: 2.0.1
 Summary: Python wrapper for GuardPoint 10 Access Control System
 Author: John Owen
 Maintainer-email: sales@sensoraccess.co.uk
+License: Apache-2.0
 Requires-Python: >3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
@@ -16,6 +17,7 @@ Requires-Dist: python-Levenshtein
 Dynamic: author
 Dynamic: description
 Dynamic: description-content-type
+Dynamic: license
 Dynamic: license-file
 Dynamic: maintainer-email
 Dynamic: requires-dist

{pyguardpoint-2.0.0 → pyguardpoint-2.0.1}/pyGuardPoint/_guardpoint_cardholders.py

@@ -280,8 +280,17 @@ class CardholdersAPI:
         :raises ValueError: If neither `uid` nor `card_code` is provided.
         """
         if card_code:
+            cards = self.get_cards(cardCode=card_code)
+            if len(cards) > 0:
+                if cards[0].cardholderUID is not None:
+                    return self._get_card_holder(cards[0].cardholderUID)
+                else:
+                    return None
+            else:
+                return None
             # Part of the Cards_API
-            return self.get_cardholder_by_card_code(card_code)
+            # (Broken API Call)
+            #return self.get_cardholder_by_card_code(card_code)
         else:
             return self._get_card_holder(uid)
 
@@ -336,10 +345,11 @@ class CardholdersAPI:
                                        "securityGroup," \
                                        "insideArea"
 
-        if self.site_uid is not None:
-            match_args = {'ownerSiteUID': self.site_uid}
-            filter_str = _compose_filter(exact_match=match_args)
-            url_query_params += ("&" + filter_str)
+        # Do not apply site filter, when looking for individuals
+        #if self.site_uid is not None:
+        #    match_args = {'ownerSiteUID': self.site_uid}
+        #    filter_str = _compose_filter(exact_match=match_args)
+        #    url_query_params += ("&" + filter_str)
 
         code, json_body = self.gp_json_query("GET", url=(url + url_query_params))
 

{pyguardpoint-2.0.0 → pyguardpoint-2.0.1}/pyGuardPoint/gp_asyncio/_async_guardpoint_cardholders.py

@@ -194,8 +194,16 @@ class CardholdersAPI:
                               uid: str = None,
                               card_code: str = None):
         if card_code:
+            cards = await self.get_cards(cardCode=card_code)
+            if len(cards) > 0:
+                if cards[0].cardholderUID is not None:
+                    return await self._get_card_holder(cards[0].cardholderUID)
+                else:
+                    return None
+            else:
+                return None
             # Part of the Cards_API
-            return await self.get_cardholder_by_card_code(card_code)
+            # (Broken)return await self.get_cardholder_by_card_code(card_code)
         else:
             return await self._get_card_holder(uid)
 
@@ -237,10 +245,11 @@ class CardholdersAPI:
                                        "securityGroup," \
                                        "insideArea"
 
-        if self.site_uid is not None:
-            match_args = {'ownerSiteUID': self.site_uid}
-            filter_str = _compose_filter(exact_match=match_args)
-            url_query_params += ("&" + filter_str)
+        # Do not apply site filter, when looking for individuals
+        # if self.site_uid is not None:
+        #    match_args = {'ownerSiteUID': self.site_uid}
+        #    filter_str = _compose_filter(exact_match=match_args)
+        #    url_query_params += ("&" + filter_str)
 
         code, json_body = await self.gp_json_query("GET", url=(url + url_query_params))
 

{pyguardpoint-2.0.0 → pyguardpoint-2.0.1}/pyGuardPoint/guardpoint_connection.py

@@ -208,10 +208,15 @@ class GuardPointConnection:
             else:
                 raw_body = json.dumps(json_body)
 
-        headers = headers or {
-            'Content-Type': 'application/json',
-            'Accept': 'application/json'
-        }
+        if len(raw_body) == 0:
+            headers = headers or {
+                'Accept': 'application/json',
+            }
+        else:
+            headers = headers or {
+                'Content-Type': 'application/json',
+                'Accept': 'application/json'
+            }
 
         if auth_str:
             headers['Authorization'] = auth_str

{pyguardpoint-2.0.0 → pyguardpoint-2.0.1}/pyGuardPoint.egg-info/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: pyGuardPoint
-Version: 2.0.0
+Version: 2.0.1
 Summary: Python wrapper for GuardPoint 10 Access Control System
 Author: John Owen
 Maintainer-email: sales@sensoraccess.co.uk
+License: Apache-2.0
 Requires-Python: >3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
@@ -16,6 +17,7 @@ Requires-Dist: python-Levenshtein
 Dynamic: author
 Dynamic: description
 Dynamic: description-content-type
+Dynamic: license
 Dynamic: license-file
 Dynamic: maintainer-email
 Dynamic: requires-dist

{pyguardpoint-2.0.0 → pyguardpoint-2.0.1}/setup.py

@@ -5,7 +5,7 @@ long_description = open('README.rst').read()
 setup(name="pyGuardPoint",
       python_requires='>3.9.0',
       packages=find_packages(),
-      version="2.0.0",
+      version="2.0.1",
       author="John Owen",
       description="Python wrapper for GuardPoint 10 Access Control System",
       long_description_content_type='text/markdown',
@@ -13,5 +13,6 @@ setup(name="pyGuardPoint",
       maintainer_email="sales@sensoraccess.co.uk",
       install_requires=['validators', 'fuzzywuzzy', 'cryptography', 'pysignalr>=1.3.0', 'websockets', 'python-Levenshtein'],
       #packages=['pyGuardPoint'],
+      license="Apache-2.0",
       license_files=('LICENSE.txt',),
       zip_safe=False)