Merge remote-tracking branch 'origin/master' into release

Author: dynabic-billing-team

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [21.10.0] - Aspose Words Cloud for Dart 21.10 Release Notes
+
+- Removed 'GraphicsQualityOptions' image save option as it no longer supported.
+- Added query parameter 'displayIntermediateResults' for batch requests. If 'false', the last response in batch will be returned only. Default is 'true'
+- Added 'JsonDataLoadOptions' and 'XmlDataLoadOptions' to 'ReportEngineSettings'
+
+
 ## [21.8.0] - Aspose Words Cloud for Dart 21.8 Release Notes
 
 - Added new api methods to get, insert, update or delete custom xml parts from documents.

README.md

@@ -27,7 +27,7 @@ Add this dependency to your *pubspec.yaml*:
 
 ```yaml
 dependencies:
-  aspose_words_cloud: 21.9.0
+  aspose_words_cloud: 21.10.0
 ```
 
 ## Getting Started

lib/aspose_words_cloud.dart

@@ -122,7 +122,6 @@ export 'src/models/form_field_response.dart';
 export 'src/models/form_field_text_input.dart';
 export 'src/models/form_fields_response.dart';
 export 'src/models/gif_save_options_data.dart';
-export 'src/models/graphics_quality_options_data.dart';
 export 'src/models/header_footer.dart';
 export 'src/models/header_footer_link.dart';
 export 'src/models/header_footer_link_collection.dart';
@@ -136,6 +135,7 @@ export 'src/models/hyperlinks.dart';
 export 'src/models/hyperlinks_response.dart';
 export 'src/models/image_save_options_data.dart';
 export 'src/models/jpeg_save_options_data.dart';
+export 'src/models/json_data_load_options.dart';
 export 'src/models/link.dart';
 export 'src/models/link_element.dart';
 export 'src/models/list_format.dart';
@@ -227,7 +227,6 @@ export 'src/models/split_document_result.dart';
 export 'src/models/stat_data_response.dart';
 export 'src/models/storage_file.dart';
 export 'src/models/story_child_nodes.dart';
-export 'src/models/string_format_data.dart';
 export 'src/models/style.dart';
 export 'src/models/style_apply.dart';
 export 'src/models/style_copy.dart';
@@ -276,6 +275,7 @@ export 'src/models/words_response.dart';
 export 'src/models/xaml_fixed_save_options_data.dart';
 export 'src/models/xaml_flow_save_options_data.dart';
 export 'src/models/xml_color.dart';
+export 'src/models/xml_data_load_options.dart';
 export 'src/models/xps_save_options_data.dart';
 export 'src/requests/accept_all_revisions_online_request.dart';
 export 'src/requests/accept_all_revisions_request.dart';

lib/src/api_client.dart

@@ -32,6 +32,8 @@ import 'dart:typed_data';
 
 import 'package:http/http.dart' as http;
 import 'package:uuid/uuid.dart';
+import 'package:convert/convert.dart';
+import 'package:pointycastle/export.dart';
 
 import '../aspose_words_cloud.dart';
 import './api_request_data.dart';
@@ -41,13 +43,52 @@ import './requests/batch_request.dart';
 
 class ApiClient {
   String _authToken;
+  bool _encryptorInitialized = false;
+
+  final _publicKeyRequester;
+  final PKCS1Encoding _encrypter = PKCS1Encoding(RSAEngine());
   final _starting = ByteData.view(utf8.encoder.convert('--').buffer);
   final _newline = ByteData.view(utf8.encoder.convert('\r\n').buffer);
   final _newline2x = ByteData.view(utf8.encoder.convert('\r\n\r\n').buffer);
 
   final Configuration configuration;
 
-  ApiClient(final this.configuration);
+  ApiClient(final this.configuration, final this._publicKeyRequester);
+
+  Future _initializeEncrypter() async {
+    if (_encryptorInitialized == true) {
+      return;
+    }
+
+    _encryptorInitialized = true;
+    try {
+        final rsaPublicKey = await _publicKeyRequester(GetPublicKeyRequest());
+        if (rsaPublicKey == null || rsaPublicKey.modulus == null || rsaPublicKey.exponent == null) {
+          throw ApiException(400, 'Invalid public key response.');
+        }
+
+        final modulus = BigInt.parse(hex.encode(base64Decode(rsaPublicKey.modulus as String)), radix: 16);
+        final exponent = BigInt.parse(hex.encode(base64Decode(rsaPublicKey.exponent as String)), radix: 16);
+        var pubKey = RSAPublicKey(modulus, exponent);
+
+        _encrypter.init(true, PublicKeyParameter<RSAPublicKey>(pubKey));
+      }
+      catch(_) {
+        _encryptorInitialized = false;
+        rethrow;
+      }
+  }
+
+  Future<String> encryptPassword(final String password) async {
+    await _initializeEncrypter();
+    return base64Encode(
+      _encrypter.process(
+        Uint8List.fromList(
+          utf8.encode(password)
+        )
+      )
+    );
+  }
 
   void _handleResponse(final int statusCode, final String reasonPhrase, final ByteData body) {
     if (statusCode != 200) {
@@ -364,7 +405,7 @@ class ApiClient {
   }
 
   Future<dynamic> call(final RequestBase request) async {
-    var requestData = request.createRequestData(this);
+    var requestData = await request.createRequestData(this);
     var response = await _callWithChecks(requestData);
     if (response == null) {
       return null;
@@ -373,32 +414,29 @@ class ApiClient {
     return request.deserializeResponse(this, response);
   }
 
-  Future< List<dynamic> > callBatch(final List<BatchRequest> requests) async {
-    var bodyParts = requests
-        .map((request) => request.createRequestData(this))
-        .map((requestData) => serializeBatchPart(requestData))
-        .toList();
+  Future< List<dynamic> > callBatch(final List<BatchRequest> requests, final bool displayIntermediateResults) async {
+    var bodyParts = <ApiRequestPart>[];
+    for (final request in requests) {
+      bodyParts.add(serializeBatchPart(await request.createRequestData(this)));
+    }
     var boundary = Uuid().v4();
-    var batchUrl = '${configuration.getApiRootUrl()}/words/batch';
+    var batchUrl = '${configuration.getApiRootUrl()}/words/batch?displayIntermediateResults=$displayIntermediateResults';
     var batchHeaders = <String, String>{};
     var batchBody = serializeMultipart(bodyParts, boundary);
     batchHeaders['Content-Type'] = 'multipart/form-data; boundary="$boundary"';
 
     var batchRequestData = ApiRequestData('PUT', batchUrl, batchHeaders, batchBody);
     var response = await _callWithChecks(batchRequestData);
     var responseParts = deserializeMultipartBatch(response);
-    if (responseParts.length != requests.length) {
-      throw ApiException(400, 'Response and request parts mismatch.');
-    }
-
-    var result = List<dynamic>.filled(requests.length, null);
-    for (var i = 0; i < requests.length; i++) {
-      if (!responseParts.containsKey(requests[i].getRequestId())) {
+    var result = <dynamic>[];
+    responseParts.forEach((key, value) {
+      var request = requests.firstWhere((element) => element.getRequestId() == key);
+      if (request == null) {
         throw ApiException(400, 'Failed to deserialize batch multipart response.');
       }
 
-      result[i] = deserializeBatchPart(requests[i].getRequest(), responseParts[requests[i].getRequestId()]);
-    }
+      result.add(deserializeBatchPart(request.getRequest(), value));
+    });
 
     return result;
   }
@@ -433,7 +471,7 @@ class ApiClient {
 
     var httpRequest = http.Request(requestData.method, Uri.parse(requestData.url));
     httpRequest.headers['x-aspose-client'] = 'dart sdk';
-    httpRequest.headers['x-aspose-client-version'] = '21.9';
+    httpRequest.headers['x-aspose-client-version'] = '21.10';
     httpRequest.headers['Authorization'] = await _getAuthToken();
     if (requestData.headers != null) {
       httpRequest.headers.addAll(requestData.headers);