Merge branch 'master' into release

Author: YaroslawEkimov

Examples/AcceptAllRevisionsOnline.py

@@ -5,4 +5,4 @@
 request_document = open(file_name, 'rb')
 request = asposewordscloud.models.requests.AcceptAllRevisionsOnlineRequest(document=request_document)
 accept_all_revisions_online_result = words_api.accept_all_revisions_online(request)
-copyfile(accept_all_revisions_online_result.document, 'test_result.docx')
+open('test_result.docx','wb').write(list(accept_all_revisions_online_result.document.values())[0])

README.md

@@ -16,6 +16,14 @@ Python Cloud SDK wraps Aspose.Words Cloud API so you could seamlessly integrate
 - [Convert a document to desired file format](https://docs.aspose.cloud/display/wordscloud/Convert+Document+to+Destination+Format+with+Detailed+Settings+and+Save+Result+to+Storage) along with detailed settings.
 - Convert an encrypted PDF document into Word document format.
 
+## Enhancements in Version 22.3
+
+- Online methods returns the dictionary of files with included original filename as key instead of single file content in responses.
+- Parameters contained sensitive data should be passed in encrypted form. Names of the parameters have 'encrypted' prefix.
+- Added Encrypt method to encrypt data on the API public key. Use it to prepare values for parameters required encrypted data.
+- GetPublicKey method is not billable.
+
+
 ## Enhancements in Version 22.2
 
 - Made 'SaveOprionsData.SaveFormat' property readonly with default value.

asposewordscloud/__init__.py

@@ -169,6 +169,7 @@
 from asposewordscloud.models.pcl_save_options_data import PclSaveOptionsData
 from asposewordscloud.models.pdf_digital_signature_details_data import PdfDigitalSignatureDetailsData
 from asposewordscloud.models.pdf_encryption_details_data import PdfEncryptionDetailsData
+from asposewordscloud.models.pdf_permissions import PdfPermissions
 from asposewordscloud.models.pdf_save_options_data import PdfSaveOptionsData
 from asposewordscloud.models.png_save_options_data import PngSaveOptionsData
 from asposewordscloud.models.preferred_width import PreferredWidth

asposewordscloud/api_client.py

@@ -36,13 +36,13 @@
 import os
 import re
 import tempfile
+import uuid
 
 # python 2 and python 3 compatibility library
 from urllib.parse import urlencode
 from six.moves.urllib.parse import quote
 import six
 from urllib3 import encode_multipart_formdata
-from base64 import b64encode
 
 from asposewordscloud.configuration import Configuration
 import asposewordscloud.models
@@ -83,12 +83,12 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
 
         self.pool = None
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '22.2'}
+        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '22.3'}
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'python sdk 22.2'
+        self.user_agent = 'python sdk 22.3'
 
     def __del__(self):
         if not self.pool is None:
@@ -254,6 +254,41 @@ def sanitize_for_serialization(self, obj):
         return {key: self.sanitize_for_serialization(val)
                 for key, val in six.iteritems(obj_dict)}
 
+    def getFilenameFromHeaders(self, headers):
+        disposition = ""
+        if b'Content-Disposition' in headers:
+            disposition = headers[b'Content-Disposition']
+            if type(disposition) != str:
+                disposition = disposition.decode("utf-8") 
+        elif "Content-Disposition" in headers:
+            disposition = headers["Content-Disposition"]
+        else:
+            return ""
+
+        dispparts = disposition.split(";")
+        for dispart in dispparts:
+            subparts = dispart.split("=")
+            if len(subparts) == 2 and subparts[0].strip(" \"") == "filename":
+                return subparts[1].strip(" \"")
+        return ""
+
+    def findMultipartByName(self, multipart, name):
+        for part in multipart:
+            disposition = ""
+            if b'Content-Disposition' in part.headers:
+                disposition = part.headers[b'Content-Disposition']
+                if type(disposition) != str:
+                    disposition = disposition.decode("utf-8") 
+            elif "Content-Disposition" in part.headers:
+                disposition = part.headers["Content-Disposition"]
+
+            dispparts = disposition.split(";")
+            for dispart in dispparts:
+                subparts = dispart.split("=")
+                if len(subparts) == 2 and subparts[0].strip(" \"") == "name" and subparts[1].strip(" \"") == name:
+                    return part
+        return None
+
     def deserialize_multipart(self, without_intermediate_results, multipart, requests):
         if without_intermediate_results:
             if len(multipart.parts) != 1:
@@ -297,6 +332,21 @@ def deserialize_multipart(self, without_intermediate_results, multipart, request
 
         return results
 
+    def deserialize_files_collection(self, data, headers):
+        result = {}
+        if b'Content-Type' in headers.keys() and headers[b'Content-Type'].decode("utf-8").startswith("multipart/mixed"):
+            parts = decoder.MultipartDecoder(data, headers[b'Content-Type'].decode("utf-8"), 'UTF-8').parts
+            for part in parts:
+                result[self.getFilenameFromHeaders(part.headers)] = self.deserialize_file(part.content, part.headers)
+        elif "Content-Type" in headers.keys() and headers["Content-Type"].startswith("multipart/mixed"):
+            parts = decoder.MultipartDecoder(data, headers["Content-Type"], 'UTF-8').parts
+            for part in parts:
+                result[self.getFilenameFromHeaders(part.headers)] = self.deserialize_file(part.content, part.headers)
+        else:
+            result[self.getFilenameFromHeaders(headers)] = self.deserialize_file(data, headers)
+
+        return result
+
     def deserialize(self, data, headers, response_type):
         """Deserializes response into an object.
 
@@ -309,10 +359,16 @@ def deserialize(self, data, headers, response_type):
         # handle file downloading
         # save response body into a tmp file and return the instance
         if response_type == "file":
-            return self.__deserialize_file(data, headers)
+            return self.deserialize_file(data, headers)
+
+        if response_type == "files_collection":
+            return self.deserialize_files_collection(data, headers)
 
         if response_type == "multipart":
-            return decoder.MultipartDecoder(data, headers['Content-Type'], 'UTF-8')
+            if b'Content-Type' in headers:
+                return decoder.MultipartDecoder(data, headers[b'Content-Type'], 'UTF-8')
+            if "Content-Type" in headers:
+                return decoder.MultipartDecoder(data, headers["Content-Type"], 'UTF-8')
 
         # fetch data from response object
         if six.PY3:
@@ -600,30 +656,8 @@ def update_params_for_auth(self, headers, querys, auth_settings):
                         'Authentication token must be in `query` or `header`'
                     )
 
-    def __deserialize_file(self, data, headers):
-        """Deserializes body to file
-
-        Saves response body into a file in a temporary folder,
-        using the filename from the `Content-Disposition` header if provided.
-
-        :param response:  RESTResponse.
-        :return: file path.
-        """
-        fd, path = tempfile.mkstemp(dir=self.configuration.temp_folder_path)
-        os.close(fd)
-        os.remove(path)
-
-        if 'Content-Disposition' in headers.keys():
-            content_disposition = headers["Content-Disposition"]
-            filename = re.search(r'filename=[\'"]?([^\'"\s]+)[\'"]?',
-                                 content_disposition).group(1)
-            filename = filename.replace('/', '_')
-            path = os.path.join(os.path.dirname(path), filename)
-
-        with open(path, "wb") as f:
-            f.write(data)
-
-        return path
+    def deserialize_file(self, data, headers):
+        return data
 
     def __deserialize_primitive(self, data, klass):
         """Deserializes string to primitive type.
@@ -719,12 +753,12 @@ def __deserialize_model(self, data, klass):
                 instance = self.__deserialize(data, klass_name)
         return instance
 
-    def request_to_batch_part(self, request, rsa_key):
+    def request_to_batch_part(self, request, encryptor):
         http_request = request.create_http_request(self)
         if http_request['form_params'] and http_request['body']:
             raise ValueError("body parameter cannot be used with post_params parameter.")
 
-        self.handle_password(http_request, rsa_key)
+        self.handle_password(http_request, encryptor)
 
         url = http_request['path'][len('/v4.0/words/'):]
         if http_request['query_params']:
@@ -761,10 +795,7 @@ def request_to_batch_part(self, request, rsa_key):
 
         return [None, result, 'multipart']
 
-    def handle_password(self, http_params, rsa_key):
-
-        if rsa_key is None:
-            return
+    def handle_password(self, http_params, encryptor):
 
         index = -1
         for i in range(len(http_params['query_params'])):
@@ -775,4 +806,4 @@ def handle_password(self, http_params, rsa_key):
 
         if index > -1:
             k,v = http_params['query_params'].pop(index)
-            http_params['query_params'].append(('encryptedPassword', b64encode(rsa_key.encrypt(v.encode('utf-8')))))
+            http_params['query_params'].append(('encryptedPassword', encryptor.encrypt(v)))