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

Author: dynabic-billing-team

JenkinsfileRelease

@@ -76,6 +76,13 @@ node('words-linux') {
 						}
 					}
 				}
+                
+				gitlabCommitStatus("audit security") {
+					stage('audit security'){
+                        sh "npm audit fix"
+						sh "npm audit --production --audit-level=moderate"
+                    }
+                }
 			}
 		}			                
     } finally {                       
@@ -99,10 +106,6 @@ node('words-linux') {
 				sh "git config user.email \"[email protected]\""
 				sh "git config user.name \"jenkins\""
 
-				withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', usernameVariable: 'gitUsername', passwordVariable: 'gitPass')]) {
-					gitRepoUrl = "https://${gitUsername}:${gitPass}@git.auckland.dynabic.com/words-cloud/words-cloud-node.git"
-				}
-				
 				unstash 'newPackage'
 			}
 		}
@@ -132,7 +135,7 @@ node('words-linux') {
                 sh "git diff --name-status"			
                 sh 'git commit -am "Merged master branch to release" || exit 0'
                 withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
-                    sh "git push https://$gitUsername:[email protected]/words-cloud/words-cloud-node.git release"
+                    sh "git push ${gitRepoUrl} release"
                 }
             }
         }
@@ -148,6 +151,27 @@ node('words-linux') {
 				sh "git push ${gitRepoUrl} ${version}"
 			}
 		}
+        
+		gitlabCommitStatus("create health check") {
+			stage('create health check branch'){                
+                withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
+                    sh "git push -d https://$gitUsername:[email protected]/words-cloud/words-cloud-node.git health_check"
+                }
+                sh "git branch -D health_check"
+                
+                sh "git checkout -b health_check"
+                
+                sh "sed -i 's/asposewordscloud/healthcheck/g' package.json"                        
+                sh "find test -type f -name \"*.ts\" -exec sed -i 's+\".*/src/.*\"+\"asposewordscloud\"+g' {} +"
+                sh "find bdd -type f -name \"*.ts\" -exec sed -i 's+\".*/src/.*\"+\"asposewordscloud\"+g' {} +"
+
+                sh 'git commit -am "Create health check branch" || exit 0'
+        
+                withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
+                    sh "git push -u https://$gitUsername:[email protected]/words-cloud/words-cloud-node.git health_check"
+                }
+            }
+        }
     } finally {                       
         deleteDir()
 		sh 'docker system prune -f'

README.md

@@ -16,6 +16,12 @@ 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 21.12
+
+- Added FieldOptions parameter to mail merge operations
+- Added timeout parameter to api configuration
+
+
 ## Enhancements in Version 21.11
 
 

TestData/DocumentActions/MailMerge/TestMailMergeData.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" standalone="yes"?>
+<NewDataSet>
+  <info>
+    <FirstName>Alexey</FirstName>
+    <LastName>Noskov</LastName>
+    <City>Kharkov</City>
+    <Company>Aspose</Company>
+  </info>
+</NewDataSet>

TestData/DocumentActions/MailMerge/TestMailMergeWithOptions.docx

@@ -3,7 +3,7 @@ import * as fs from "fs";
 const clientId = "####-####-####-####-####";
 const secret = "##################";
 const wordsApi = new WordsApi(clientId, secret);
-const fileName  = "test_doc.docx";
+const fileName = "test_doc.docx";
 
 // Upload original document to cloud storage.
 const myVar1 = fs.createReadStream(fileName);

examples/AcceptAllRevisions.ts

@@ -1,7 +1,7 @@
 const clientId = "####-####-####-####-####";
 const secret = "##################";
 const wordsApi = new WordsApi(clientId, secret);
-const fileName  = "test_doc.docx";
+const fileName = "test_doc.docx";
 
 // Calls AcceptAllRevisionsOnline method for document in cloud.
 const requestDocument = fs.createReadStream(fileName);

examples/AcceptAllRevisionsOnline.ts

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

package-lock.json

@@ -2507,6 +2507,24 @@ export class WordsApi {
         return Promise.resolve(result);
     }
 
+    /**
+     * Returns application info.
+     * @param requestObj contains request parameters
+     */
+    public async getInfo(requestObj: model.GetInfoRequest): Promise< model.WordsIncomingMessage< model.InfoResponse > > {
+        if (requestObj === null || requestObj === undefined) {
+            throw new Error('Required parameter "request" was null or undefined when calling getInfo.');
+        }
+
+        const requestOptions = requestObj.createRequestOptions(this.configuration, await this._getKey()); 
+
+        const response = await invokeApiMethod(requestOptions, this.configuration);
+        const result = new model.WordsIncomingMessage< model.InfoResponse >();    
+        result.response = response;
+        result.body = requestObj.createResponse(response.body);
+        return Promise.resolve(result);
+    }
+
     /**
      * Reads a list from the document.
      * @param requestObj contains request parameters

package.json

@@ -57,6 +57,11 @@ export class Configuration {
      */
     public debugMode: boolean;
 
+    /**
+     * Timeout in seconds. Default value is 100 seconds.
+     */
+    public timeout: number = 100;
+
     constructor(clientId: string, clientSecret: string, baseUrl?: string, debugMode?: boolean) {
         if (baseUrl) {
             this.baseUrl = baseUrl;