Merge pull request #1 from aspose-email-cloud/develop

Aspose.Email Cloud 19.11 released

Author: Marat-Gumerov

.gitignore

@@ -1,7 +1,6 @@
-/src/packages
-/src/obj/Debug
-/src/bin/Debug
-/src/.vs
-/src/Aspose.Email-Cloud.csproj.user
-/src/obj/Release
-/src/bin/Release
+packages/
+obj/
+bin/
+.vs
+*.csproj.user
+.idea/

Api/EmailApi.cs

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="MSBuild.Sdk.Extras">
+  <PropertyGroup>
+    <Title>Aspose.Email Cloud SDK for .NET</Title>
+    <TargetFrameworks>net452;netstandard2.0;net20;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid60</TargetFrameworks>
+    <Description>Aspose.Email Cloud is a REST API for creating email applications that work with common email file formats. It lets developers manipulate message formats such as Outlook MSG, EML and MHT files.</Description>
+    <Copyright>Copyright (c) 2002-2018 Aspose Pty Ltd</Copyright>
+    <PackageProjectUrl>https://github.com/aspose-email-cloud/aspose-email-cloud-dotnet</PackageProjectUrl>
+    <License>MIT</License>
+    <PackageIcon>aspose_email-for-cloud-icon.png</PackageIcon>
+    <RepositoryUrl>https://github.com/aspose-email-cloud/aspose-email-cloud-dotnet</RepositoryUrl>
+    <PackageTags>ASPOSE EMAIL CLOUD SDK Outlook MSG EML MHT</PackageTags>
+    <RootNamespace>Aspose.Email.Cloud.Sdk</RootNamespace>
+    <Version>19.11.0</Version>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'Xamarin.iOS10' OR '$(TargetFramework)' == 'Xamarin.Mac20' OR '$(TargetFramework)' == 'MonoAndroid60'">
+    <PackageReference Include="Newtonsoft.Json" Version="8.0.3" />
+    <PackageReference Include="RestSharp" Version="106.6.10" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' OR '$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="RestSharp" Version="106.6.10" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net20'">
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="RestSharp.Net2" Version="1.1.11" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="resources\aspose_email-for-cloud-icon.png">
+      <Pack>True</Pack>
+      <PackagePath>
+      </PackagePath>
+    </None>
+  </ItemGroup>
+</Project>

Aspose.Email-Cloud.csproj

@@ -15,12 +15,11 @@ public class ApiException : Exception {
       /// Gets or sets the error content (body json object)
       /// </summary>
       /// <value>The error content (Http response body).</value>
-      public dynamic ErrorContent { get; private set; }
+      public object ErrorContent { get; private set; }
 
       /// <summary>
       /// Initializes a new instance of the <see cref="ApiException"/> class.
       /// </summary>
-      /// <param name="basePath">The base path.</param>
       public ApiException() {}
 
       /// <summary>
@@ -38,7 +37,7 @@ public ApiException(int errorCode, string message) : base(message) {
       /// <param name="errorCode">HTTP status code.</param>
       /// <param name="message">Error message.</param>
       /// <param name="errorContent">Error content.</param>
-      public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) {
+      public ApiException(int errorCode, string message, object errorContent = null) : base(message) {
           this.ErrorCode = errorCode;
           this.ErrorContent = errorContent;
       }

src/Client/ApiException.cs Client/ApiException.cssrc/Client/ApiException.cs renamed to Client/ApiException.cs

@@ -1,6 +1,6 @@
-// --------------------------------------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 // <copyright company="Aspose" file="Configuration.cs">
-//   Copyright (c) 2018 Aspose.Email for Cloud
+//   Copyright (c) 2018-2019 Aspose Pty Ltd. All rights reserved.
 // </copyright>
 // <summary>
 //   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -23,34 +23,72 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace Aspose.Email.Cloud.Sdk
+
+namespace Aspose.Email.Cloud.Sdk.Client
 {
+    using System;
+
     /// <summary>
     /// Represents a set of configuration settings.
     /// </summary>
     public class Configuration
     {
-        private string apiBaseUrl = "https://api.aspose.cloud";
-        private string version = "v1.1";
+        #region Consts
+
+        /// <summary>
+        /// The default base URL
+        /// </summary>
+        private const string DefaultBaseUrl = "https://api.aspose.cloud/";
+
+        /// <summary>
+        /// The default API version
+        /// </summary>
+        private const string DefaultApiVersion = "v3.0";
 
-        private bool debugMode = false;
+        #endregion
+
+        #region Fields
+
+        /// <summary>
+        /// The API base URL
+        /// </summary>
+        private string apiBaseUrl = DefaultBaseUrl;
+
+        #endregion
+
+        #region Properties
 
         /// <summary>
         /// Aspose Cloud API base URL.
         /// </summary>
         public string ApiBaseUrl
         {
-            get
-            {
-                return this.apiBaseUrl;
-            }
+            get => apiBaseUrl;
 
             set
             {
+                if (value.StartsWith("v1") || value.StartsWith("v2"))
+                {
+                    throw new Exception("This SDK is intended to be used only with API v3 " +
+                                        "and higher due to breaking changes!");
+                }
+
                 this.apiBaseUrl = value;
+                if (!this.apiBaseUrl.EndsWith("/"))
+                {
+                    this.apiBaseUrl += "/";
+                }
             }
         }
 
+        /// <summary>
+        /// Gets or sets the API version.
+        /// </summary>
+        /// <value>
+        /// The API version.
+        /// </value>
+        public string ApiVersion { get; set; } = DefaultApiVersion;
+
         /// <summary>
         /// Gets or sets the app key.
         /// </summary>
@@ -64,30 +102,27 @@ public string ApiBaseUrl
         /// <summary>
         /// Gets or sets a value indicating whether debug mode.
         /// </summary>
-        public bool DebugMode
-        {
-            get
-            {
-                return this.debugMode;
-            }
-
-            set
-            {
-                this.debugMode = value;
-            }
-        }
+        public bool DebugMode { get; set; } = false;
 
         /// <summary>
-        /// Authentification type.
-        /// Default is OAuth 2.0
+        /// If you use custom on-premise server with metered license.
+        /// This way, you only need to specify the API base URL.
         /// </summary>
-        public AuthType AuthType { get; set; }
+        public bool OnPremise { get; set; } = false;
+
+        #endregion
+
+        #region Methods
 
+        /// <summary>
+        /// Gets the API root URL.
+        /// </summary>
+        /// <returns></returns>
         internal string GetApiRootUrl()
         {
-            var result = this.ApiBaseUrl + "/" + this.version;
-
-            return result.EndsWith("/") ? result.Substring(0, result.Length - 1) : result;
+            return this.ApiBaseUrl + this.ApiVersion;
         }
+
+        #endregion
     }
 }

src/Api/Configuration.cs Client/Configuration.cssrc/Api/Configuration.cs renamed to Client/Configuration.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace Aspose.Email.Cloud.Sdk
+{
+    public class ApiErrorModel
+    {
+        public ApiErrorDataModel Error { get; set; }
+    }
+
+    public class ApiErrorDataModel
+    {
+        public string Code { get; set; }
+        public string Message { get; set; }
+        public string Description { get; set; }
+        public InnerApiErrorModel InnerError { get; set; }
+    }
+
+    public class InnerApiErrorModel
+    {
+        public string RequestId { get; set; }
+        public DateTime Date { get; set; }
+    }
+}