Skip to content

Commit aad4cad

Browse files
dynabic-billing-teamdynabic-billing-team
committed
Merge remote-tracking branch 'origin/master' into release
2 parents f07bacd + b466485 commit aad4cad

File tree

14 files changed

+85
-23
lines changed

14 files changed

+85
-23
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [21.11.0] - Aspose Words Cloud for Dart 21.11 Release Notes
2+
3+
- Support encryption of 'CommonRequest.Password'. Automatic encryption of all passwords sent to the API server as request parameters.
4+
15
## [21.10.0] - Aspose Words Cloud for Dart 21.10 Release Notes
26

37
- Removed 'GraphicsQualityOptions' image save option as it no longer supported.

‎Jenkinsfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ node('words-linux') {
1818
dir('dart') {
1919
try {
2020
stage('checkout'){
21-
checkout([$class: 'GitSCM', branches: [[name: params.branch]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-sdk-dart.git']]])
21+
checkout([$class: 'GitSCM', branches: [[name: params.branch]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-dart.git']]])
2222

2323
sh 'git show -s HEAD > gitMessage'
2424
def commitMessage = readFile('gitMessage').trim()
@@ -35,7 +35,7 @@ node('words-linux') {
3535
}
3636

3737
if (needToBuild) {
38-
docker.image('google/dart:2.12.2').inside {
38+
docker.image('google/dart:2.14').inside {
3939
stage('prepare'){
4040
sh "pub get"
4141
sh "pub global activate junitreport"

‎JenkinsfileRelease‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ def runtests()
88
dir('dart') {
99
try {
1010
stage('checkout'){
11-
checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-sdk-dart.git']]])
11+
checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-dart.git']]])
1212
withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
1313
sh 'mkdir -p settings'
1414
sh 'echo "{\\"ClientId\\": \\"$ClientId\\", \\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$testServerUrl\\"}" > settings/servercreds.json'
1515
}
1616
}
1717

18-
docker.image('google/dart:2.12.2').inside {
18+
docker.image('google/dart:2.14').inside {
1919
stage('prepare'){
2020
sh "pub get"
2121
sh "pub global activate junitreport"
@@ -43,7 +43,7 @@ def runtests()
4343
def makerelease() {
4444
try {
4545
stage('merge'){
46-
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-sdk-dart.git']]])
46+
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-dart.git']]])
4747
sh "git config user.email '[email protected]'"
4848
sh "git config user.name 'jenkins'"
4949
sh "git checkout --merge release"
@@ -52,18 +52,18 @@ def makerelease() {
5252
sh "git diff --name-status"
5353
sh 'git commit -am "Merged master branch to release" || exit 0'
5454
withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
55-
sh "git push https://$gitUsername:[email protected]/words-cloud/words-cloud-sdk-dart.git release"
55+
sh "git push https://$gitUsername:[email protected]/words-cloud/words-cloud-dart.git release"
5656
}
5757
}
5858

5959
stage('tag'){
60-
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-sdk-dart.git']]])
60+
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-dart.git']]])
6161
sh "git config user.email \"[email protected]\""
6262
sh "git config user.name \"jenkins\""
6363
sh "git tag -a ${tagVersion} -m 'version ${tagVersion}' | exit 0"
6464

6565
withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
66-
sh "git push https://$gitUsername:[email protected]/words-cloud/words-cloud-sdk-dart.git ${tagVersion}"
66+
sh "git push https://$gitUsername:[email protected]/words-cloud/words-cloud-dart.git ${tagVersion}"
6767
}
6868
}
6969
} finally {

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Add this dependency to your *pubspec.yaml*:
2727

2828
```yaml
2929
dependencies:
30-
aspose_words_cloud: 21.10.0
30+
aspose_words_cloud: 21.11.0
3131
```
3232
3333
## Getting Started

‎lib/src/api_client.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ library aspose_words_cloud;
3030
import 'dart:convert';
3131
import 'dart:typed_data';
3232

33-
import 'package:http/http.dart' as http;
34-
import 'package:uuid/uuid.dart';
3533
import 'package:convert/convert.dart';
34+
import 'package:http/http.dart' as http;
3635
import 'package:pointycastle/export.dart';
36+
import 'package:uuid/uuid.dart';
3737

38-
import '../aspose_words_cloud.dart';
3938
import './api_request_data.dart';
4039
import './api_request_part.dart';
4140
import './byte_data_extensions.dart';
4241
import './requests/batch_request.dart';
42+
import '../aspose_words_cloud.dart';
4343

4444
class ApiClient {
4545
String _authToken;
@@ -471,7 +471,7 @@ class ApiClient {
471471

472472
var httpRequest = http.Request(requestData.method, Uri.parse(requestData.url));
473473
httpRequest.headers['x-aspose-client'] = 'dart sdk';
474-
httpRequest.headers['x-aspose-client-version'] = '21.10';
474+
httpRequest.headers['x-aspose-client-version'] = '21.11';
475475
httpRequest.headers['Authorization'] = await _getAuthToken();
476476
if (requestData.headers != null) {
477477
httpRequest.headers.addAll(requestData.headers);

‎lib/src/models/font.dart‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,10 @@ class Font extends LinkElement {
734734
case 'ListTable6ColorfulAccent6': styleIdentifier = Font_StyleIdentifierEnum.listTable6ColorfulAccent6; break;
735735
case 'ListTable7ColorfulAccent6': styleIdentifier = Font_StyleIdentifierEnum.listTable7ColorfulAccent6; break;
736736
case 'SmartLink': styleIdentifier = Font_StyleIdentifierEnum.smartLink; break;
737+
case 'Mention': styleIdentifier = Font_StyleIdentifierEnum.mention; break;
738+
case 'SmartHyperlink': styleIdentifier = Font_StyleIdentifierEnum.smartHyperlink; break;
739+
case 'Hashtag': styleIdentifier = Font_StyleIdentifierEnum.hashtag; break;
740+
case 'UnresolvedMention': styleIdentifier = Font_StyleIdentifierEnum.unresolvedMention; break;
737741
case 'User': styleIdentifier = Font_StyleIdentifierEnum.user; break;
738742
case 'Nil': styleIdentifier = Font_StyleIdentifierEnum.nil; break;
739743
default: styleIdentifier = null; break;
@@ -1319,6 +1323,10 @@ class Font extends LinkElement {
13191323
case Font_StyleIdentifierEnum.listTable6ColorfulAccent6: _result['StyleIdentifier'] = 'ListTable6ColorfulAccent6'; break;
13201324
case Font_StyleIdentifierEnum.listTable7ColorfulAccent6: _result['StyleIdentifier'] = 'ListTable7ColorfulAccent6'; break;
13211325
case Font_StyleIdentifierEnum.smartLink: _result['StyleIdentifier'] = 'SmartLink'; break;
1326+
case Font_StyleIdentifierEnum.mention: _result['StyleIdentifier'] = 'Mention'; break;
1327+
case Font_StyleIdentifierEnum.smartHyperlink: _result['StyleIdentifier'] = 'SmartHyperlink'; break;
1328+
case Font_StyleIdentifierEnum.hashtag: _result['StyleIdentifier'] = 'Hashtag'; break;
1329+
case Font_StyleIdentifierEnum.unresolvedMention: _result['StyleIdentifier'] = 'UnresolvedMention'; break;
13221330
case Font_StyleIdentifierEnum.user: _result['StyleIdentifier'] = 'User'; break;
13231331
case Font_StyleIdentifierEnum.nil: _result['StyleIdentifier'] = 'Nil'; break;
13241332
default: break;
@@ -1756,6 +1764,10 @@ enum Font_StyleIdentifierEnum
17561764
listTable6ColorfulAccent6,
17571765
listTable7ColorfulAccent6,
17581766
smartLink,
1767+
mention,
1768+
smartHyperlink,
1769+
hashtag,
1770+
unresolvedMention,
17591771
user,
17601772
nil
17611773
}

‎lib/src/models/paragraph_format_base.dart‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,10 @@ class ParagraphFormatBase extends LinkElement {
651651
case 'ListTable6ColorfulAccent6': styleIdentifier = ParagraphFormatBase_StyleIdentifierEnum.listTable6ColorfulAccent6; break;
652652
case 'ListTable7ColorfulAccent6': styleIdentifier = ParagraphFormatBase_StyleIdentifierEnum.listTable7ColorfulAccent6; break;
653653
case 'SmartLink': styleIdentifier = ParagraphFormatBase_StyleIdentifierEnum.smartLink; break;
654+
case 'Mention': styleIdentifier = ParagraphFormatBase_StyleIdentifierEnum.mention; break;
655+
case 'SmartHyperlink': styleIdentifier = ParagraphFormatBase_StyleIdentifierEnum.smartHyperlink; break;
656+
case 'Hashtag': styleIdentifier = ParagraphFormatBase_StyleIdentifierEnum.hashtag; break;
657+
case 'UnresolvedMention': styleIdentifier = ParagraphFormatBase_StyleIdentifierEnum.unresolvedMention; break;
654658
case 'User': styleIdentifier = ParagraphFormatBase_StyleIdentifierEnum.user; break;
655659
case 'Nil': styleIdentifier = ParagraphFormatBase_StyleIdentifierEnum.nil; break;
656660
default: styleIdentifier = null; break;
@@ -1179,6 +1183,10 @@ class ParagraphFormatBase extends LinkElement {
11791183
case ParagraphFormatBase_StyleIdentifierEnum.listTable6ColorfulAccent6: _result['StyleIdentifier'] = 'ListTable6ColorfulAccent6'; break;
11801184
case ParagraphFormatBase_StyleIdentifierEnum.listTable7ColorfulAccent6: _result['StyleIdentifier'] = 'ListTable7ColorfulAccent6'; break;
11811185
case ParagraphFormatBase_StyleIdentifierEnum.smartLink: _result['StyleIdentifier'] = 'SmartLink'; break;
1186+
case ParagraphFormatBase_StyleIdentifierEnum.mention: _result['StyleIdentifier'] = 'Mention'; break;
1187+
case ParagraphFormatBase_StyleIdentifierEnum.smartHyperlink: _result['StyleIdentifier'] = 'SmartHyperlink'; break;
1188+
case ParagraphFormatBase_StyleIdentifierEnum.hashtag: _result['StyleIdentifier'] = 'Hashtag'; break;
1189+
case ParagraphFormatBase_StyleIdentifierEnum.unresolvedMention: _result['StyleIdentifier'] = 'UnresolvedMention'; break;
11821190
case ParagraphFormatBase_StyleIdentifierEnum.user: _result['StyleIdentifier'] = 'User'; break;
11831191
case ParagraphFormatBase_StyleIdentifierEnum.nil: _result['StyleIdentifier'] = 'Nil'; break;
11841192
default: break;
@@ -1624,6 +1632,10 @@ enum ParagraphFormatBase_StyleIdentifierEnum
16241632
listTable6ColorfulAccent6,
16251633
listTable7ColorfulAccent6,
16261634
smartLink,
1635+
mention,
1636+
smartHyperlink,
1637+
hashtag,
1638+
unresolvedMention,
16271639
user,
16281640
nil
16291641
}

‎lib/src/models/style.dart‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,10 @@ class Style extends LinkElement {
504504
case 'ListTable6ColorfulAccent6': styleIdentifier = Style_StyleIdentifierEnum.listTable6ColorfulAccent6; break;
505505
case 'ListTable7ColorfulAccent6': styleIdentifier = Style_StyleIdentifierEnum.listTable7ColorfulAccent6; break;
506506
case 'SmartLink': styleIdentifier = Style_StyleIdentifierEnum.smartLink; break;
507+
case 'Mention': styleIdentifier = Style_StyleIdentifierEnum.mention; break;
508+
case 'SmartHyperlink': styleIdentifier = Style_StyleIdentifierEnum.smartHyperlink; break;
509+
case 'Hashtag': styleIdentifier = Style_StyleIdentifierEnum.hashtag; break;
510+
case 'UnresolvedMention': styleIdentifier = Style_StyleIdentifierEnum.unresolvedMention; break;
507511
case 'User': styleIdentifier = Style_StyleIdentifierEnum.user; break;
508512
case 'Nil': styleIdentifier = Style_StyleIdentifierEnum.nil; break;
509513
default: styleIdentifier = null; break;
@@ -939,6 +943,10 @@ class Style extends LinkElement {
939943
case Style_StyleIdentifierEnum.listTable6ColorfulAccent6: _result['StyleIdentifier'] = 'ListTable6ColorfulAccent6'; break;
940944
case Style_StyleIdentifierEnum.listTable7ColorfulAccent6: _result['StyleIdentifier'] = 'ListTable7ColorfulAccent6'; break;
941945
case Style_StyleIdentifierEnum.smartLink: _result['StyleIdentifier'] = 'SmartLink'; break;
946+
case Style_StyleIdentifierEnum.mention: _result['StyleIdentifier'] = 'Mention'; break;
947+
case Style_StyleIdentifierEnum.smartHyperlink: _result['StyleIdentifier'] = 'SmartHyperlink'; break;
948+
case Style_StyleIdentifierEnum.hashtag: _result['StyleIdentifier'] = 'Hashtag'; break;
949+
case Style_StyleIdentifierEnum.unresolvedMention: _result['StyleIdentifier'] = 'UnresolvedMention'; break;
942950
case Style_StyleIdentifierEnum.user: _result['StyleIdentifier'] = 'User'; break;
943951
case Style_StyleIdentifierEnum.nil: _result['StyleIdentifier'] = 'Nil'; break;
944952
default: break;
@@ -1333,6 +1341,10 @@ enum Style_StyleIdentifierEnum
13331341
listTable6ColorfulAccent6,
13341342
listTable7ColorfulAccent6,
13351343
smartLink,
1344+
mention,
1345+
smartHyperlink,
1346+
hashtag,
1347+
unresolvedMention,
13361348
user,
13371349
nil
13381350
}

‎lib/src/models/table_properties.dart‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,10 @@ class TableProperties extends LinkElement {
515515
case 'ListTable6ColorfulAccent6': styleIdentifier = TableProperties_StyleIdentifierEnum.listTable6ColorfulAccent6; break;
516516
case 'ListTable7ColorfulAccent6': styleIdentifier = TableProperties_StyleIdentifierEnum.listTable7ColorfulAccent6; break;
517517
case 'SmartLink': styleIdentifier = TableProperties_StyleIdentifierEnum.smartLink; break;
518+
case 'Mention': styleIdentifier = TableProperties_StyleIdentifierEnum.mention; break;
519+
case 'SmartHyperlink': styleIdentifier = TableProperties_StyleIdentifierEnum.smartHyperlink; break;
520+
case 'Hashtag': styleIdentifier = TableProperties_StyleIdentifierEnum.hashtag; break;
521+
case 'UnresolvedMention': styleIdentifier = TableProperties_StyleIdentifierEnum.unresolvedMention; break;
518522
case 'User': styleIdentifier = TableProperties_StyleIdentifierEnum.user; break;
519523
case 'Nil': styleIdentifier = TableProperties_StyleIdentifierEnum.nil; break;
520524
default: styleIdentifier = null; break;
@@ -983,6 +987,10 @@ class TableProperties extends LinkElement {
983987
case TableProperties_StyleIdentifierEnum.listTable6ColorfulAccent6: _result['StyleIdentifier'] = 'ListTable6ColorfulAccent6'; break;
984988
case TableProperties_StyleIdentifierEnum.listTable7ColorfulAccent6: _result['StyleIdentifier'] = 'ListTable7ColorfulAccent6'; break;
985989
case TableProperties_StyleIdentifierEnum.smartLink: _result['StyleIdentifier'] = 'SmartLink'; break;
990+
case TableProperties_StyleIdentifierEnum.mention: _result['StyleIdentifier'] = 'Mention'; break;
991+
case TableProperties_StyleIdentifierEnum.smartHyperlink: _result['StyleIdentifier'] = 'SmartHyperlink'; break;
992+
case TableProperties_StyleIdentifierEnum.hashtag: _result['StyleIdentifier'] = 'Hashtag'; break;
993+
case TableProperties_StyleIdentifierEnum.unresolvedMention: _result['StyleIdentifier'] = 'UnresolvedMention'; break;
986994
case TableProperties_StyleIdentifierEnum.user: _result['StyleIdentifier'] = 'User'; break;
987995
case TableProperties_StyleIdentifierEnum.nil: _result['StyleIdentifier'] = 'Nil'; break;
988996
default: break;
@@ -1407,6 +1415,10 @@ enum TableProperties_StyleIdentifierEnum
14071415
listTable6ColorfulAccent6,
14081416
listTable7ColorfulAccent6,
14091417
smartLink,
1418+
mention,
1419+
smartHyperlink,
1420+
hashtag,
1421+
unresolvedMention,
14101422
user,
14111423
nil
14121424
}

‎lib/src/requests/batch_request.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ import 'dart:convert';
3131
import 'dart:typed_data';
3232

3333
import 'package:uuid/uuid.dart';
34+
35+
import './request_base.dart';
3436
import '../api_client.dart';
3537
import '../api_request_data.dart';
36-
import './request_base.dart';
3738

3839
class BatchRequest {
3940
String requestId;

0 commit comments

Comments
 (0)