Merge pull request #225 from Vonage/jwt-auth-fix

Jwt auth fix

Author: maxkahan

src/vonage/client.py

@@ -93,7 +93,6 @@ def __init__(
             self.signature_method = getattr(hashlib, signature_method)
 
         self._jwt_auth_params = {}
-        self.jwt = None
 
         if private_key is not None and application_id is not None:
             self._application_id = application_id
@@ -103,8 +102,6 @@ def __init__(
                 with open(self._private_key, "rb") as key_file:
                     self._private_key = key_file.read()
 
-            self.jwt = self._generate_application_jwt()
-
         self._host = "rest.nexmo.com"
         self._api_host = "api.nexmo.com"
 
@@ -115,7 +112,6 @@ def __init__(
 
         self.headers = {"User-Agent": user_agent, "Accept": "application/json"}
 
-
         self.account = Account(self)
         self.application = Application(self)
         self.messages = Messages(self)
@@ -152,7 +148,6 @@ def api_host(self, value=None):
 
     def auth(self, params=None, **kwargs):
         self._jwt_auth_params = params or kwargs
-        self.jwt = self._generate_application_jwt()
 
     def check_signature(self, params):
         params = dict(params)
@@ -293,7 +288,7 @@ def parse(self, host, response):
         logger.debug(f"Response headers {repr(response.headers)}")
         if response.status_code == 401:
             raise AuthenticationError(
-                "Check you're using a valid authentication method for the API you want to use"
+                "Authentication failed. Check you're using a valid authentication method."
             )
         elif response.status_code == 204:
             return None
@@ -313,7 +308,6 @@ def parse(self, host, response):
 
             # Test for standard error format:
             try:
-    
                 error_data = response.json()
                 if (
                     "type" in error_data
@@ -334,7 +328,7 @@ def parse(self, host, response):
             raise ServerError(message)
 
     def _add_jwt_to_request_headers(self):
-        return dict(self.headers, Authorization=b"Bearer " + self.jwt)
+        return dict(self.headers, Authorization=b"Bearer " + self._generate_application_jwt())
 
     def _generate_application_jwt(self):
         iat = int(time.time())

src/vonage/messages.py

@@ -19,7 +19,7 @@ def __init__(self, client):
     def send_message(self, params: dict):        
         self.validate_send_message_input(params)
 
-        if self._client.jwt is None:
+        if self._client._application_id is None:
             self._auth_type='header'
         return self._client.post(
             self._client.api_host(),