Merge branch 'jwt_token'

Author: eldar-yakupov

src/Api/ApiVersion.cs

@@ -28,21 +28,32 @@ namespace Aspose.BarCode.Cloud.Sdk
     /// <summary>
     /// The availiable api versions.
     /// </summary>
-    public enum ApiVersion
+    public class ApiVersion
     {
+        public string Version { get; set; }
+        private ApiVersion(string version)
+        {
+            Version = version;
+        }
         /// <summary>
         /// Current API version
         /// </summary>
-        V1 = 1,
+        public static ApiVersion V1 = new ApiVersion("1.0");
 
         /// <summary>
         /// Stable version
         /// </summary>
-        V2 = 2,
+        public static ApiVersion V2 = new ApiVersion("2.0");
 
         /// <summary>
         /// Frozen version
         /// </summary>
-        V3 = 3
+        public static ApiVersion V3 = new ApiVersion("3.0");
+
+        public override string ToString()
+        {
+            return Version;
+        }
     }
+
 }

src/Api/AuthType.cs

@@ -38,6 +38,12 @@ public enum AuthType
         /// <summary>
         /// Authentification with signing of url.
         /// </summary>
-        RequestSignature = 1
+        RequestSignature = 1,
+
+        /// <summary>
+        /// Token for OAuth2 provided by caller
+        /// </summary>
+        ExternalAuth = 2,
+
     }
 }

src/Api/BarCodeApi.cs

@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright company="Aspose" file="BarCodeApi.cs">
-//   Copyright (c) 2018 Aspose.BarCode for Cloud
+//   Copyright (c) 2019 Aspose.BarCode for Cloud
 // </copyright>
 // <summary>
 //   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -53,6 +53,12 @@ public BarCodeApi(string apiKey, string appSid)
         {
         }
 
+        public BarCodeApi(string jwtToken)
+            : this(new Configuration { JwtToken = jwtToken, ApiVersion = ApiVersion.V3, AuthType = AuthType.ExternalAuth })
+        {
+        }
+
+
         /// <summary>
         /// Initializes a new instance of the <see cref="BarCodeApi"/> class.
         /// </summary>    
@@ -62,10 +68,18 @@ public BarCodeApi(Configuration configuration)
             this.configuration = configuration;
 
             var requestHandlers = new List<IRequestHandler>();
-            requestHandlers.Add(new OAuthRequestHandler(this.configuration));
+            switch (this.configuration.AuthType)
+            {
+                case AuthType.RequestSignature: requestHandlers.Add(new AuthWithSignatureRequestHandler(this.configuration));
+                    break;
+                case AuthType.OAuth2: requestHandlers.Add(new OAuthRequestHandler(this.configuration));
+                    break;
+                case AuthType.ExternalAuth: requestHandlers.Add(new ExternalAuthorizationRequestHandler(this.configuration));
+                    break;
+            }
+
             requestHandlers.Add(new DebugLogRequestHandler(this.configuration));
             requestHandlers.Add(new ApiExceptionRequestHandler());
-            requestHandlers.Add(new AuthWithSignatureRequestHandler(this.configuration));
             this.apiInvoker = new ApiInvoker(requestHandlers);
         }                            
 

src/Api/Configuration.cs

@@ -45,6 +45,13 @@ public class Configuration
         /// </summary>
         public string AppSid { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Jwt token.
+        /// If set the library would handle auth internally
+        /// </summary>
+        public string JwtToken { get; set; }
+
+
         /// <summary>
         /// Gets or sets a value indicating whether debug mode.
         /// </summary>
@@ -70,7 +77,7 @@ public Configuration()
 
         internal string GetApiRootUrl()
         {
-            var result = this.ApiBaseUrl + "/v" + (int)ApiVersion;
+            var result = this.ApiBaseUrl + "/v" + ApiVersion;
 
             return result.EndsWith("/") ? result.Substring(0, result.Length - 1) : result;
         }

src/Aspose.BarCode.Cloud.Sdk.csproj

@@ -10,15 +10,16 @@ Aspose.Barcode for Cloud allows you to control all aspects of the image and barc
     <RepositoryUrl>https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet</RepositoryUrl>
     <PackageTags>Aspose.Barcode barcode generation recognition Alpha-Numeric AI-8102-Coupon AustralianPosteParcel AustraliaPost Aztec Codabar CodablockF Code11 Code128 Code16K Code32 Code39Extended Code39Standard Code93Extended Code93Standard DatabarExpanded DatabarExpandedStacked DatabarLimited DatabarOmniDirectional DatabarStacked DatabarStackedOmniDirectional DatabarTruncated DataLogic2of5 DataMatrix DeutschePostIdentcode DeutschePostLeitcode DotCode DutchKIX EAN13 EAN14 EAN8 GS1CodablockF GS1Code128 GS1DataMatrix GS1QR IATA2of5 Interleaved2of5 ISBN ISMN ISSN ItalianPost25 ITF14 ITF6 MacroPdf417 Matrix2of5 MaxiCode MicroPdf417 MICR (only BarCode reader) MSI OneCode OPC PatchCode Pdf417 Pharmacode Planet Postnet PZN QR RM4SCC SCC14 SingaporePost SSCC18 Standard2of5 SwissPostParcel UPCA UpcaGs1Code128Coupon UpcaGs1DatabarCoupon UPCE VIN</PackageTags>
     <PackageLicenseUrl>https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/blob/master/LICENSE</PackageLicenseUrl>
-    <Copyright>© Aspose 2002-2018. All Rights Reserved.</Copyright>
+    <Copyright>© Aspose 2002-2019. All Rights Reserved.</Copyright>
     <RepositoryType>Git</RepositoryType>
     <PackageProjectUrl>https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet</PackageProjectUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>Aspose.BarCode-Cloud</PackageId>
     <Product>Aspose.BarCode Cloud SDK for .NET</Product>
     <PackageIconUrl>https://www.aspose.cloud/templates/aspose/App_Themes/V3/images/barcode/272x272/aspose_barcode-for-cloud-min.png</PackageIconUrl>
-    <Version>18.6.0</Version>
+    <Version>19.10.0</Version>
     <Authors>asposecloud</Authors>
+    <AssemblyVersion>19.10.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/Internal/RequestHandlers/ExternalOAuthRequestHandler.cs

@@ -0,0 +1,63 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright company="Aspose" file="OAuthRequestHandler.cs">
+//   Copyright (c) 2018 Aspose.BarCode for Cloud
+// </copyright>
+// <summary>
+//   Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+// 
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+// 
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace Aspose.BarCode.Cloud.Sdk.RequestHandlers
+{
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Net;
+
+    using Newtonsoft.Json;
+
+    internal class ExternalAuthorizationRequestHandler : IRequestHandler
+    {
+        private readonly Configuration configuration;
+
+        public ExternalAuthorizationRequestHandler(Configuration configuration)
+        {
+            this.configuration = configuration;
+        }
+
+        public string ProcessUrl(string url)
+        {
+            return url;
+        }
+
+        public void BeforeSend(WebRequest request, Stream streamToSend)
+        {
+            if (this.configuration.AuthType == AuthType.OAuth2 && string.IsNullOrEmpty(this.configuration.JwtToken))
+            {
+                throw new ApiException(401, "Authorization header value required");
+            }
+
+            request.Headers.Add("Authorization", "Bearer " + this.configuration.JwtToken);
+        }
+
+        public void ProcessResponse(HttpWebResponse response, Stream resultStream)
+        {
+        }
+
+    }
+}