Version 0.7.2

XiaoFaye · Jul 22, 2017 · 9f2a724 · 9f2a724
1 parent 86e8ab2
commit 9f2a724
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 15 deletions.
diff --git a/Base/BaseObject.cs b/Base/BaseObject.cs
@@ -21,7 +21,10 @@ void OnSerializing(StreamingContext ctx)
                 {
                     if (pi.PropertyType == typeof(decimal?))
                     {
-                        objValue.SetValue(this, (pi.GetValue(this) as decimal?).Value.ToString(CultureInfo.InvariantCulture));
+                        if (GetType().FullName.StartsWith("WooCommerceNET.WooCommerce.v1") || GetType().FullName.StartsWith("WooCommerceNET.WooCommerce.v2"))
+                            objValue.SetValue(this, (pi.GetValue(this) as decimal?).Value.ToString(CultureInfo.InvariantCulture));
+                        else
+                            objValue.SetValue(this, decimal.Parse(pi.GetValue(this).ToString(), CultureInfo.InvariantCulture));
                     }
                     else if (pi.PropertyType == typeof(int?))
                     {

diff --git a/Changes.md b/Changes.md
@@ -3,6 +3,12 @@
 
 Version History
 -------------------
+* v0.7.2 update
+  1. Add webResponseFilter in RestAPI, which allows you to get information from the HttpWebResponse object, e.g.:X-WP-Total and X-WP-TotalPages.
+  2. Fix decimal values do not be serialized as string issue.
+  3. Avoid Deadlocking on the UI Thread on non-async calls.
+  4. Fix Variation weight not deserialising issue.
+  5. Allow calling third party Plugins restful apis.
 * v0.7.1 Major update
   1. Able to override the process of SerializeJSon and DeserializeJSon.
   2. Allow to handle meta value for different return types.

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -26,5 +26,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.1.0")]
-[assembly: AssemblyFileVersion("0.7.1.0")]
+[assembly: AssemblyVersion("0.7.2.0")]
+[assembly: AssemblyFileVersion("0.7.2.0")]
diff --git a/RestAPI.cs b/RestAPI.cs
@@ -24,6 +24,7 @@ public class RestAPI
         private Func<string, string> jsonSeFilter;
         private Func<string, string> jsonDeseFilter;
         private Action<HttpWebRequest> webRequestFilter;
+        private Action<HttpWebResponse> webResponseFilter;
 
         /// <summary>
         /// Initialize the RestAPI object
@@ -35,10 +36,12 @@ public class RestAPI
         /// <param name="jsonSerializeFilter">Provide a function to modify the json string after serilizing.</param>
         /// <param name="jsonDeserializeFilter">Provide a function to modify the json string before deserilizing.</param>
         /// <param name="requestFilter">Provide a function to modify the HttpWebRequest object.</param>
+        /// <param name="responseFilter">Provide a function to grab information from the HttpWebResponse object.</param>
         public RestAPI(string url, string key, string secret, bool authorizedHeader = true, 
                             Func<string, string> jsonSerializeFilter = null, 
                             Func<string, string> jsonDeserializeFilter = null, 
-                            Action<HttpWebRequest> requestFilter = null)//, bool useProxy = false)
+                            Action<HttpWebRequest> requestFilter = null,
+                            Action<HttpWebResponse> responseFilter = null)//, bool useProxy = false)
         {
             if (string.IsNullOrEmpty(url))
                 throw new Exception("Please use a valid WooCommerce Restful API url.");
@@ -50,6 +53,8 @@ public RestAPI(string url, string key, string secret, bool authorizedHeader = tr
                 Version = APIVersion.Version1;
             else if (urlLower.EndsWith("wp-json/wc/v2"))
                 Version = APIVersion.Version2;
+            else if (urlLower.Contains("wp-json/wc-"))
+                Version = APIVersion.ThirdPartyPlugins;
             else
             {
                 Version = APIVersion.Unknown;
@@ -69,6 +74,7 @@ public RestAPI(string url, string key, string secret, bool authorizedHeader = tr
             jsonSeFilter = jsonSerializeFilter;
             jsonDeseFilter = jsonDeserializeFilter;
             webRequestFilter = requestFilter;
+            webResponseFilter = responseFilter;
 
             //wc_Proxy = useProxy;
         }
@@ -205,17 +211,13 @@ private string GetOAuthEndPoint(string method, string endpoint, Dictionary<strin
                 foreach (var p in parms)
                     dic.Add(p.Key, p.Value);
 
-            string base_request_uri = Uri.EscapeDataString(wc_url + endpoint).Replace("%2f", "%2F").Replace("%3a", "%3A");
+            string base_request_uri = method.ToUpper() + "&" + Uri.EscapeDataString(wc_url + endpoint) + "&";
             string stringToSign = string.Empty;
 
             foreach (var parm in dic.OrderBy(x => x.Key))
-                stringToSign += Uri.EscapeDataString(parm.Key) + "%3D" + Uri.EscapeDataString(Uri.EscapeDataString(parm.Value)) + "%26";
+                stringToSign += Uri.EscapeDataString(parm.Key) + "=" + Uri.EscapeDataString(parm.Value) + "&";
 
-            base_request_uri = method.ToUpper() + "&" + base_request_uri + "&" + stringToSign.Substring(0, stringToSign.Length - 3);
-
-            Common.DebugInfo.Append(base_request_uri);
-
-            stringToSign += "oauth_signature%3D" + Common.GetSHA256(wc_secret, base_request_uri);
+            base_request_uri = base_request_uri + Uri.EscapeDataString(stringToSign.TrimEnd('&'));
 
             dic.Add("oauth_signature", Common.GetSHA256(wc_secret, base_request_uri));
 
@@ -317,6 +319,7 @@ public enum APIVersion
         Unknown = 0,
         Legacy = 1,
         Version1 = 2,
-        Version2 = 3
+        Version2 = 3,
+        ThirdPartyPlugins = 99
     }
 }
diff --git a/WooCommerce/v2/Product.cs b/WooCommerce/v2/Product.cs
@@ -242,10 +242,11 @@ public class Product : JsonObject
         [DataMember(EmitDefaultValue = false)]
         public bool? manage_stock { get; set; }
 
+        [DataMember(EmitDefaultValue = false, Name = "stock_quantity")]
+        private object stock_quantityValue { get; set; }
         /// <summary>
         /// Stock quantity.
         /// </summary>
-        [DataMember(EmitDefaultValue = false)]
         public int? stock_quantity { get; set; }
 
         /// <summary>

diff --git a/WooCommerce/v2/Variation.cs b/WooCommerce/v2/Variation.cs
@@ -165,10 +165,11 @@ public class Variation : JsonObject
         [DataMember(EmitDefaultValue = false)]
         public object manage_stock { get; set; }
 
+        [DataMember(EmitDefaultValue = false, Name = "stock_quantity")]
+        private object stock_quantityValue { get; set; }
         /// <summary>
         /// Stock quantity.
         /// </summary>
-        [DataMember(EmitDefaultValue = false)]
         public int? stock_quantity { get; set; }
 
         /// <summary>

diff --git a/WooCommerceNET.csproj b/WooCommerceNET.csproj
@@ -37,6 +37,7 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
+    <None Include="Changes.md" />
     <None Include="License.md" />
     <None Include="Readme.md" />
   </ItemGroup>
@@ -87,7 +88,6 @@
     <Compile Include="WooCommerce\v2\WCObject.cs" />
     <Compile Include="WooCommerce\v2\Webhook.cs" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>