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

Author: dynabic-billing-team

Jenkinsfile

@@ -6,11 +6,13 @@ properties([
 			[$class: 'StringParameterDefinition', name: 'apiUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'api url'],
             [$class: 'BooleanParameterDefinition', name: 'ignoreCiSkip', defaultValue: false, description: 'ignore CI Skip'],
             [$class: 'StringParameterDefinition', name: 'credentialsId', defaultValue: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', description: 'credentials id'],
+            [$class: 'BooleanParameterDefinition', name: 'packageTesting', defaultValue: false, description: 'Testing package from repository without local sources. Used for prodhealthcheck'],
 		]
 	]
 ])
 
 def needToBuild = false
+def packageTesting = false
 
 def runtests(dockerImageVersion)
 {
@@ -23,7 +25,8 @@ def runtests(dockerImageVersion)
                     sh 'git show -s HEAD > gitMessage'
                     def commitMessage = readFile('gitMessage').trim()
                     echo commitMessage
-                    needToBuild = params.ignoreCiSkip || !commitMessage.contains('[ci skip]')               
+                    needToBuild = params.ignoreCiSkip || !commitMessage.contains('[ci skip]')
+                    packageTesting = params.packageTesting                    
                     sh 'git clean -fdx'
 
                     def apiUrl = params.apiUrl
@@ -38,6 +41,19 @@ def runtests(dockerImageVersion)
 
             if (needToBuild) {
                 docker.image('node:' + dockerImageVersion).inside{
+                    if (packageTesting) {
+                        gitlabCommitStatus("remove sources and redefine referencies") {
+                            stage('remove sources and redefine referencies'){
+                                sh "npm uninstall asposewordscloud"
+                                sh "sed -i 's/asposewordscloud/asposewordscloudtest/g' package.json"
+                                sh "rm -rf src"
+                                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 "npm install asposewordscloud" 
+                            }
+                        }
+                    }
+                
                     gitlabCommitStatus("build") {
                         stage('build'){
                             withEnv([

JenkinsfileRelease

@@ -151,27 +151,6 @@ 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,13 @@ 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 22.1
+
+- Added 'FieldOptions.FieldUpdateCultureName' to set Culture for fields
+- Added 'DocumentEntry.Password' to set an encrypted password for appending document
+- Added 'encryptedPassword2' query parameter to CompareDocuments to set an encrypted password for the second comparing document
+
+
 ## Enhancements in Version 21.12
 
 - Added FieldOptions parameter to mail merge operations

package.json

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

src/api.ts

@@ -1,7 +1,7 @@
 /*
  * --------------------------------------------------------------------------------
  * <copyright company="Aspose" file="api.ts">
- *   Copyright (c) 2021 Aspose.Words for Cloud
+ *   Copyright (c) 2022 Aspose.Words for Cloud
  * </copyright>
  * <summary>
  *   Permission is hereby granted, free of charge, to any person obtaining a copy

src/internal/attributeInfo.ts

@@ -1,7 +1,7 @@
 /*
  * --------------------------------------------------------------------------------
  * <copyright company="Aspose" file="attributeInfo.ts">
- *   Copyright (c) 2021 Aspose.Words for Cloud
+ *   Copyright (c) 2022 Aspose.Words for Cloud
  * </copyright>
  * <summary>
  *   Permission is hereby granted, free of charge, to any person obtaining a copy

src/internal/auth.ts

@@ -1,7 +1,7 @@
 /*
  * --------------------------------------------------------------------------------
  * <copyright company="Aspose" file="auth.ts">
- *   Copyright (c) 2021 Aspose.Words for Cloud
+ *   Copyright (c) 2022 Aspose.Words for Cloud
  * </copyright>
  * <summary>
  *   Permission is hereby granted, free of charge, to any person obtaining a copy

src/internal/configuration.ts

@@ -1,7 +1,7 @@
 /*
  * --------------------------------------------------------------------------------
  * <copyright company="Aspose" file="configuration.ts">
- *   Copyright (c) 2021 Aspose.Words for Cloud
+ *   Copyright (c) 2022 Aspose.Words for Cloud
  * </copyright>
  * <summary>
  *   Permission is hereby granted, free of charge, to any person obtaining a copy

src/internal/objectSerializer.ts

@@ -1,7 +1,7 @@
 /*
  * --------------------------------------------------------------------------------
  * <copyright company="Aspose" file="objectSerializer.ts">
- *   Copyright (c) 2021 Aspose.Words for Cloud
+ *   Copyright (c) 2022 Aspose.Words for Cloud
  * </copyright>
  * <summary>
  *   Permission is hereby granted, free of charge, to any person obtaining a copy

src/internal/requestHelper.ts

@@ -1,7 +1,7 @@
 /*
  * --------------------------------------------------------------------------------
  * <copyright company="Aspose" file="requestHelper.ts">
- *   Copyright (c) 2021 Aspose.Words for Cloud
+ *   Copyright (c) 2022 Aspose.Words for Cloud
  * </copyright>
  * <summary>
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -141,7 +141,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"] = "21.12";
+    requestOptions.headers["x-aspose-client-version"] = "22.1";
 
 	requestOptions.uri = encodeURI(requestOptions.uri.toString());