Merge pull request #24 from keyko-io/fix/filename-download

Don't use http query parameters in filename

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.1
+current_version = 0.4.2
 commit = True
 tag = True
 

docs/source/conf.py

@@ -28,7 +28,7 @@
 author = 'nevermined-sdk-py contributors'
 
 # The full version, including alpha/beta/rc tags
-release = '0.4.1'
+release = '0.4.2'
 # The short X.Y version
 release_parts = release.split('.')  # a list
 version = release_parts[0] + '.' + release_parts[1]

nevermined_sdk_py/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.4.1'
+__version__ = '0.4.2'
 from .config import (
     Config
 )

nevermined_sdk_py/gateway/gateway.py

@@ -403,7 +403,7 @@ def get_ecdsa_public_key(config):
     @staticmethod
     def _get_file_name(response):
         try:
-            return re.match(r'attachment;filename=(.+)',
+            return re.match(r'attachment;filename=(.+?)($|\?)',
                             response.headers.get('content-disposition'))[1]
         except Exception as e:
             logger.warning(f'It was not possible to get the file name. {e}')

setup.py

@@ -91,6 +91,6 @@
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/keyko-io/nevermined-sdk-py',
-    version='0.4.1',
+    version='0.4.2',
     zip_safe=False,
 )

tests/gateway/test_gateway.py

@@ -1,8 +1,24 @@
 from nevermined_sdk_py import ConfigProvider
 from nevermined_sdk_py.gateway.gateway import Gateway
+from requests import Response
 
 config = ConfigProvider.get_config()
 
 
 def test_get_rsa_key():
     assert Gateway.get_rsa_public_key(config)
+
+
+def test_get_file_name():
+    response = Response()
+
+    response.headers = {"content-disposition": "attachment;filename=test.txt"}
+    print(response.headers.get("content-disposition"))
+    file_name = Gateway._get_file_name(response)
+    assert file_name == "test.txt"
+
+    response.headers = {
+        "content-disposition": "attachment;filename=test.txt?X-Amz-Algorithm=AWS4-HMAC-SHA256"
+    }
+    file_name = Gateway._get_file_name(response)
+    assert file_name == "test.txt"