Merge branch 'master' of https://github.com/twilio/twilio-csharp into…

… alpha
twilio · Feb 24, 2017 · bae2f96 · bae2f96
2 parents 6779c57 + 516aec1
commit bae2f96
Show file tree

Hide file tree

Showing 9 changed files with 309 additions and 251 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,7 +1,14 @@
 twilio-csharp Changelog
 =======================
 
-[2017-02-09] Version 5.0.0
+
+[2017-02-24] Version 5.0.2-alpha1
+--------------------------
+ - URL encode all parameters
+ - Remove erroneous JWT header in .NET 3.5
+
+
+[2017-02-21] Version 5.0.1-alpha1
 --------------------------
 **New Major Version**
 

diff --git a/src/Twilio/Http/Request.cs b/src/Twilio/Http/Request.cs
@@ -1,9 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
+using System.Text;
 using Twilio.Rest;
 
+#if !NET35
+using System.Net;
+#else
+using System.Web;
+#endif
+
 namespace Twilio.Http
 {
     /// <summary>
@@ -116,9 +122,13 @@ private static string EncodeParameters(IEnumerable<KeyValuePair<string, string>>
                 else
                 {
                     result += "&";
-                }
-
-                result += pair.Key + "=" + pair.Value;
+                }
+
+#if !NET35
+                result += WebUtility.UrlEncode(pair.Key) + "=" + WebUtility.UrlEncode(pair.Value);
+#else
+                result += HttpUtility.UrlEncode(pair.Key) + "=" + HttpUtility.UrlEncode(pair.Value);
+#endif
             }
 
             return result;

diff --git a/src/Twilio/JWT/BaseJwt.cs b/src/Twilio/JWT/BaseJwt.cs
@@ -127,7 +127,7 @@ private string BuildToken(JwtHeader headers, JwtPayload payload)
 #else
         private Dictionary<string, object> BuildHeaders()
         {
-            return new Dictionary<string, object> { { "typ", "JWT" } };
+            return new Dictionary<string, object>();
         }
 
         private Dictionary<string, object> BuildPayload()

diff --git a/src/Twilio/Properties/AssemblyInfo.cs b/src/Twilio/Properties/AssemblyInfo.cs
@@ -14,5 +14,5 @@
 
 internal class AssemblyInfomation
 {
-    public const string AssemblyInformationalVersion = "5.0.1-alpha1";
+    public const string AssemblyInformationalVersion = "5.0.2-alpha1";
 }
diff --git a/src/Twilio/Twilio.csproj b/src/Twilio/Twilio.csproj
@@ -7,7 +7,7 @@
     <Copyright>Copyright © Twilio</Copyright>
     <AssemblyTitle>Twilio</AssemblyTitle>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <VersionPrefix>5.0.1</VersionPrefix>
+    <VersionPrefix>5.0.2</VersionPrefix>
     <VersionSuffix>alpha1</VersionSuffix>
     <Authors>Twilio</Authors>
     <NoWarn>$(NoWarn);CS1591</NoWarn>