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

Author: dynabic-billing-team

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [23.6.0] - Aspose Words Cloud for Dart 23.6 Release Notes
+
+- Fix XMLHttpRequest in web applications.
+
+
 ## [23.5.0] - Aspose Words Cloud for Dart 23.5 Release Notes
 
 - Added InsertSection method.

README.md

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

lib/src/api_client.dart

@@ -122,7 +122,7 @@ class ApiClient {
   }
 
   Future<void> _updateAuthToken() async {
-    final url = configuration.baseUrl + '/connect/token';
+    final url = configuration.baseUrl + '/v4.0/words/connect/token';
     final data = 'grant_type=client_credentials&client_id=${configuration.clientId}&client_secret=${configuration.clientSecret}';
     final headers = {'Content-Type' : 'application/x-www-form-urlencoded'};
     final response = await http.post(Uri.parse(url), headers: headers, body: data).timeout(configuration.timeout);
@@ -503,7 +503,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'] = '23.5';
+    httpRequest.headers['x-aspose-client-version'] = '23.6';
     httpRequest.headers['Authorization'] = await _getAuthToken();
     httpRequest.headers.addAll(requestData.headers);
 

lib/src/models/bmp_save_options_data.dart

@@ -267,12 +267,6 @@ class BmpSaveOptionsData extends ImageSaveOptionsData {
       useAntiAliasing = null;
     }
 
-    if (json.containsKey('UseGdiEmfRenderer')) {
-      useGdiEmfRenderer = json['UseGdiEmfRenderer'] as bool;
-    } else {
-      useGdiEmfRenderer = null;
-    }
-
     if (json.containsKey('UseHighQualityRendering')) {
       useHighQualityRendering = json['UseHighQualityRendering'] as bool;
     } else {
@@ -284,6 +278,12 @@ class BmpSaveOptionsData extends ImageSaveOptionsData {
     } else {
       verticalResolution = null;
     }
+
+    if (json.containsKey('UseGdiEmfRenderer')) {
+      useGdiEmfRenderer = json['UseGdiEmfRenderer'] as bool;
+    } else {
+      useGdiEmfRenderer = null;
+    }
   }
 
   @override

lib/src/models/comment.dart

@@ -31,25 +31,25 @@ import '../../aspose_words_cloud.dart';
 
 /// DTO container with a comment.
 class Comment extends CommentLink {
-  /// Gets or sets the author name for a comment.
-  String? _author;
+  /// Gets or sets the link to comment range start node.
+  DocumentPosition? _rangeStart;
 
-  String? get author => _author;
-  set author(String? val) => _author = val;
+  DocumentPosition? get rangeStart => _rangeStart;
+  set rangeStart(DocumentPosition? val) => _rangeStart = val;
 
 
-  /// Gets or sets the content of the comment.
-  StoryChildNodes? _content;
+  /// Gets or sets the link to comment range end node.
+  DocumentPosition? _rangeEnd;
 
-  StoryChildNodes? get content => _content;
-  set content(StoryChildNodes? val) => _content = val;
+  DocumentPosition? get rangeEnd => _rangeEnd;
+  set rangeEnd(DocumentPosition? val) => _rangeEnd = val;
 
 
-  /// Gets or sets the date and time that the comment was made.
-  DateTime? _dateTime;
+  /// Gets or sets the author name for a comment.
+  String? _author;
 
-  DateTime? get dateTime => _dateTime;
-  set dateTime(DateTime? val) => _dateTime = val;
+  String? get author => _author;
+  set author(String? val) => _author = val;
 
 
   /// Gets or sets the initials of the user associated with a specific comment.
@@ -59,18 +59,11 @@ class Comment extends CommentLink {
   set initial(String? val) => _initial = val;
 
 
-  /// Gets or sets the link to comment range end node.
-  DocumentPosition? _rangeEnd;
-
-  DocumentPosition? get rangeEnd => _rangeEnd;
-  set rangeEnd(DocumentPosition? val) => _rangeEnd = val;
-
-
-  /// Gets or sets the link to comment range start node.
-  DocumentPosition? _rangeStart;
+  /// Gets or sets the date and time that the comment was made.
+  DateTime? _dateTime;
 
-  DocumentPosition? get rangeStart => _rangeStart;
-  set rangeStart(DocumentPosition? val) => _rangeStart = val;
+  DateTime? get dateTime => _dateTime;
+  set dateTime(DateTime? val) => _dateTime = val;
 
 
   /// Gets or sets text of the comment.
@@ -80,6 +73,13 @@ class Comment extends CommentLink {
   set text(String? val) => _text = val;
 
 
+  /// Gets or sets the content of the comment.
+  StoryChildNodes? _content;
+
+  StoryChildNodes? get content => _content;
+  set content(StoryChildNodes? val) => _content = val;
+
+
   @override
   void deserialize(Map<String, dynamic>? json) {
     if (json == null) {
@@ -94,23 +94,24 @@ class Comment extends CommentLink {
       link = null;
     }
 
-    if (json.containsKey('Author')) {
-      author = json['Author'] as String;
+    if (json.containsKey('RangeStart')) {
+      rangeStart = DocumentPosition();
+      rangeStart!.deserialize(json['RangeStart'] as Map<String, dynamic>);
     } else {
-      author = null;
+      rangeStart = null;
     }
 
-    if (json.containsKey('Content')) {
-      content = StoryChildNodes();
-      content!.deserialize(json['Content'] as Map<String, dynamic>);
+    if (json.containsKey('RangeEnd')) {
+      rangeEnd = DocumentPosition();
+      rangeEnd!.deserialize(json['RangeEnd'] as Map<String, dynamic>);
     } else {
-      content = null;
+      rangeEnd = null;
     }
 
-    if (json.containsKey('DateTime')) {
-      dateTime = DateTime.parse(json['DateTime'] as String);
+    if (json.containsKey('Author')) {
+      author = json['Author'] as String;
     } else {
-      dateTime = null;
+      author = null;
     }
 
     if (json.containsKey('Initial')) {
@@ -119,58 +120,57 @@ class Comment extends CommentLink {
       initial = null;
     }
 
-    if (json.containsKey('RangeEnd')) {
-      rangeEnd = DocumentPosition();
-      rangeEnd!.deserialize(json['RangeEnd'] as Map<String, dynamic>);
-    } else {
-      rangeEnd = null;
-    }
-
-    if (json.containsKey('RangeStart')) {
-      rangeStart = DocumentPosition();
-      rangeStart!.deserialize(json['RangeStart'] as Map<String, dynamic>);
+    if (json.containsKey('DateTime')) {
+      dateTime = DateTime.parse(json['DateTime'] as String);
     } else {
-      rangeStart = null;
+      dateTime = null;
     }
 
     if (json.containsKey('Text')) {
       text = json['Text'] as String;
     } else {
       text = null;
     }
+
+    if (json.containsKey('Content')) {
+      content = StoryChildNodes();
+      content!.deserialize(json['Content'] as Map<String, dynamic>);
+    } else {
+      content = null;
+    }
   }
 
   @override
   Map<String, dynamic> serialize() {
     var _result = <String, dynamic>{};
     _result.addAll(super.serialize());
-    if (author != null) {
-      _result['Author'] = author!;
+    if (rangeStart != null) {
+      _result['RangeStart'] = rangeStart!.serialize();
     }
 
-    if (content != null) {
-      _result['Content'] = content!.serialize();
+    if (rangeEnd != null) {
+      _result['RangeEnd'] = rangeEnd!.serialize();
     }
 
-    if (dateTime != null) {
-      _result['DateTime'] = dateTime!.toIso8601String();
+    if (author != null) {
+      _result['Author'] = author!;
     }
 
     if (initial != null) {
       _result['Initial'] = initial!;
     }
 
-    if (rangeEnd != null) {
-      _result['RangeEnd'] = rangeEnd!.serialize();
-    }
-
-    if (rangeStart != null) {
-      _result['RangeStart'] = rangeStart!.serialize();
+    if (dateTime != null) {
+      _result['DateTime'] = dateTime!.toIso8601String();
     }
 
     if (text != null) {
       _result['Text'] = text!;
     }
+
+    if (content != null) {
+      _result['Content'] = content!.serialize();
+    }
     return _result;
   }
 

lib/src/models/comment_base.dart

@@ -31,6 +31,20 @@ import '../../aspose_words_cloud.dart';
 
 /// Comment.
 abstract class CommentBase implements ModelBase {
+  /// Gets or sets the link to comment range start node.
+  NewDocumentPosition? _rangeStart;
+
+  NewDocumentPosition? get rangeStart => _rangeStart;
+  set rangeStart(NewDocumentPosition? val) => _rangeStart = val;
+
+
+  /// Gets or sets the link to comment range end node.
+  NewDocumentPosition? _rangeEnd;
+
+  NewDocumentPosition? get rangeEnd => _rangeEnd;
+  set rangeEnd(NewDocumentPosition? val) => _rangeEnd = val;
+
+
   /// Gets or sets the author name for a comment.
   String? _author;
 
@@ -52,20 +66,6 @@ abstract class CommentBase implements ModelBase {
   set initial(String? val) => _initial = val;
 
 
-  /// Gets or sets the link to comment range end node.
-  NewDocumentPosition? _rangeEnd;
-
-  NewDocumentPosition? get rangeEnd => _rangeEnd;
-  set rangeEnd(NewDocumentPosition? val) => _rangeEnd = val;
-
-
-  /// Gets or sets the link to comment range start node.
-  NewDocumentPosition? _rangeStart;
-
-  NewDocumentPosition? get rangeStart => _rangeStart;
-  set rangeStart(NewDocumentPosition? val) => _rangeStart = val;
-
-
   /// Gets or sets text of the comment.
   String? _text;
 
@@ -79,6 +79,20 @@ abstract class CommentBase implements ModelBase {
       throw ApiException(400, 'Failed to deserialize CommentBase data model.');
     }
 
+    if (json.containsKey('RangeStart')) {
+      rangeStart = NewDocumentPosition();
+      rangeStart!.deserialize(json['RangeStart'] as Map<String, dynamic>);
+    } else {
+      rangeStart = null;
+    }
+
+    if (json.containsKey('RangeEnd')) {
+      rangeEnd = NewDocumentPosition();
+      rangeEnd!.deserialize(json['RangeEnd'] as Map<String, dynamic>);
+    } else {
+      rangeEnd = null;
+    }
+
     if (json.containsKey('Author')) {
       author = json['Author'] as String;
     } else {
@@ -97,20 +111,6 @@ abstract class CommentBase implements ModelBase {
       initial = null;
     }
 
-    if (json.containsKey('RangeEnd')) {
-      rangeEnd = NewDocumentPosition();
-      rangeEnd!.deserialize(json['RangeEnd'] as Map<String, dynamic>);
-    } else {
-      rangeEnd = null;
-    }
-
-    if (json.containsKey('RangeStart')) {
-      rangeStart = NewDocumentPosition();
-      rangeStart!.deserialize(json['RangeStart'] as Map<String, dynamic>);
-    } else {
-      rangeStart = null;
-    }
-
     if (json.containsKey('Text')) {
       text = json['Text'] as String;
     } else {
@@ -121,6 +121,14 @@ abstract class CommentBase implements ModelBase {
   @override
   Map<String, dynamic> serialize() {
     var _result = <String, dynamic>{};
+    if (rangeStart != null) {
+      _result['RangeStart'] = rangeStart!.serialize();
+    }
+
+    if (rangeEnd != null) {
+      _result['RangeEnd'] = rangeEnd!.serialize();
+    }
+
     if (author != null) {
       _result['Author'] = author!;
     }
@@ -133,14 +141,6 @@ abstract class CommentBase implements ModelBase {
       _result['Initial'] = initial!;
     }
 
-    if (rangeEnd != null) {
-      _result['RangeEnd'] = rangeEnd!.serialize();
-    }
-
-    if (rangeStart != null) {
-      _result['RangeStart'] = rangeStart!.serialize();
-    }
-
     if (text != null) {
       _result['Text'] = text!;
     }