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

Author: dynabic-billing-team

AsposeWordsCloud.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'AsposeWordsCloud'
-  s.version          = '21.9'
+  s.version          = '21.10'
   s.summary          = 'Aspose Words for Cloud.'
   s.homepage         = 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }

Examples/AcceptAllRevisions.swift

@@ -1,7 +1,7 @@
 import AsposeWordsCloud
 
 let config = Configuration(clientId: "####-####-####-####-####", clientSecret: "##################");
-let api = WordsAPI(configuration: config);
+let api = try WordsAPI(configuration: config);
 let fileName  = "test_doc.docx";
 
 // Upload original document to cloud storage.

Examples/AcceptAllRevisionsOnline.swift

@@ -1,5 +1,5 @@
 let config = Configuration(clientId: "####-####-####-####-####", clientSecret: "##################");
-let api = WordsAPI(configuration: config);
+let api = try WordsAPI(configuration: config);
 let fileName  = "test_doc.docx";
 
 // Calls AcceptAllRevisionsOnline method for document in cloud.

Package.swift

@@ -13,7 +13,7 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/allegro/swift-junit.git", from: "1.0.0"),
+        .package(url: "https://github.com/allegro/swift-junit.git", from: "1.0.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

README.md

@@ -13,6 +13,13 @@ This repository contains Aspose.Words Cloud SDK for Swift source code. This SDK
 * Watermarks and protection
 * Full read & write access to Document Object Model, including sections, paragraphs, text, images, tables, headers/footers and many others
 
+## Enhancements in Version 21.10
+
+- Removed 'GraphicsQualityOptions' image save option as it no longer supported.
+- Added query parameter 'displayIntermediateResults' for batch requests. If 'false', the last response in batch will be returned only. Default is 'true'
+- Added 'JsonDataLoadOptions' and 'XmlDataLoadOptions' to 'ReportEngineSettings'
+
+
 ## Enhancements in Version 21.8
 
 - Added new api methods to get, insert, update or delete custom xml parts from documents.
@@ -158,7 +165,7 @@ Add link to this repository as dependency to your Package.swift:
 
 dependencies: [
     // Dependencies declare other packages that this package depends on.
-    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "21.9"),
+    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "21.10"),
 ],
 targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -176,7 +183,7 @@ targets: [
 Add link to git repository as dependency to your Podfile:
 
 ```ruby
-pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '21.9'
+pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '21.10'
 ```
 
 ## Getting Started
@@ -186,7 +193,7 @@ pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-wo
 import Foundation;
 import AsposeWordsCloud;
 
-let wordsApi = WordsAPI(clientId: "YOUR_APP_SID", clientSecret: "YOUR_APP_KEY");
+let wordsApi = try WordsAPI(clientId: "YOUR_APP_SID", clientSecret: "YOUR_APP_KEY");
 let fileName = "TestCreateDocument.doc";
 let request = CreateDocumentRequest(fileName: fileName);
 let response = try wordsApi.createDocument(request: request);

Sources/AsposeWordsCloud/Api/ApiInvoker.swift

@@ -28,10 +28,18 @@
 import Foundation
 
 // Utility class for executing and processing requests to Cloud API
+@available(macOS 10.12, iOS 10.3, watchOS 3.3, tvOS 12.0, *)
 public class ApiInvoker {
     // An object containing the configuration for executing API requests 
     private let configuration : Configuration;
 
+    // RSA key for password encryption
+#if os(Linux)
+    // Encryption of passwords in query params not supported on linux
+#else
+    private var encryptionKey : SecKey?;
+#endif
+
     // Cached value of oauth2 authorization tokeт. 
     // It is filled after the first call to the API. 
     // Mutex is used to synchronize updates in a multi-threaded environment.
@@ -52,6 +60,12 @@ public class ApiInvoker {
         self.configuration = configuration;
         self.mutex = NSLock();
         self.accessTokenCache = nil;
+
+#if os(Linux)
+    // Encryption of passwords in query params not supported on linux
+#else
+        self.encryptionKey = nil;
+#endif
     }
 
     // Internal class for represent API response
@@ -250,4 +264,95 @@ public class ApiInvoker {
             callback(accessToken, self.httpStatusCodeOK);
         }
     }
+
+    private func lengthField(of valueField: [UInt8]) -> [UInt8] {
+        var count = valueField.count;
+
+        if (count < 128) {
+            return [ UInt8(count) ];
+        }
+
+        // The number of bytes needed to encode count.
+        let lengthBytesCount = Int((log2(Double(count)) / 8) + 1);
+
+        // The first byte in the length field encoding the number of remaining bytes.
+        let firstLengthFieldByte = UInt8(128 + lengthBytesCount);
+
+        var lengthField: [UInt8] = []
+        for _ in 0..<lengthBytesCount {
+            // Take the last 8 bits of count.
+            let lengthByte = UInt8(count & 0xff);
+            // Add them to the length field.
+            lengthField.insert(lengthByte, at: 0);
+            // Delete the last 8 bits of count.
+            count = count >> 8;
+        }
+
+        // Include the first byte.
+        lengthField.insert(firstLengthFieldByte, at: 0);
+
+        return lengthField;
+    }
+
+    public func setEncryptionData(data : PublicKeyResponse) throws {
+#if os(Linux)
+        // Encryption of passwords in query params not supported on linux
+#else
+        let exponent = Data(base64Encoded: data.getExponent()!)!;
+        let modulus = Data(base64Encoded: data.getModulus()!)!;
+        let exponentBytes = [UInt8](exponent);
+        var modulusBytes = [UInt8](modulus);
+        modulusBytes.insert(0x00, at: 0);
+
+        var modulusEncoded: [UInt8] = [];
+        modulusEncoded.append(0x02);
+        modulusEncoded.append(contentsOf: lengthField(of: modulusBytes));
+        modulusEncoded.append(contentsOf: modulusBytes);
+
+        var exponentEncoded: [UInt8] = [];
+        exponentEncoded.append(0x02);
+        exponentEncoded.append(contentsOf: lengthField(of: exponentBytes));
+        exponentEncoded.append(contentsOf: exponentBytes);
+
+        var sequenceEncoded: [UInt8] = [];
+        sequenceEncoded.append(0x30);
+        sequenceEncoded.append(contentsOf: lengthField(of: (modulusEncoded + exponentEncoded)));
+        sequenceEncoded.append(contentsOf: (modulusEncoded + exponentEncoded));
+
+        let keyData = Data(bytes: sequenceEncoded);
+        let keySize = (modulusBytes.count * 8);
+
+        let attributes: [String: Any] = [
+            kSecAttrKeyType as String: kSecAttrKeyTypeRSA,
+            kSecAttrKeyClass as String: kSecAttrKeyClassPublic,
+            kSecAttrKeySizeInBits as String: keySize
+        ];
+
+        encryptionKey = SecKeyCreateWithData(keyData as CFData, attributes as CFDictionary, nil);
+#endif
+    }
+
+    public func encryptString(value : String) throws -> String {
+#if os(Linux)
+        // Encryption of passwords in query params not supported on linux
+        return value;
+#else
+        let buffer = value.data(using: .utf8)!;
+        var error: Unmanaged<CFError>? = nil;
+
+        // Encrypto should less than key length
+        let secData = SecKeyCreateEncryptedData(encryptionKey!, .rsaEncryptionPKCS1, buffer as CFData, &error)!;
+        var secBuffer = [UInt8](repeating: 0, count: CFDataGetLength(secData));
+        CFDataGetBytes(secData, CFRangeMake(0, CFDataGetLength(secData)), &secBuffer);
+        return Data(bytes: secBuffer).base64EncodedString().replacingOccurrences(of: "+", with: "%2B").replacingOccurrences(of: "/", with: "%2F");
+#endif
+    }
+
+    public func isEncryptionAllowed() -> Bool {
+#if os(Linux)
+        return false;
+#else
+        return true;
+#endif
+    }
 }

Sources/AsposeWordsCloud/Api/BatchRequest.swift

@@ -28,6 +28,7 @@
 import Foundation
 
 // General protocol for all models.
+@available(macOS 10.12, iOS 10.3, watchOS 3.3, tvOS 12.0, *)
 public struct BatchRequest {
     private var requestId : String;
     private var dependsOn : String;
@@ -55,8 +56,8 @@ public struct BatchRequest {
          return InputStream(data: ("ResultOf(" + self.requestId + ")").data(using: .utf8)!);
     }
 
-    public func createApiRequestData(configuration : Configuration) throws -> WordsApiRequestData {
-        var result = try request.createApiRequestData(configuration: configuration);
+    public func createApiRequestData(apiInvoker : ApiInvoker, configuration : Configuration) throws -> WordsApiRequestData {
+        var result = try request.createApiRequestData(apiInvoker: apiInvoker, configuration: configuration);
         result.addHeader(key: "RequestId", value: self.requestId);
         if (!self.dependsOn.isEmpty) {
             result.addHeader(key: "DependsOn", value: self.dependsOn);

Sources/AsposeWordsCloud/Api/Configuration.swift

@@ -28,6 +28,7 @@
 import Foundation
 
 // Represents a set of configuration settings
+@available(macOS 10.12, iOS 10.3, watchOS 3.3, tvOS 12.0, *)
 public class Configuration : Codable {
     // Aspose.Words for Cloud base URL
     private var baseUrl : String;
@@ -117,6 +118,6 @@ public class Configuration : Codable {
 
     // Returns SDK version for using in statistics headers
     public func getSdkVersion() -> String {
-        return "21.9";
+        return "21.10";
     }
 }

Sources/AsposeWordsCloud/Api/ObjectSerializer.swift

@@ -28,6 +28,7 @@
 import Foundation
 
 // Helper class for serialize or deserialize swift objects to string or binary format.
+@available(macOS 10.12, iOS 10.3, watchOS 3.3, tvOS 12.0, *)
 class ObjectSerializer {
     private init() { }
 

Sources/AsposeWordsCloud/Api/RequestFormParam.swift

@@ -28,6 +28,7 @@
 import Foundation
 
 // Represent struct for using as form param in request
+@available(macOS 10.12, iOS 10.3, watchOS 3.3, tvOS 12.0, *)
 public struct RequestFormParam {
     private let name : String?;
     private let body : Data;