for 20.12 release

Author: leoluo5

AsposeCellsCloud.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "AsposeCellsCloud"
-  s.version      = "20.9"
+  s.version      = "20.12"
   s.summary      = "Aspose.Cells Cloud SDK for Swift."
   s.swift_version = "4.1"
 

AsposeCellsCloud/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>20.9</string>
+	<string>20.12</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

AsposeCellsCloud/Swaggers/APIs.swift

@@ -8,8 +8,8 @@ import Foundation
 
 open class AsposeCellsCloudAPI {
     public static var basePath = "https://api.aspose.cloud/v3.0"
-    public static var appSid: String?
-    public static var appKey: String?
+    public static var clientId: String?
+    public static var clientSecret: String?
     public static var credential: URLCredential?
     //public static var customHeaders: [String:String] = ["Authorization":""]
     public static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()

AsposeCellsCloud/pal/AuthAspose.swift

@@ -26,15 +26,21 @@ public class AuthAspose {
 
     public class func checkAuth(completion: @escaping ((_ error: AuthError?) -> Void )) {
 
+        if (AsposeCellsCloudAPI.clientId == nil && AsposeCellsCloudAPI.clientSecret == nil)
+        {
+            completion(nil)
+            return
+        }
+        
         if (AsposeCellsCloudAPI.accessToken == nil) {
-            
-            guard let appSid = AsposeCellsCloudAPI.appSid, let appKey = AsposeCellsCloudAPI.appKey else {
+
+            guard let clientId = AsposeCellsCloudAPI.clientId, let clientSecret = AsposeCellsCloudAPI.clientSecret else {
                 completion(AuthError.credentialsNotSetError)
                 return
             }
 
             let grantType:String = "client_credentials"
-            CellsAPI.oAuthPost(grantType: grantType, clientId: appSid, clientSecret: appKey)
+            CellsAPI.oAuthPost(grantType: grantType, clientId: clientId, clientSecret: clientSecret)
             {
                 (response, error) in
                 guard error == nil else {
@@ -48,6 +54,8 @@ public class AuthAspose {
                     completion(nil)
                 }
             }
+            
+            
 
         }
         else

AsposeCellsCloudTests/AsposeCellsCloudTests.swift

@@ -31,8 +31,9 @@ class AsposeCellsCloudTests: XCTestCase {
     internal let CELLAREA = "A1:C10"
     internal let RANGE = "A1:C10"
     //This is only for test, please set your licence here
-    internal let _appSid = "11111X11-111X-1111-11X1-111111111XX1"
-    internal let _appKey = "111x11111111xx1111xxxx11xx1x1111"
+    internal let _clientId = "11111X11-111X-1111-11X1-111111111XX1"
+    internal let _clientSecret = "111x11111111xx1111xxxx11xx1x1111"
+    internal let _basePath = "http://192.168.0.1/v3.0"
 
     override func setUp() {
         super.setUp()
@@ -48,9 +49,15 @@ class AsposeCellsCloudTests: XCTestCase {
 
     private func readSettings() {
 
-        //This is only for test, please set your licence here
-        AsposeCellsCloudAPI.appSid = self._appSid
-        AsposeCellsCloudAPI.appKey = self._appKey
+        //This is only for test, please set your licence or basePath
+        //Choose Mode A or Mode B, just one of them will be OK.
+        
+        //Mode A: Set clientId, clientSecret
+        //AsposeCellsCloudAPI.clientId = self._clientId
+        //AsposeCellsCloudAPI.clientSecret = self._clientSecret
+        
+        //Mode B: Set your own basePath
+        AsposeCellsCloudAPI.basePath = self._basePath
 
     }
 
@@ -75,12 +82,16 @@ class AsposeCellsCloudTests: XCTestCase {
         self.putCreate(path: path, file: url!, versionId: nil, storageName: storageName) {
             (response, error) in
             guard error == nil else {
+                let errorinfo = self.GetErrorDataInfo(error: error as! ErrorResponse)
+                print("error info: \(errorinfo!)")
                 XCTFail("error uploading file \(path)")
                 return
             }
             if let response = response, response.uploaded!.count > 0 {
                 completion()
             } else {
+                let errorinfo = self.GetErrorDataInfo(error: error as! ErrorResponse)
+                print("error info: \(errorinfo!)")
                 XCTFail("error uploading file \(name)")
             }
 

AsposeCellsCloudTests/CellsShapesAPITests.swift

@@ -173,7 +173,7 @@ class CellsShapesAPITests: AsposeCellsCloudTests {
 		let expectation = self.expectation(description: "testcellsShapesPutWorksheetShape")
 		let name:String = BOOK1
 		let sheetName:String = SHEET1
-        let shapeDTO:Shape? = nil
+        let shapeDTO:Shape? = Shape(link: nil, alternativeText: nil, bottom: nil, top: nil, width: nil, htmlText: nil, textVerticalAlignment: nil, autoShapeType: nil, isPrintable: nil, upperLeftColumn: nil, isLockAspectRatio: nil, isGroup: nil, rotationAngle: nil, zOrderPosition: nil, textHorizontalOverflow: nil, msoDrawingType: nil, textOrientationType: nil, placement: nil, name: nil, isWordArt: nil, linkedCell: nil, upperLeftRow: nil, isLocked: nil, lowerRightRow: nil, isTextWrapped: nil, Y: nil, X: nil, isHidden: nil, _left: nil, _right: nil, text: nil, lowerRightColumn: 10, height: nil, textHorizontalAlignment: nil, textVerticalOverflow: nil)
 		let drawingType:String = "button"
 		let upperLeftRow:Int32 = 1
 		let upperLeftColumn:Int32 = 1
@@ -189,6 +189,8 @@ class CellsShapesAPITests: AsposeCellsCloudTests {
 			{
 				(response, error) in
 				guard error == nil else {
+                    let errorinfo = self.GetErrorDataInfo(error: error as! ErrorResponse)
+                    print("error info: \(errorinfo!)")
 					XCTFail("error testcellsShapesPutWorksheetShape")
 					return
 				}

AsposeCellsCloudTests/CellsStorageAPITests.swift

@@ -221,6 +221,8 @@ class CellsStorageAPITests: AsposeCellsCloudTests {
 			{
 				(response, error) in
 				guard error == nil else {
+                    let errorinfo = self.GetErrorDataInfo(error: error as! ErrorResponse)
+                    print("error info: \(errorinfo!)")
 					XCTFail("error testgetFileVersions")
 					return
 				}

AsposeCellsCloudTests/OAuthAPITests.swift

@@ -26,9 +26,10 @@ class OAuthAPITests: AsposeCellsCloudTests {
 	func testoAuthPost() 
 	{
 		let expectation = self.expectation(description: "testoAuthPost")
+        /*
         let grantType:String = "client_credentials"
-        let clientId:String = AsposeCellsCloudAPI.appSid!
-        let clientSecret:String = AsposeCellsCloudAPI.appKey!
+        let clientId:String = AsposeCellsCloudAPI.clientId!
+        let clientSecret:String = AsposeCellsCloudAPI.clientSecret!
 
         CellsAPI.oAuthPost(grantType: grantType, clientId: clientId, clientSecret: clientSecret)
         {
@@ -44,6 +45,16 @@ class OAuthAPITests: AsposeCellsCloudTests {
                 expectation.fulfill()
             }
         }
+        */
+        AuthAspose.checkAuth()
+        {
+            (authError) in
+            guard authError == nil else {
+                XCTFail("error testoAuthPost")
+                return
+            }
+            expectation.fulfill()
+        }
 
 		self.waitForExpectations(timeout: testTimeout, handler: nil)		
 	}

README.md

@@ -20,10 +20,8 @@ Swift Cloud SDK wraps Aspose.Cells Cloud API. The SDK enhances your Android apps
 - Fetch the required shape from worksheet.
 - Leverage the power of named ranges.
 
-## New Features & Enhancements in Version 20.9
-- Supported sparkline groups.
-- Added API to update Pivot Fields.
-- Enhanced chart API.
+## New Features & Enhancements in Version 20.12
+- Aspose.Cells Cloud for Docker.
 
 ## Read & Write Spreadsheet Formats
 
@@ -51,11 +49,11 @@ SXC, FODS
 
 ## Get Started with Aspose.Cells Cloud SDK for Swift
 
-First, create an account at [Aspose for Cloud](https://dashboard.aspose.cloud/#/apps) and get your application information. Then, add pod `'AsposeCellsCloud', '~> 20.9'` similar to the following:
+First, create an account at [Aspose for Cloud](https://dashboard.aspose.cloud/#/apps) and get your application information. Then, add pod `'AsposeCellsCloud', '~> 20.12'` similar to the following:
 
 ```console
 target 'MyApp' do
-  pod 'AsposeCellsCloud', '~> 20.9'
+  pod 'AsposeCellsCloud', '~> 20.12'
 end
 ```