Removed django dependency

Author: aseveryn-hw

hyperwallet/tests/test_encryption.py

@@ -157,7 +157,6 @@ def test_should_throw_exception_when_jws_signature_has_expired(self):
 
         self.assertEqual(exc.exception.message, 'JWS signature has expired, checked by [exp] JWS header')
 
-
     def __getJwkKeySet(self, location):
 
         try:
@@ -184,5 +183,6 @@ def __findJwkKeyByAlgorithm(self, jwkKeySet, algorithm):
 
         raise HyperwalletException('JWK set doesn\'t contain key with algorithm = ' + algorithm)
 
+
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()

hyperwallet/utils/apiclient.py

@@ -94,7 +94,7 @@ def _makeRequest(self,
             response = self.session.request(
                 method=method,
                 url=urljoin(self.baseUrl, url),
-                data=(data if data is None else self.encryption.encrypt(data)) if self.encrypted else data,
+                data=self.__getRequestData(data),
                 headers=headers,
                 params=params
             )
@@ -192,3 +192,15 @@ def doPut(self, partialUrl, data):
             url=partialUrl,
             data=json.dumps(data).encode('utf-8')
         )
+
+    def __getRequestData(data):
+        '''
+        If encryption is enabled try to encrypt request data, otherwise no action required.
+
+        :param data:
+            Not encrypted request data. **REQUIRED**
+        :returns:
+            Request data, encrypted if necessary.
+        '''
+
+        return (data if data is None else self.encryption.encrypt(data)) if self.encrypted else data

hyperwallet/utils/encryption.py

@@ -12,8 +12,10 @@
 from jose import jws
 
 from hyperwallet.exceptions import HyperwalletException
-from django.core.validators import URLValidator
-from django.core.exceptions import ValidationError
+try:
+    from urlparse import urlparse
+except:
+    from urllib.parse import urlparse
 
 
 class Encryption(object):
@@ -35,8 +37,11 @@ class Encryption(object):
     '''
 
     def __init__(self,
-                 clientPrivateKeySetLocation, hyperwalletKeySetLocation,
-                 encryptionAlgorithm='RSA-OAEP-256', signAlgorithm='RS256', encryptionMethod='A256CBC-HS512',
+                 clientPrivateKeySetLocation,
+                 hyperwalletKeySetLocation,
+                 encryptionAlgorithm='RSA-OAEP-256',
+                 signAlgorithm='RS256',
+                 encryptionMethod='A256CBC-HS512',
                  jwsExpirationMinutes=5):
         '''
         Encryption service for hyperwallet client
@@ -116,17 +121,17 @@ def __getJwkKeySet(self, location):
         :returns:
             JWK key set found at given location.
         '''
-
-        try:
-            URLValidator()(location)
-        except ValidationError:
-            if os.path.isfile(location):
-                with open(location) as f:
-                    return f.read()
-            else:
-                raise HyperwalletException('Wrong JWK key set location path = ' + location)
-
-        return requests.get(location).text
+    try:
+        url = urlparse(location)
+        if url.scheme and url.netloc and url.path:
+            return requests.get(location).text
+        raise HyperwalletException('Failed to parse url from string = ' + location)
+    except:
+        if os.path.isfile(location):
+            with open(location) as f:
+                return f.read()
+        else:
+            raise HyperwalletException('Wrong JWK key set location path = ' + location)
 
     def __findJwkKeyByAlgorithm(self, jwkKeySet, algorithm):
         '''

requirements.txt

@@ -1,5 +1,4 @@
 requests
 requests-toolbelt
 jwcrypto
-python-jose
-django
+python-jose

setup.py

@@ -34,7 +34,7 @@ def extract_metaitem(meta):
     maintainer = extract_metaitem('author'),
     maintainer_email = extract_metaitem('email'),
     packages = find_packages(exclude = ('tests', 'doc')),
-    install_requires = ['requests', 'requests-toolbelt', 'jwcrypto', 'python-jose', 'django<2'],
+    install_requires = ['requests', 'requests-toolbelt', 'jwcrypto', 'python-jose'],
     test_suite = 'nose.collector',
     tests_require = [ 'mock', 'nose'],
     keywords='hyperwallet api',