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

Author: dynabic-billing-team

README.md

@@ -16,6 +16,11 @@ Feel free to explore the [Developer's Guide](https://docs.aspose.cloud/display/w
 - Add & remove watermarks and protection.
 - Read & write access to Document Object Model.
 
+## Enhancements in Version 23.6
+
+- Fix XMLHttpRequest in web applications.
+
+
 ## Enhancements in Version 23.5
 
 - Added InsertSection method.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "asposewordscloud",
-  "version": "23.5.0",
+  "version": "23.6.0",
   "description": "Aspose.Words Cloud SDK for Node.js",
   "homepage": "https://products.aspose.cloud/words/cloud",
   "author": {

src/internal/auth.ts

@@ -76,7 +76,7 @@ export class OAuth implements IAuthentication {
         const requestOptions: request.Options = {
             method: "POST",
             json: true,
-            uri: configuration.baseUrl + "/connect/token",
+            uri: configuration.baseUrl + "/v4.0/words/connect/token",
             form: {
                 grant_type: "client_credentials",
                 client_id: configuration.ClientId,

src/internal/requestHelper.ts

@@ -131,7 +131,7 @@ async function invokeApiMethodInternal(requestOptions: request.OptionsWithUri, c
     requestOptions.timeout = 1000 * confguration.timeout;
 
     requestOptions.headers["x-aspose-client"] = "nodejs sdk";
-    requestOptions.headers["x-aspose-client-version"] = "23.5";
+    requestOptions.headers["x-aspose-client-version"] = "23.6";
     requestOptions.encoding = null;
 
 	requestOptions.uri = encodeURI(requestOptions.uri.toString());

src/model/comment.ts

@@ -46,39 +46,39 @@ export class Comment extends CommentLink {
      */
     public static attributeTypeMap: Array<AttributeInfo> = [
         {
-            name: "author",
-            baseName: "Author",
-            type: "string",
+            name: "rangeStart",
+            baseName: "RangeStart",
+            type: "DocumentPosition",
         },
         {
-            name: "content",
-            baseName: "Content",
-            type: "StoryChildNodes",
+            name: "rangeEnd",
+            baseName: "RangeEnd",
+            type: "DocumentPosition",
         },
         {
-            name: "dateTime",
-            baseName: "DateTime",
-            type: "Date",
+            name: "author",
+            baseName: "Author",
+            type: "string",
         },
         {
             name: "initial",
             baseName: "Initial",
             type: "string",
         },
         {
-            name: "rangeEnd",
-            baseName: "RangeEnd",
-            type: "DocumentPosition",
-        },
-        {
-            name: "rangeStart",
-            baseName: "RangeStart",
-            type: "DocumentPosition",
+            name: "dateTime",
+            baseName: "DateTime",
+            type: "Date",
         },
         {
             name: "text",
             baseName: "Text",
             type: "string",
+        },
+        {
+            name: "content",
+            baseName: "Content",
+            type: "StoryChildNodes",
         }
     ];
 
@@ -90,39 +90,39 @@ export class Comment extends CommentLink {
     }
 
     /**
-     * Gets or sets the author name for a comment.
+     * Gets or sets the link to comment range start node.
      */
-    public author: string;
+    public rangeStart: DocumentPosition;
 
     /**
-     * Gets or sets the content of the comment.
+     * Gets or sets the link to comment range end node.
      */
-    public content: StoryChildNodes;
+    public rangeEnd: DocumentPosition;
 
     /**
-     * Gets or sets the date and time that the comment was made.
+     * Gets or sets the author name for a comment.
      */
-    public dateTime: Date;
+    public author: string;
 
     /**
      * Gets or sets the initials of the user associated with a specific comment.
      */
     public initial: string;
 
     /**
-     * Gets or sets the link to comment range end node.
+     * Gets or sets the date and time that the comment was made.
      */
-    public rangeEnd: DocumentPosition;
+    public dateTime: Date;
 
     /**
-     * Gets or sets the link to comment range start node.
+     * Gets or sets text of the comment.
      */
-    public rangeStart: DocumentPosition;
+    public text: string;
 
     /**
-     * Gets or sets text of the comment.
+     * Gets or sets the content of the comment.
      */
-    public text: string;
+    public content: StoryChildNodes;
 
     public constructor(init?: Partial< Comment >) {
         super(init);

src/model/commentBase.ts

@@ -41,6 +41,16 @@ export abstract class CommentBase implements ModelInterface {
      * Attribute type map
      */
     public static attributeTypeMap: Array<AttributeInfo> = [
+        {
+            name: "rangeStart",
+            baseName: "RangeStart",
+            type: "NewDocumentPosition",
+        },
+        {
+            name: "rangeEnd",
+            baseName: "RangeEnd",
+            type: "NewDocumentPosition",
+        },
         {
             name: "author",
             baseName: "Author",
@@ -56,16 +66,6 @@ export abstract class CommentBase implements ModelInterface {
             baseName: "Initial",
             type: "string",
         },
-        {
-            name: "rangeEnd",
-            baseName: "RangeEnd",
-            type: "NewDocumentPosition",
-        },
-        {
-            name: "rangeStart",
-            baseName: "RangeStart",
-            type: "NewDocumentPosition",
-        },
         {
             name: "text",
             baseName: "Text",
@@ -81,29 +81,29 @@ export abstract class CommentBase implements ModelInterface {
     }
 
     /**
-     * Gets or sets the author name for a comment.
+     * Gets or sets the link to comment range start node.
      */
-    public author: string;
+    public rangeStart: NewDocumentPosition;
 
     /**
-     * Gets or sets the date and time that the comment was made.
+     * Gets or sets the link to comment range end node.
      */
-    public dateTime: Date;
+    public rangeEnd: NewDocumentPosition;
 
     /**
-     * Gets or sets the initials of the user associated with a specific comment.
+     * Gets or sets the author name for a comment.
      */
-    public initial: string;
+    public author: string;
 
     /**
-     * Gets or sets the link to comment range end node.
+     * Gets or sets the date and time that the comment was made.
      */
-    public rangeEnd: NewDocumentPosition;
+    public dateTime: Date;
 
     /**
-     * Gets or sets the link to comment range start node.
+     * Gets or sets the initials of the user associated with a specific comment.
      */
-    public rangeStart: NewDocumentPosition;
+    public initial: string;
 
     /**
      * Gets or sets text of the comment.

src/model/customXmlPart.ts

@@ -42,13 +42,13 @@ export class CustomXmlPart extends CustomXmlPartLink {
      */
     public static attributeTypeMap: Array<AttributeInfo> = [
         {
-            name: "data",
-            baseName: "Data",
+            name: "id",
+            baseName: "Id",
             type: "string",
         },
         {
-            name: "id",
-            baseName: "Id",
+            name: "data",
+            baseName: "Data",
             type: "string",
         }
     ];
@@ -61,14 +61,14 @@ export class CustomXmlPart extends CustomXmlPartLink {
     }
 
     /**
-     * Gets or sets the custom xml part data.
+     * Gets or sets the custom xml part id.
      */
-    public data: string;
+    public id: string;
 
     /**
-     * Gets or sets the custom xml part id.
+     * Gets or sets the custom xml part data.
      */
-    public id: string;
+    public data: string;
 
     public constructor(init?: Partial< CustomXmlPart >) {
         super(init);

src/model/document.ts

@@ -43,6 +43,11 @@ export class Document implements ModelInterface {
      * Attribute type map
      */
     public static attributeTypeMap: Array<AttributeInfo> = [
+        {
+            name: "links",
+            baseName: "Links",
+            type: "Array<Link>",
+        },
         {
             name: "documentProperties",
             baseName: "DocumentProperties",
@@ -63,11 +68,6 @@ export class Document implements ModelInterface {
             baseName: "IsSigned",
             type: "boolean",
         },
-        {
-            name: "links",
-            baseName: "Links",
-            type: "Array<Link>",
-        },
         {
             name: "sourceFormat",
             baseName: "SourceFormat",
@@ -82,6 +82,11 @@ export class Document implements ModelInterface {
         return Document.attributeTypeMap;
     }
 
+    /**
+     * Gets or sets the list of links that originate from this document.
+     */
+    public links: Array<Link>;
+
     /**
      * Gets or sets the document properties.
      */
@@ -102,11 +107,6 @@ export class Document implements ModelInterface {
      */
     public isSigned: boolean;
 
-    /**
-     * Gets or sets the list of links that originate from this document.
-     */
-    public links: Array<Link>;
-
     /**
      * Gets or sets the original format of the document.
      */

src/model/documentEntry.ts

@@ -49,7 +49,7 @@ export class DocumentEntry extends BaseEntry {
         {
             name: "importFormatMode",
             baseName: "ImportFormatMode",
-            type: "string",
+            type: "DocumentEntry.ImportFormatModeEnum",
         }
     ];
 
@@ -68,7 +68,7 @@ export class DocumentEntry extends BaseEntry {
     /**
      * Gets or sets the option that controls formatting will be used: appended or destination document. Can be KeepSourceFormatting or UseDestinationStyles.
      */
-    public importFormatMode: string;
+    public importFormatMode: DocumentEntry.ImportFormatModeEnum;
 
     public constructor(init?: Partial< DocumentEntry >) {
         super(init);
@@ -80,3 +80,17 @@ export class DocumentEntry extends BaseEntry {
     }
 }
 
+/**
+ * Enums for DocumentEntry
+ */
+// tslint:disable:quotemark
+// tslint:disable-next-line:no-namespace
+export namespace DocumentEntry {
+    export enum ImportFormatModeEnum {
+        UseDestinationStyles = 'UseDestinationStyles' as any,
+        KeepSourceFormatting = 'KeepSourceFormatting' as any,
+        KeepDifferentStyles = 'KeepDifferentStyles' as any
+    }
+}
+// tslint:enable:quotemark
+

src/model/documentProperty.ts

@@ -41,11 +41,6 @@ export class DocumentProperty extends LinkElement {
      * Attribute type map
      */
     public static attributeTypeMap: Array<AttributeInfo> = [
-        {
-            name: "builtIn",
-            baseName: "BuiltIn",
-            type: "boolean",
-        },
         {
             name: "name",
             baseName: "Name",
@@ -55,6 +50,11 @@ export class DocumentProperty extends LinkElement {
             name: "value",
             baseName: "Value",
             type: "string",
+        },
+        {
+            name: "builtIn",
+            baseName: "BuiltIn",
+            type: "boolean",
         }
     ];
 
@@ -65,12 +65,6 @@ export class DocumentProperty extends LinkElement {
         return super.getAttributeTypeMap().concat(DocumentProperty.attributeTypeMap);
     }
 
-    /**
-     * Gets or sets a value indicating whether the property is built-in or not.
-     * If true the property is built-in, if false the property is custom.
-     */
-    public builtIn: boolean;
-
     /**
      * Gets or sets the name of the document property.
      */
@@ -81,6 +75,12 @@ export class DocumentProperty extends LinkElement {
      */
     public value: string;
 
+    /**
+     * Gets or sets a value indicating whether the property is built-in or not.
+     * If true the property is built-in, if false the property is custom.
+     */
+    public builtIn: boolean;
+
     public constructor(init?: Partial< DocumentProperty >) {
         super(init);
         Object.assign(this, init);