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          = '22.2'
+  s.version          = '22.3'
   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/AcceptAllRevisionsOnline.swift

@@ -6,4 +6,4 @@ let fileName = "test_doc.docx";
 let requestDocument = InputStream(url: URL(string: fileName))!;
 let request = AcceptAllRevisionsOnlineRequest(document: requestDocument);
 let acceptAllRevisionsOnlineResult = try api.acceptAllRevisionsOnline(request: request);
-try acceptAllRevisionsOnlineResult.getDocument()?.write(to: currentDir!.appendingPathComponent("test_result.docx", isDirectory: false));
+try acceptAllRevisionsOnlineResult.getDocument()?.first?.value.write(to: currentDir!.appendingPathComponent("test_result.docx", isDirectory: false));

README.md

@@ -13,6 +13,15 @@ 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 22.3
+
+- Online methods returns the dictionary of files with included original filename as key instead of single file content in responses.
+- Parameters contained sensitive data should be passed in encrypted form. Names of the parameters have 'encrypted' prefix.
+- Added Encrypt method to encrypt data on the API public key. Use it to prepare values for parameters required encrypted data.
+- GetPublicKey method is not billable.
+- Changed type of enumerations for members of SaveOptionsData and other inherited classes from string to enum.
+
+
 ## Enhancements in Version 22.2
 
 - Made 'SaveOprionsData.SaveFormat' property readonly with default value.
@@ -189,7 +198,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: "22.2"),
+    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "22.3"),
 ],
 targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -207,7 +216,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 => '22.2'
+pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '22.3'
 ```
 
 ## Getting Started

Sources/AsposeWordsCloud/Api/ApiInvoker.swift

@@ -33,11 +33,10 @@ 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?;
+    private let encryptor : Encryptor;
 #endif
 
     // Cached value of oauth2 authorization tokeт. 
@@ -56,26 +55,31 @@ public class ApiInvoker {
     private let httpStatusCodeTimeout = 408;
 
     // Initialize ApiInvoker object with specific configuration
+#if os(Linux)
     public init(configuration : Configuration) {
         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
+    public init(configuration : Configuration, encryptor: Encryptor) {
+        self.configuration = configuration;
+        self.mutex = NSLock();
+        self.accessTokenCache = nil;
+        this.encryptor = encryptor;
     }
+#endif
 
     // Internal class for represent API response
     private class InvokeResponse {
         public var data : Data?;
+        public var headers : [String : String];
         public var errorCode : Int;
         public var errorMessage : String?;
 
         public init(errorCode : Int) {
             self.errorCode = errorCode;
+            self.headers = [String : String]();
         }
     }
 
@@ -85,7 +89,7 @@ public class ApiInvoker {
     }
 
     // Invoke request to the API with the specified set of arguments and execute callback after the request is completed
-    public func invoke(apiRequestData : WordsApiRequestData, callback: @escaping (_ response: Data?, _ error: Error?) -> ()
+    public func invoke(apiRequestData : WordsApiRequestData, callback: @escaping (_ response: Data?, _ headers: [String: String], _ error: Error?) -> ()
     ) {
         // Create URL request object
         var request = URLRequest(url: apiRequestData.getURL());
@@ -115,29 +119,29 @@ public class ApiInvoker {
                                 self.invokeRequest(urlRequest: &request, accessToken: accessToken, callback: { response in
                                     if (response.errorCode == self.httpStatusCodeOK) {
                                         // Api request success
-                                        callback(response.data, nil);
+                                        callback(response.data, response.headers, nil);
                                     }
                                     else {
-                                        callback(nil, WordsApiError.requestError(errorCode: response.errorCode, message: response.errorMessage));
+                                        callback(nil, [String : String](), WordsApiError.requestError(errorCode: response.errorCode, message: response.errorMessage));
                                     }
                                 });
                             }
                             else {
-                                callback(nil, WordsApiError.requestError(errorCode: statusCode, message: "Authorization failed."));
+                                callback(nil, [String : String](), WordsApiError.requestError(errorCode: statusCode, message: "Authorization failed."));
                             }
                         });
                     }
                     else if (response.errorCode == self.httpStatusCodeOK) {
                         // Api request success
-                        callback(response.data, nil);
+                        callback(response.data, response.headers, nil);
                     }
                     else {
-                        callback(nil, WordsApiError.requestError(errorCode: response.errorCode, message: response.errorMessage));
+                        callback(nil, [String : String](), WordsApiError.requestError(errorCode: response.errorCode, message: response.errorMessage));
                     }
                 });
             }
             else {
-                callback(nil, WordsApiError.requestError(errorCode: statusCode, message: "Authorization failed."));
+                callback(nil, [String : String](), WordsApiError.requestError(errorCode: statusCode, message: "Authorization failed."));
             }
         });
     }
@@ -189,6 +193,9 @@ public class ApiInvoker {
             if (rawResponse != nil) {
                 invokeResponse.errorCode = rawResponse!.statusCode;
                 invokeResponse.errorMessage = rawResponse!.description;
+                for header in rawResponse!.allHeaderFields {
+                    invokeResponse.headers[String(describing: header.key)] = String(describing: header.value);
+                }
             }
             else {
                 invokeResponse.errorCode = self.httpStatusCodeBadRequest;
@@ -296,65 +303,11 @@ public class ApiInvoker {
         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;
+    // Encryption of passwords in query params not supported on linux
 #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 encryptString(data : String) throws -> String {
+        return encryptor.encrypt(data);
     }
-
-    public func isEncryptionAllowed() -> Bool {
-#if os(Linux)
-        return false;
-#else
-        return true;
 #endif
-    }
 }

Sources/AsposeWordsCloud/Api/Configuration.swift

@@ -45,23 +45,52 @@ public class Configuration : Codable {
     // Specify request timeout
     private var timeout: TimeInterval;
 
+#if os(Linux)
+    // Encryption of passwords in query params not supported on linux
+#else    
+    // Specify RSA exponent
+    private var rsaExponent: String;
+
+    // Specify RSA modulus
+    private var rsaModulus: String;
+#endif
+
+
     private enum CodingKeys: String, CodingKey {
         case baseUrl = "BaseUrl";
         case clientId = "ClientId";
         case clientSecret = "ClientSecret";
         case debugMode = "DebugMode";
         case timeout = "Timeout";
+#if os(Linux)
+        // Encryption of passwords in query params not supported on linux
+#else
+        case rsaExponent = "RsaExponent";
+        case rsaModulus = "RsaModulus";
+#endif
         case invalidCodingKey;
     }
 
     // Initialize new instance of Aspose.Words for Cloud configuration object with given parameters
+#if os(Linux)
     public init(clientId: String, clientSecret: String, baseUrl: String = "https://api.aspose.cloud", debugMode: Bool = false, timeout: TimeInterval = 300) {
         self.clientId = clientId;
         self.clientSecret = clientSecret;
         self.baseUrl = baseUrl;
         self.debugMode = debugMode;
         self.timeout = timeout;
+    }    
+#else
+    public init(clientId: String, clientSecret: String, baseUrl: String = "https://api.aspose.cloud", debugMode: Bool = false, timeout: TimeInterval = 300, rsaExponent: String = nil, rsaModulus: String = nil) {
+        self.clientId = clientId;
+        self.clientSecret = clientSecret;
+        self.baseUrl = baseUrl;
+        self.debugMode = debugMode;
+        self.timeout = timeout;
+        self.rsaExponent = rsaExponent;
+        self.rsaModulus = rsaModulus;
     }
+#endif
 
     public required init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self);
@@ -70,6 +99,12 @@ public class Configuration : Codable {
         self.clientSecret = try container.decode(String.self, forKey: .clientSecret);
         self.debugMode = try container.decodeIfPresent(Bool.self, forKey: .debugMode);
         self.timeout = try container.decodeIfPresent(TimeInterval.self, forKey: .timeout) ?? 300;
+#if os(Linux)
+        // Encryption of passwords in query params not supported on linux
+#else
+        self.rsaExponent = try container.decodeIfPresent(String.self, forKey: .rsaExponent) ?? nil;
+        self.rsaModulus = try container.decodeIfPresent(String.self, forKey: .rsaModulus) ?? nil;
+#endif
     }
 
     public func encode(to encoder: Encoder) throws {
@@ -81,6 +116,16 @@ public class Configuration : Codable {
             try container.encode(self.debugMode, forKey: .debugMode);
         }
         try container.encode(self.timeout, forKey: .timeout);
+#if os(Linux)
+        // Encryption of passwords in query params not supported on linux
+#else
+        if (self.rsaExponent != nil) {
+            try container.encode(self.rsaExponent, forKey: .rsaExponent);
+        }
+        if (self.rsaModulus != nil) {
+            try container.encode(self.rsaModulus, forKey: .rsaModulus);
+        }
+#endif
     }
 
     // Returns Aspose.Words for Cloud base URL
@@ -108,6 +153,19 @@ public class Configuration : Codable {
         return self.timeout;
     }
 
+#if os(Linux)
+#else
+    // Returns RSA exponent
+    public func getRsaExponent() -> String {
+        return self.rsaExponent;
+    }
+
+    // Returns RSA modulus
+    public func getRsaModulus() -> String {
+        return self.rsaModulus;
+    }
+#endif
+
     // Returns general version of cloud api
     public func getApiVersion() -> String {
         return "v4.0";
@@ -130,6 +188,6 @@ public class Configuration : Codable {
 
     // Returns SDK version for using in statistics headers
     public func getSdkVersion() -> String {
-        return "22.2";
+        return "22.3";
     }
 }