Merge pull request #87 from aspose-pdf-cloud/develop

ApiClient validation added

Author: kaferi

src/Aspose.Pdf.Cloud.Sdk/Api/PdfApi.cs

@@ -25,7 +25,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using RestSharp;
 using Aspose.Pdf.Cloud.Sdk.Client;
@@ -20821,6 +20820,7 @@ public PdfApi(string jwtToken)
             Configuration = new Configuration("", "");
             ApiClient = new ApiClient(Configuration);
             ApiClient.AccessToken = jwtToken;
+            ApiClient.Validate();
             ExceptionFactory = Aspose.Pdf.Cloud.Sdk.Client.Configuration.DefaultExceptionFactory;
         }
 
@@ -20843,12 +20843,10 @@ public PdfApi(string apiKey, string appSid)
         public PdfApi(Configuration configuration)
         {
             if (configuration == null)
-            {
                 throw new ArgumentNullException("configuration");
-            }
-            
             Configuration = configuration;
             ApiClient = new ApiClient(Configuration);           
+            ApiClient.Validate();
             ExceptionFactory = Aspose.Pdf.Cloud.Sdk.Client.Configuration.DefaultExceptionFactory;
         }
 

src/Aspose.Pdf.Cloud.Sdk/Client/ApiClient.cs

@@ -42,7 +42,7 @@ namespace Aspose.Pdf.Cloud.Sdk.Client
     /// <summary>
     /// API client is mainly responsible for making the HTTP call to the API backend.
     /// </summary>
-    public partial class ApiClient
+    public class ApiClient
     {
         private const int MAX_AUTH_TRIES_COUNT = 5;
         private int authTriesCount = 0;
@@ -164,12 +164,29 @@ private async System.Threading.Tasks.Task<bool> InterceptResponseAsync(IRestRequ
         /// </summary>
         public ApiClient(Configuration config)
         {
-            Configuration = config;
-           
+            Configuration = config;           
             RestClient = new RestClient(config.BasePath);
         }
 
-        
+        private static bool CheckSidKey(string appSid, string apiKey)
+        {
+            if (appSid == apiKey)
+                return true;
+            string[] ssSid = appSid.Split('-');
+            string[] ssKey = apiKey.Split('-');
+            return ssSid.Length == 5 && ssKey.Length == 1;
+        }
+
+        internal void Validate()
+        {
+            if (string.IsNullOrWhiteSpace(Configuration.BasePath))
+                throw new ArgumentException("empty BasePath");
+            if (!string.IsNullOrWhiteSpace(_accessToken))
+                return;
+            if (!CheckSidKey(Configuration.AppSid, Configuration.ApiKey))
+                throw new ArgumentException("AppSid/ApiKey are messed up or have wrong format");
+        }
+
         /// <summary>
         /// Gets or sets the Configuration.
         /// </summary>

src/Aspose.Pdf.Cloud.Sdk/Client/Configuration.cs

@@ -24,11 +24,10 @@
 // --------------------------------------------------------------------------------------------------------------------
 
 using System;
-using System.Reflection;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
+using System.Reflection;
 
 namespace Aspose.Pdf.Cloud.Sdk.Client
 {
@@ -57,12 +56,7 @@ public Configuration(string apiKey,
                              int timeout = 5 * 60 * 1000,
                              string userAgent = "aspose pdf cloud sdk"
                             )
-        {
-            if (string.IsNullOrEmpty(basePath))
-                 throw new ArgumentException("basePath cannot be empty");
-            if (!_CheckSidKey(appSid, apiKey))
-                 throw new ArgumentException("appSid and apiKey are messed up or have wrong format");
-            
+        {            
             ApiKey = apiKey;
             AppSid = appSid;
             BasePath = basePath;
@@ -74,13 +68,6 @@ public Configuration(string apiKey,
             Timeout = timeout;
         }
 
-        private static bool _CheckSidKey(string appSid, string apiKey)
-        {
-            var ssSid = appSid.Split('-');
-            var ssKey = apiKey.Split('-');
-            return ssSid.Length == 5 && ssKey.Length == 1;
-        }
-
         /// <summary>
         /// Default creation of exceptions for a given method name and response object
         /// </summary>