Skip to content

Commit b465e05

Browse files
SDK regenerated by CI server [ci skip]
1 parent 81d1094 commit b465e05

File tree

339 files changed

+1288
-600
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

339 files changed

+1288
-600
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ This repository contains Aspose.Words Cloud SDK for Swift source code. This SDK
1919
- Implemented DeleteOfficeMathObjects operation to delete all office math objects from document.
2020
- Parameter ProtectionRequest was removed from the UnprotectDocument operation. Now removing protection from a document does not require a password.
2121
- Model ProtectionRequest marked as deprecated, please use ProtectionRequestV2 instead for perform ProtectDocument operation. To change the password or protection type of protected document, the old password is no required.
22+
- Added fields Password and EncryptedPassword to FileReference for documents encrypted by password.
23+
- Removed parameter encryptedPassword2 from CompareDocument method. Please use FileReference password instead.
2224

2325

2426
## Enhancements in Version 23.11

Sources/AsposeWordsCloud/Api/ApiInvoker.swift

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,16 @@ public class ApiInvoker {
8989
}
9090

9191
// Internal function for prepare files content list
92-
public func prepareFilesContent(_ : inout [FileReference]) {
93-
// Do nothing...
92+
public func prepareFilesContent(_ requestFilesContent : inout [FileReference]) {
93+
#if os(Linux)
94+
// Encryption of passwords not supported on linux
95+
#else
96+
for requestFileReference in requestFilesContent {
97+
if (requestFileReference.password != nil) {
98+
requestFileReference.encryptPassword(try encryptString(value: requestFileReference.password!));
99+
}
100+
}
101+
#endif
94102
}
95103

96104
// Invoke request to the API with the specified set of arguments and execute callback after the request is completed

Sources/AsposeWordsCloud/Model/DocumentEntry.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,14 @@ public class DocumentEntry : BaseEntry {
117117
}
118118

119119
// Sets encryptedPassword. Gets or sets document password encrypted on API public key. The default value is null (the document has no password).
120+
@available(*, deprecated, message: "This field is deprecated and used only for backward compatibility. Please use 'Password' or 'EncryptedPassword' from 'FileReference' instead.")
120121
public func setEncryptedPassword(encryptedPassword : String?) -> DocumentEntry {
121122
self.encryptedPassword = encryptedPassword;
122123
return self;
123124
}
124125

125126
// Gets encryptedPassword. Gets or sets document password encrypted on API public key. The default value is null (the document has no password).
127+
@available(*, deprecated, message: "This field is deprecated and used only for backward compatibility. Please use 'Password' or 'EncryptedPassword' from 'FileReference' instead.")
126128
public func getEncryptedPassword() -> String? {
127129
return self.encryptedPassword;
128130
}

Sources/AsposeWordsCloud/Model/FileReference.swift

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,44 @@ public class FileReference : Codable, WordsApiModel {
5454
}
5555
}
5656

57+
// Password.
58+
private var _password : String?;
59+
public var password : String? {
60+
get {
61+
return self._password;
62+
}
63+
}
64+
65+
// Encrypted password.
66+
private var _encryptedPassword : String?;
67+
public var encryptedPassword : String? {
68+
get {
69+
return self._encryptedPassword;
70+
}
71+
}
72+
5773
private enum CodingKeys: String, CodingKey {
5874
case source = "Source";
5975
case reference = "Reference";
76+
case password = "Password";
77+
case encryptedPassword = "EncryptedPassword";
6078
case invalidCodingKey;
6179
}
6280

63-
public init(remoteFilePath : String) {
81+
public init(remoteFilePath : String, password : String? = nil) {
6482
self._source = "Storage";
6583
self._reference = remoteFilePath;
6684
self._content = nil;
85+
self._password = password;
86+
self._encryptedPassword = nil;
6787
}
6888

69-
public init(localFileContent : InputStream) {
89+
public init(localFileContent : InputStream, password : String? = nil) {
7090
self._source = "Request";
7191
self._reference = UUID().uuidString;
7292
self._content = localFileContent;
93+
self._password = password;
94+
self._encryptedPassword = nil;
7395
}
7496

7597
public required init(from decoder: Decoder) throws {
@@ -84,15 +106,20 @@ public class FileReference : Codable, WordsApiModel {
84106
var container = encoder.container(keyedBy: CodingKeys.self);
85107
try container.encode(self.source, forKey: .source);
86108
try container.encode(self.reference, forKey: .reference);
109+
try container.encode(self.password, forKey: .password);
110+
try container.encode(self.encryptedPassword, forKey: .encryptedPassword);
87111
}
88112

89113
public func collectFilesContent(_ resultFilesContent : inout [FileReference]) {
90-
if (self._source == "Request") {
91-
resultFilesContent.append(self);
92-
}
114+
resultFilesContent.append(self);
93115
}
94116

95117
public func validate() throws {
96118
// Do nothing
97119
}
120+
121+
public func encryptPassword(_ encryptedPassword : String?) {
122+
self._password = nil;
123+
self._encryptedPassword = encryptedPassword;
124+
}
98125
}

Sources/AsposeWordsCloud/Model/Requests/AcceptAllRevisionsOnlineRequest.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,13 @@ public class AcceptAllRevisionsOnlineRequest : WordsApiRequest {
139139
}
140140
var formParams = [RequestFormParam]();
141141
var requestFilesContent = [FileReference]();
142-
apiInvoker.prepareFilesContent(&requestFilesContent);
143142
formParams.append(RequestFormParam(name: "document", body: try ObjectSerializer.serializeFile(value: self.getDocument()), contentType: "application/octet-stream"));
144143

144+
apiInvoker.prepareFilesContent(&requestFilesContent);
145145
for requestFileReference in requestFilesContent {
146-
formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));
146+
if (requestFileReference.source == "Request") {
147+
formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));
148+
}
147149
}
148150

149151
var result = WordsApiRequestData(url: urlBuilder.url!, method: "PUT");

Sources/AsposeWordsCloud/Model/Requests/AcceptAllRevisionsRequest.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,9 @@ public class AcceptAllRevisionsRequest : WordsApiRequest {
183183
var requestFilesContent = [FileReference]();
184184
apiInvoker.prepareFilesContent(&requestFilesContent);
185185
for requestFileReference in requestFilesContent {
186-
formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));
186+
if (requestFileReference.source == "Request") {
187+
formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));
188+
}
187189
}
188190

189191
var result = WordsApiRequestData(url: urlBuilder.url!, method: "PUT");

Sources/AsposeWordsCloud/Model/Requests/AppendDocumentOnlineRequest.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,17 @@ public class AppendDocumentOnlineRequest : WordsApiRequest {
187187
}
188188
var formParams = [RequestFormParam]();
189189
var requestFilesContent = [FileReference]();
190-
apiInvoker.prepareFilesContent(&requestFilesContent);
191190
formParams.append(RequestFormParam(name: "document", body: try ObjectSerializer.serializeFile(value: self.getDocument()), contentType: "application/octet-stream"));
192191

193192
formParams.append(RequestFormParam(name: "documentList", body: try ObjectSerializer.serialize(value: self.getDocumentList()), contentType: "application/json"));
194193
self.getDocumentList().collectFilesContent(&requestFilesContent);
195194
try self.getDocumentList().validate();
196195

196+
apiInvoker.prepareFilesContent(&requestFilesContent);
197197
for requestFileReference in requestFilesContent {
198-
formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));
198+
if (requestFileReference.source == "Request") {
199+
formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));
200+
}
199201
}
200202

201203
var result = WordsApiRequestData(url: urlBuilder.url!, method: "PUT");

Sources/AsposeWordsCloud/Model/Requests/AppendDocumentRequest.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,15 @@ public class AppendDocumentRequest : WordsApiRequest {
229229
}
230230
var formParams = [RequestFormParam]();
231231
var requestFilesContent = [FileReference]();
232-
apiInvoker.prepareFilesContent(&requestFilesContent);
233232
formParams.append(RequestFormParam(name: "documentList", body: try ObjectSerializer.serialize(value: self.getDocumentList()), contentType: "application/json"));
234233
self.getDocumentList().collectFilesContent(&requestFilesContent);
235234
try self.getDocumentList().validate();
236235

236+
apiInvoker.prepareFilesContent(&requestFilesContent);
237237
for requestFileReference in requestFilesContent {
238-
formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));
238+
if (requestFileReference.source == "Request") {
239+
formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));
240+
}
239241
}
240242

241243
var result = WordsApiRequestData(url: urlBuilder.url!, method: "PUT");

Sources/AsposeWordsCloud/Model/Requests/ApplyStyleToDocumentElementOnlineRequest.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,17 @@ public class ApplyStyleToDocumentElementOnlineRequest : WordsApiRequest {
197197
}
198198
var formParams = [RequestFormParam]();
199199
var requestFilesContent = [FileReference]();
200-
apiInvoker.prepareFilesContent(&requestFilesContent);
201200
formParams.append(RequestFormParam(name: "document", body: try ObjectSerializer.serializeFile(value: self.getDocument()), contentType: "application/octet-stream"));
202201

203202
formParams.append(RequestFormParam(name: "styleApply", body: try ObjectSerializer.serialize(value: self.getStyleApply()), contentType: "application/json"));
204203
self.getStyleApply().collectFilesContent(&requestFilesContent);
205204
try self.getStyleApply().validate();
206205

206+
apiInvoker.prepareFilesContent(&requestFilesContent);
207207
for requestFileReference in requestFilesContent {
208-
formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));
208+
if (requestFileReference.source == "Request") {
209+
formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));
210+
}
209211
}
210212

211213
var result = WordsApiRequestData(url: urlBuilder.url!, method: "PUT");

Sources/AsposeWordsCloud/Model/Requests/ApplyStyleToDocumentElementRequest.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,13 +239,15 @@ public class ApplyStyleToDocumentElementRequest : WordsApiRequest {
239239
}
240240
var formParams = [RequestFormParam]();
241241
var requestFilesContent = [FileReference]();
242-
apiInvoker.prepareFilesContent(&requestFilesContent);
243242
formParams.append(RequestFormParam(name: "styleApply", body: try ObjectSerializer.serialize(value: self.getStyleApply()), contentType: "application/json"));
244243
self.getStyleApply().collectFilesContent(&requestFilesContent);
245244
try self.getStyleApply().validate();
246245

246+
apiInvoker.prepareFilesContent(&requestFilesContent);
247247
for requestFileReference in requestFilesContent {
248-
formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));
248+
if (requestFileReference.source == "Request") {
249+
formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));
250+
}
249251
}
250252

251253
var result = WordsApiRequestData(url: urlBuilder.url!, method: "PUT");

0 commit comments

Comments
 (0)