Merge pull request #57 from sserrata/hotfix-1.2.3

Hotfix 1.2.3 #56

Author: sserrata

HISTORY.rst

@@ -2,6 +2,13 @@
 History
 =======
 
+1.2.3 (2018-06-21)
+------------------
+
+* Reversed the `access_token` lookup order in get_credentials() method.
+* Added `_resolve_credential()` to `access_token()` property method to support token caching.
+* Now comparing passed `access_token` in `refresh()` method to value returned by property method.
+
 1.2.2 (2018-06-20)
 ------------------
 

pancloud/__init__.py

@@ -11,4 +11,4 @@
 from .credentials import Credentials
 
 __author__ = 'Palo Alto Networks'
-__version__ = '1.2.2'
+__version__ = '1.2.3'

pancloud/credentials.py

@@ -105,6 +105,9 @@ def __init__(self, auth_base_url=None, cache_token=True,
     @property
     def access_token(self):
         """Get access_token"""
+        if self.cache_token:
+            return self.access_token_ or \
+                   self._resolve_credential('access_token')
         return self.access_token_
 
     @property
@@ -255,8 +258,8 @@ def get_credentials(self):
 
         """
         if self.cache_token:
-            access_token = self._resolve_credential(
-                'access_token') or self.access_token_
+            access_token = self.access_token_ or \
+                           self._resolve_credential('access_token')
         else:
             access_token = self.access_token_
         client_id = self.client_id_ or self._resolve_credential(
@@ -294,7 +297,7 @@ def refresh(self, timeout=None, access_token=None):
         """
         if not self.token_lock.locked():
             with self.token_lock:
-                if access_token == self.access_token_ or access_token is None:
+                if access_token == self.access_token or access_token is None:
                     c = self.get_credentials()
                     if c.client_id and c.client_secret and c.refresh_token:
                         r = self.session.post(

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.2
+current_version = 1.2.3
 commit = True
 tag = True
 

setup.py

@@ -24,7 +24,7 @@
 
 setup(
     name='pancloud',
-    version='1.2.2',
+    version='1.2.3',
     description="Python idiomatic SDK for the Palo Alto Networks Application Framework.",
     long_description=readme + '\n\n' + history,
     author="Steven Serrata",