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

Author: dynabic-billing-team

Jenkinsfile

@@ -25,9 +25,9 @@ def runtests(dockerImageVersion)
                 sh 'git clean -fdx'
 
                 if (needToBuild) {
-                    withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
+                    withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
                         sh 'mkdir -p Settings'
-                        sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$apiUrl\\"}" > Settings/servercreds.json'
+                        sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$apiUrl\\"}" > Settings/servercreds.json'
                     }
                 }
             }

JenkinsfileRelease

@@ -33,9 +33,9 @@ def publishToPypi()
 		stage('6:checkout again'){
 			if (params.StartFromStage.toInteger() < 7) {
 				checkout([$class: 'GitSCM', branches: [[name: '*/release']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-python.git']]])
-				withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
+				withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
 					sh 'mkdir -p Settings'
-                    sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$testServerUrl\\"}" > Settings/servercreds.json'
+                    sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$testServerUrl\\"}" > Settings/servercreds.json'
 				}	
 			}
 		}			

README.md

@@ -16,6 +16,17 @@ Python Cloud SDK wraps Aspose.Words Cloud API so you could seamlessly integrate
 - [Convert a document to desired file format](https://docs.aspose.cloud/display/wordscloud/Convert+Document+to+Destination+Format+with+Detailed+Settings+and+Save+Result+to+Storage) along with detailed settings.
 - Convert an encrypted PDF document into Word document format.
 
+## Enhancements in Version 20.11
+
+- In configuration json file appSid / appKey has been replaced to clientId / clientSecret.
+- In Words API initialization methods clientId parameter precedes clientSecret parameter.
+
+
+## Enhancements in Version 20.10
+
+- Internal API changes.
+
+
 ## Enhancements in Version 20.9
 
 - Added Batch API feature
@@ -115,7 +126,7 @@ The complete source code is available at [GitHub Repository](https://github.com/
 ```python
         # Start README example
 
-        self.words_api = asposewordscloud.WordsApi(api_sid, api_key)
+        self.words_api = asposewordscloud.WordsApi(client_id, client_secret)
         self.words_api.api_client.configuration.host = base_url
 
         upload_request = asposewordscloud.models.requests.UploadFileRequest(

asposewordscloud/api_client.py

@@ -81,12 +81,12 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
 
         self.pool = ThreadPool()
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '20.10'}
+        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '20.11'}
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'python sdk 20.10'
+        self.user_agent = 'python sdk 20.11'
 
     def __del__(self):
         self.pool.close()
@@ -109,8 +109,8 @@ def request_token(self):
         config = self.configuration
         request_url = "/connect/token"
         form_params = [['grant_type', 'client_credentials', 'string'],
-                       ['client_id', config.api_key['app_sid'], 'string'],
-                       ['client_secret', config.api_key['api_key'], 'string']]
+                       ['client_id', config.client_secret['client_id'], 'string'],
+                       ['client_secret', config.client_secret['client_secret'], 'string']]
 
         header_params = {'Accept': 'application/json', 'Content-Type': 'application/x-www-form-urlencoded'}