Merge pull request #83 from vchirikov/master

Add MemoryConfigurationProvider

Author: nimisha84

IPPDotNetDevKitCSV3/Code/Directory.Build.props

@@ -13,9 +13,9 @@
     <PackageOutputPath>$(SolutionDir)artifacts\nupkg</PackageOutputPath>
     <PackageIcon>$(MSBuildThisFileDirectory)logo.png</PackageIcon>
     <OutputPath>$(SolutionDir)artifacts\bin</OutputPath>
-    <Copyright>Copyright © 2018 Intuit, Inc.</Copyright>
-    <AssemblyVersion>8.0.0.0</AssemblyVersion>
-    <FileVersion>8.0.0.0</FileVersion>
+    <Copyright>Copyright © 2019 Intuit, Inc.</Copyright>
+    <AssemblyVersion>8.0.0.1</AssemblyVersion>
+    <FileVersion>8.0.0.1</FileVersion>
     <Company>Intuit</Company>
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@@ -29,7 +29,7 @@
     <DefineConstants>NET472;NETFULL</DefineConstants>
 
   </PropertyGroup>
-  
+
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)' == 'net461'">
     <DefineConstants>NET461;NETFULL</DefineConstants>
 
@@ -43,7 +43,7 @@
 
 
 
-  
-  
+
+
 
 </Project>

IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Core/Configuration/ApiSettings.cs

@@ -26,8 +26,6 @@ namespace Intuit.Ipp.Core.Configuration
     /// </summary>
     public class BaseUrl
     {
-        
-
         /// <summary>
         /// Gets or sets the url for QuickBooks Online Rest Service.
         /// </summary>

IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Core/Configuration/BaseUrl.cs

@@ -1,5 +1,5 @@
 ////*********************************************************
-// <copyright file="LocalConfigReader.cs" company="Intuit">
+// <copyright file="JsonFileConfigurationProvider.cs" company="Intuit">
 /*******************************************************************************
  * Copyright 2016 Intuit
  *
@@ -11,12 +11,12 @@
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implieC:\Users\nshrivastava\Documents\Git\QuickBooks-V3-DotNET-SDK\IPPDotNetDevKitCSV3\Code\Intuit.Ipp.Core\Configuration\LocalConfigReader.csd.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *******************************************************************************/
 //
-// <summary>This file contains Local Config Reader.</summary>
+// <summary>This file contains Json file config Reader.</summary>
 ////*********************************************************
 
 
@@ -28,7 +28,7 @@ namespace Intuit.Ipp.Core.Configuration
     using System.IO;
     using Intuit.Ipp.Diagnostics;
     using Intuit.Ipp.Exception;
-    //using Intuit.Ipp.Retry;  
+    //using Intuit.Ipp.Retry;
     using Intuit.Ipp.Security;
     using Intuit.Ipp.Utility;
 
@@ -37,30 +37,30 @@ namespace Intuit.Ipp.Core.Configuration
     using Microsoft.Extensions.Configuration;
 #endif
 
-   
+
 
     /// <summary>
-    /// Specifies the Default Configuration Reader implmentation used by the SDK.
+    /// Specifies the Default Json file configuration provider implementation used by the SDK.
+    /// By default reads "appsettings.json" file.
     /// </summary>
-    public class LocalConfigReader : IConfigReader
+    public class JsonFileConfigurationProvider : Core.IConfigurationProvider
     {
 
 #if NETSTANDARD2_0
         public string logPath { get; set; }
         IConfigurationRoot builder;
-        public LocalConfigReader(string path)
+        public JsonFileConfigurationProvider(string path)
         {
             builder = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile(path)
+                .AddJsonFile(path, optional: true)
                 .Build();
             //var builder = new ConfigurationBuilder()
             //    .AddJsonFile(path)
             //    .Build();
 
-            //// First way  
+            //// First way
             //string value1 = _iconfiguration.GetSection("Data").GetSection("ConnectionString").Value;
-            //// Second way  
+            //// Second way
             //string value2 = _iconfiguration.GetValue<string>("Data:ConnectionString");
 
 
@@ -79,26 +79,26 @@ public LocalConfigReader(string path)
 
 
         }
-        public LocalConfigReader() : this("appsettings.json")
+        public JsonFileConfigurationProvider() : this("appsettings.json")
         {
         }
 
 
 #endif
 
         /// <summary>
-        /// Reads the configuration from the config file and converts it to custom 
+        /// Reads the configuration from the config file and converts it to custom
         /// config objects which the end developer will use to get or set the properties.
         /// </summary>
         /// <returns>The custom config object.</returns>
-        public IppConfiguration ReadConfiguration()
+        public IppConfiguration GetConfiguration()
         {
 
 
             IppConfiguration ippConfig = new IppConfiguration();
 
 #if !NETSTANDARD2_0
-            
+
             IppConfigurationSection ippConfigurationSection = IppConfigurationSection.Instance;
             if (ippConfigurationSection == null)
             {
@@ -196,7 +196,7 @@ public IppConfiguration ReadConfiguration()
                     break;
             }
 
-            //// TODO : This will not be used now. 
+            //// TODO : This will not be used now.
             ////if (!string.IsNullOrEmpty(ippConfigurationSection.Message.CustomSerializer.Name) && !string.IsNullOrEmpty(ippConfigurationSection.Message.CustomSerializer.Type) && ippConfigurationSection.Message.CustomSerializer.Enable)
             ////{
             ////    Type customSerializerType = Type.GetType(ippConfigurationSection.Message.CustomSerializer.Type);
@@ -277,7 +277,7 @@ public IppConfiguration ReadConfiguration()
                     break;
             }
 
-            
+
             switch (ippConfigurationSection.Retry.Mode)
             {
                 case RetryMode.Linear:
@@ -336,7 +336,7 @@ public IppConfiguration ReadConfiguration()
 
             ippConfig.VerifierToken = new VerifierToken();
             ippConfig.VerifierToken.Value = ippConfigurationSection.WebhooksService.WebhooksVerifier.Value;
-           
+
 #endif
 #if NETSTANDARD2_0
 
@@ -447,7 +447,7 @@ public IppConfiguration ReadConfiguration()
             }
             else if (securityCustomSettings["Enable"] == "true")
             {
-                if (!string.IsNullOrEmpty(securityCustomSettings["Name"]) && !string.IsNullOrEmpty(securityCustomSettings["Type"]) && Convert.ToBoolean(securityCustomSettings["Enable"]) == true)
+                if (!string.IsNullOrEmpty(securityCustomSettings["Name"]) && !string.IsNullOrEmpty(securityCustomSettings["Type"]))
                 {
                     Type customSecurityType = Type.GetType(securityCustomSettings["Type"]);
                     if (!string.IsNullOrEmpty(securityCustomSettings["Params"]))
@@ -585,7 +585,7 @@ public IppConfiguration ReadConfiguration()
                     }
                 }
             }
-            
+
 
             //ippConfig.BaseUrl = new BaseUrl();
 
@@ -602,7 +602,7 @@ public IppConfiguration ReadConfiguration()
 
             //ippConfig.VerifierToken = new VerifierToken();
             ippConfig.VerifierToken.Value = webhooksVerifierTokenSettings["Value"];
-           
+
 #endif
             //#if NETSTANDARD2_0
             //            //IppConfiguration ippConfig = new IppConfiguration();

IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Core/Configuration/IApiSettings.cs

@@ -0,0 +1,94 @@
+////*********************************************************
+// <copyright file="MemoryConfigurationProvider.cs" company="Intuit">
+/*******************************************************************************
+ * Copyright 2016 Intuit
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *******************************************************************************/
+//
+// <summary>This file contains config provider, that returns user IppConfiguration.</summary>
+////*********************************************************
+
+
+
+namespace Intuit.Ipp.Core.Configuration
+{
+    using Intuit.Ipp.Diagnostics;
+
+
+    /// <summary>
+    /// Specifies the configuration provider, that returns user provided <see cref="IppConfiguration"/>
+    /// </summary>
+    public class MemoryConfigurationProvider : IConfigurationProvider
+    {
+        private readonly IppConfiguration configuration;
+
+        /// <summary>
+        /// Check given new <see cref="IppConfiguration"/> and fill some properties if they isn't setted.
+        /// </summary>
+        /// <param name="cfg"></param>
+        public MemoryConfigurationProvider(IppConfiguration cfg)
+        {
+            if (cfg.Logger == null)
+            {
+                cfg.Logger = new Logger
+                {
+                    CustomLogger = new TraceLogger(),
+                    RequestLog = new RequestLog
+                    {
+                        EnableRequestResponseLogging = false,
+                        ServiceRequestLoggingLocation = System.IO.Path.GetTempPath()
+                    }
+                };
+            }
+            if (cfg.Message == null)
+            {
+                cfg.Message = new Message
+                {
+                    Request = new Request
+                    {
+                        CompressionFormat = CompressionFormat.GZip,
+                        SerializationFormat = SerializationFormat.Json
+                    },
+                    Response = new Response
+                    {
+                        CompressionFormat = CompressionFormat.GZip,
+                        SerializationFormat = SerializationFormat.Json
+                    }
+                };
+            }
+            if (cfg.BaseUrl == null)
+            {
+                cfg.BaseUrl = new BaseUrl()
+;
+            }
+            if (cfg.MinorVersion == null)
+            {
+                cfg.MinorVersion = new MinorVersion();
+            }
+;
+            if (cfg.VerifierToken == null)
+            {
+                cfg.VerifierToken = new VerifierToken();
+            }
+            configuration = cfg;
+        }
+
+        /// <summary>
+        /// Returns given configuration
+        /// </summary>
+        public IppConfiguration GetConfiguration() => configuration;
+
+    }
+}
+