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.11'
+  s.version          = '21.12'
   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

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

Examples/AcceptAllRevisionsOnline.swift

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

README.md

@@ -13,6 +13,10 @@ 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.12
+
+- Added 'timeout' parameter to api configuration
+
 ## Enhancements in Version 21.11
 
 - Support encryption of 'CommonRequest.Password'. Automatic encryption of all passwords sent to the API server as request parameters.
@@ -169,7 +173,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.11"),
+    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "21.12"),
 ],
 targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -187,7 +191,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.11'
+pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '21.12'
 ```
 
 ## Getting Started

Sources/AsposeWordsCloud/Api/ApiInvoker.swift

@@ -90,6 +90,7 @@ public class ApiInvoker {
         // Create URL request object
         var request = URLRequest(url: apiRequestData.getURL());
         request.httpMethod = apiRequestData.getMethod();
+        request.timeoutInterval = self.configuration.getTimeout();
 
         // Fill headers
         for (key, value) in apiRequestData.getHeaders() {
@@ -238,6 +239,7 @@ public class ApiInvoker {
             let urlPath = URL(string: self.configuration.getBaseUrl())!.appendingPathComponent("connect/token");
             var request = URLRequest(url: urlPath);
             request.httpMethod = "POST";
+            request.timeoutInterval = self.configuration.getTimeout();
             request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type");
             request.httpBody = "grant_type=client_credentials&client_id=\(configuration.getClientId())&client_secret=\(configuration.getClientSecret())".data(using: .utf8);
             invokeRequest(urlRequest: &request, accessToken: nil, callback: { response in

Sources/AsposeWordsCloud/Api/Configuration.swift

@@ -42,20 +42,25 @@ public class Configuration : Codable {
     // Indicating whether debug mode
     private var debugMode: Bool?;
 
+    // Specify request timeout
+    private var timeout: TimeInterval;
+
     private enum CodingKeys: String, CodingKey {
         case baseUrl = "BaseUrl";
         case clientId = "ClientId";
         case clientSecret = "ClientSecret";
         case debugMode = "DebugMode";
+        case timeout = "Timeout";
         case invalidCodingKey;
     }
 
     // Initialize new instance of Aspose.Words for Cloud configuration object with given parameters
-    public init(clientId: String, clientSecret: String, baseUrl: String = "https://api.aspose.cloud", debugMode: Bool = false) {
+    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;
     }
 
     public required init(from decoder: Decoder) throws {
@@ -64,6 +69,7 @@ public class Configuration : Codable {
         self.clientId = try container.decode(String.self, forKey: .clientId);
         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;
     }
 
     public func encode(to encoder: Encoder) throws {
@@ -74,6 +80,7 @@ public class Configuration : Codable {
         if (self.debugMode != nil) {
             try container.encode(self.debugMode, forKey: .debugMode);
         }
+        try container.encode(self.timeout, forKey: .timeout);
     }
 
     // Returns Aspose.Words for Cloud base URL
@@ -96,6 +103,11 @@ public class Configuration : Codable {
         return self.debugMode != nil ? self.debugMode! : false;
     }
 
+    // Gets request timeout
+    public func getTimeout() -> TimeInterval {
+        return self.timeout;
+    }
+
     // Returns general version of cloud api
     public func getApiVersion() -> String {
         return "v4.0";
@@ -118,6 +130,6 @@ public class Configuration : Codable {
 
     // Returns SDK version for using in statistics headers
     public func getSdkVersion() -> String {
-        return "21.11";
+        return "21.12";
     }
 }

Sources/AsposeWordsCloud/Api/WordsAPI.swift

@@ -6116,6 +6116,52 @@ public class WordsAPI {
         return responseObject!;
     }
 
+    // Async representation of getInfo method
+    // Returns application info.
+    public func getInfo(request : GetInfoRequest, callback : @escaping (_ response : InfoResponse?, _ error : Error?) -> ()) {
+        do {
+            apiInvoker.invoke(
+                apiRequestData: try request.createApiRequestData(apiInvoker: self.apiInvoker, configuration: self.configuration),
+                callback: { response, error in
+                    if (error != nil) {
+                        callback(nil, error);
+                    }
+                    else {
+                        do {
+                            callback(try request.deserializeResponse(data: response!) as? InfoResponse, nil);
+                        }
+                        catch let deserializeError {
+                            callback(nil, deserializeError);
+                        }
+                    }
+                }
+            );
+        }
+        catch let error {
+            callback(nil, error);
+        }
+    }
+
+    // Sync representation of getInfo method
+    // Returns application info.
+    public func getInfo(request : GetInfoRequest) throws -> InfoResponse {
+        let semaphore = DispatchSemaphore(value: 0);
+        var responseObject : InfoResponse? = nil;
+        var responseError : Error? = nil;
+        self.getInfo(request : request, callback: { response, error in
+            responseObject = response;
+            responseError = error;
+            semaphore.signal();
+        });
+
+        _ = semaphore.wait();
+
+        if (responseError != nil) {
+            throw responseError!;
+        }
+        return responseObject!;
+    }
+
     // Async representation of getList method
     // Reads a list from the document.
     public func getList(request : GetListRequest, callback : @escaping (_ response : ListResponse?, _ error : Error?) -> ()) {