Expands the keypath to honour ~

Author: rszalski

yoti/client.py

@@ -5,7 +5,7 @@
 import time
 import uuid
 from os import environ
-from os.path import isfile
+from os.path import isfile, expanduser
 
 import requests
 from past.builtins import basestring
@@ -40,12 +40,14 @@ def __init__(self, sdk_id=None, pem_file_path=None):
     @staticmethod
     def __read_pem_file(key_file_path, error_source):
         try:
+            key_file_path = expanduser(key_file_path)
+
             if not isinstance(key_file_path, basestring) or not isfile(key_file_path):
                 raise IOError('File not found: {0}'.format(key_file_path))
             with open(key_file_path, 'rb') as pem_file:
                 return pem_file.read().strip()
-        except (IOError, TypeError, OSError) as exc:
-            error = 'Invalid private key file ' + error_source
+        except (AttributeError, IOError, TypeError, OSError) as exc:
+            error = 'Could not read private key file: "{0}", passed as: {1} '.format(key_file_path, error_source)
             exception = '{0}: {1}'.format(type(exc).__name__, exc)
             raise RuntimeError('{0}: {1}'.format(error, exception))
 

yoti/tests/test_client.py

@@ -64,7 +64,7 @@ def test_creating_client_instance_without_private_key_file():
 def test_creating_client_instance_with_invalid_key_file_arg(key_file):
     with pytest.raises(RuntimeError) as exc:
         Client(YOTI_CLIENT_SDK_ID, key_file)
-    expected_error = 'Invalid private key file argument specified in Client()'
+    expected_error = 'Could not read private key file'
     assert expected_error in str(exc)
     assert str(key_file) in str(exc)
 
@@ -74,9 +74,10 @@ def test_creating_client_instance_with_invalid_key_file_env(key_file):
     environ['YOTI_KEY_FILE_PATH'] = str(key_file)
     with pytest.raises(RuntimeError) as exc:
         Client(YOTI_CLIENT_SDK_ID)
-    expected_error = 'Invalid private key file specified by the ' \
-                     'YOTI_KEY_FILE_PATH env variable'
+    expected_error = 'Could not read private key file'
+    expected_error_source = 'specified by the YOTI_KEY_FILE_PATH env variable'
     assert expected_error in str(exc)
+    assert expected_error_source in str(exc)
     assert str(key_file) in str(exc)
 
 
@@ -89,7 +90,7 @@ def test_creating_client_instance_with_valid_key_file_env_but_invalid_key_file_a
     environ['YOTI_KEY_FILE_PATH'] = PEM_FILE_PATH
     with pytest.raises(RuntimeError) as exc:
         Client(YOTI_CLIENT_SDK_ID, INVALID_KEY_FILE_PATH)
-    expected_error = 'Invalid private key file argument specified in Client()'
+    expected_error = 'Could not read private key file'
     assert expected_error in str(exc)
     assert str(INVALID_KEY_FILE_PATH) in str(exc)