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          = '20.10'
+  s.version          = '20.11'
   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' }

Jenkinsfile

@@ -26,9 +26,9 @@ node('words-linux') {
                     sh 'git clean -fdx'
 
                     if (needToBuild) {
-                        withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
+                        withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
                             sh 'mkdir -p Settings'
-                            sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$apiUrl\\"}" > Settings/servercreds.json'
+                            sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$apiUrl\\"}" > Settings/servercreds.json'
                         }
                     }
                 }

JenkinsfileRelease

@@ -1,6 +1,6 @@
 parameters {
     string(name: 'tagVersion', description: 'new version number for tag')
-    string(name: 'testServerUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'server url')    
+    string(name: 'testServerUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'server url')
 }
 
 def runtests(version)
@@ -9,9 +9,9 @@ def runtests(version)
         try {
             stage('checkout_' + version){
                 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-swift.git']]])
-                withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
-					sh 'mkdir -p Settings'
-                    sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$testServerUrl\\"}" > Settings/servercreds.json'
+                withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
+                    sh 'mkdir -p Settings'
+                    sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$testServerUrl\\"}" > Settings/servercreds.json'
                 }
             }
 

README.md

@@ -13,6 +13,17 @@ 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 20.11
+
+- In configuration json file appSid / appKey has been replaced to clientId / clientSecret.
+- In Words API initialization methods clientId parameter precedes clientSecret parameter.
+- Fixed the problem with serialization of object properties (it was a souce of NPE).
+
+## Enhancements in Version 20.10
+
+- Internal API changes.
+
+
 ## Enhancements in Version 20.9
 
 - Added Batch API feature
@@ -94,7 +105,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: "20.10"),
+    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "20.11"),
 ],
 targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -112,7 +123,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 => '20.10'
+pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '20.11'
 ```
 
 ## Getting Started
@@ -122,7 +133,7 @@ pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-wo
 import Foundation;
 import AsposeWordsCloud;
 
-let wordsApi = WordsAPI(appSid: "YOUR_APP_SID", appKey: "YOUR_APP_KEY");
+let wordsApi = 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

@@ -225,7 +225,7 @@ public class ApiInvoker {
             var request = URLRequest(url: urlPath);
             request.httpMethod = "POST";
             request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type");
-            request.httpBody = "grant_type=client_credentials&client_id=\(configuration.getAppSid())&client_secret=\(configuration.getAppKey())".data(using: .utf8);
+            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
                 var newAccessToken : String? = nil;
                 if (response.errorCode == self.httpStatusCodeOK) {

Sources/AsposeWordsCloud/Api/Configuration.swift

@@ -32,36 +32,62 @@ public class Configuration : Codable {
     // Aspose.Words for Cloud base URL
     private var baseUrl : String;
 
-    // Aspose.Words for Cloud app sid
-    private var appSid: String;
+    // Aspose.Words for Cloud client id
+    private var clientId: String;
 
-    // Aspose.Words for Cloud app key
-    private var appKey: String;
+    // Aspose.Words for Cloud client secret
+    private var clientSecret: String;
 
     // Indicating whether debug mode
     private var debugMode: Bool?;
 
+    private enum CodingKeys: String, CodingKey {
+        case baseUrl = "BaseUrl";
+        case clientId = "ClientId";
+        case clientSecret = "ClientSecret";
+        case debugMode = "DebugMode";
+        case invalidCodingKey;
+    }
+
     // Initialize new instance of Aspose.Words for Cloud configuration object with given parameters
-    public init(appSid: String, appKey: String, baseUrl: String = "https://api.aspose.cloud", debugMode: Bool = false) {
-        self.appSid = appSid;
-        self.appKey = appKey;
+    public init(clientId: String, clientSecret: String, baseUrl: String = "https://api.aspose.cloud", debugMode: Bool = false) {
+        self.clientId = clientId;
+        self.clientSecret = clientSecret;
         self.baseUrl = baseUrl;
         self.debugMode = debugMode;
     }
 
+    public required init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self);
+        self.baseUrl = try container.decodeIfPresent(String.self, forKey: .baseUrl) ?? "https://api.aspose.cloud";
+        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);
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self);
+        try container.encode(self.baseUrl, forKey: .baseUrl);
+        try container.encode(self.clientId, forKey: .clientId);
+        try container.encode(self.clientSecret, forKey: .clientSecret);
+        if (self.debugMode != nil) {
+            try container.encode(self.debugMode, forKey: .debugMode);
+        }
+    }
+
     // Returns Aspose.Words for Cloud base URL
     public func getBaseUrl() -> String {
         return self.baseUrl;
     }
 
-    // Returns Aspose.Words for Cloud app sid
-    public func getAppSid() -> String {
-        return self.appSid;
+    // Returns Aspose.Words for Cloud client id
+    public func getClientId() -> String {
+        return self.clientId;
     }
 
-    // Returns Aspose.Words for Cloud app key
-    public func getAppKey() -> String {
-        return self.appKey;
+    // Returns Aspose.Words for Cloud client secret
+    public func getClientSecret() -> String {
+        return self.clientSecret;
     }
 
     // Is debug mode enabled
@@ -91,6 +117,6 @@ public class Configuration : Codable {
 
     // Returns SDK version for using in statistics headers
     public func getSdkVersion() -> String {
-        return "20.10";
+        return "20.11";
     }
 }

Sources/AsposeWordsCloud/Api/ObjectSerializer.swift

@@ -245,23 +245,13 @@ class ObjectSerializer {
     private static let customEncoder: JSONEncoder = {
         let encoder = JSONEncoder();
         encoder.dateEncodingStrategy = .formatted(customIso8601);
-        encoder.keyEncodingStrategy = .custom { keys in
-            let oldKey = keys.last!.stringValue;
-            let newKey = oldKey.prefix(1).uppercased() + oldKey.dropFirst();
-            return CustomKey(stringValue: newKey)!;
-        };
         return encoder;
     }();
 
     // Custom JSON decoder
     private static let customDecoder: JSONDecoder = {
         let decoder = JSONDecoder();
         decoder.dateDecodingStrategy = .formatted(customIso8601);
-        decoder.keyDecodingStrategy = .custom { keys in
-            let oldKey = keys.last!.stringValue;
-            let newKey = oldKey.prefix(1).lowercased() + oldKey.dropFirst();
-            return CustomKey(stringValue: newKey)!;
-        };
         return decoder;
     }();
 }