Fix dead lock issue for DropboxOauth2Helper.

Author: Qiming Yuan

Dropbox.Api/AppProperties/AssemblyInfo.cs

@@ -18,4 +18,4 @@
 [assembly: AssemblyCulture("")]
 
 [assembly: AssemblyVersion("4.0.0")]
-[assembly: AssemblyFileVersion("4.0.6291")]
+[assembly: AssemblyFileVersion("4.0.6321")]

Dropbox.Api/Dropbox.Api.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Dropbox.Api</id>
-    <version>4.2.4</version>
+    <version>4.2.5</version>
     <title>Dropbox v2 API</title>
     <authors>Dropbox Inc</authors>
     <owners>Dropbox Inc</owners>
@@ -12,9 +12,8 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Portable class library for accessing the Dropbox v2 API</description>
     <releaseNotes> 
-What's new:
-- Update DropboxOauth2Helper to use versionless oauth2 endpoints.
-- Use semantic versioning for AssemblyInfo.cs.
+Bug fixes:
+  - Fixed deadlock issue for DropboxOauth2Helper.
    </releaseNotes>
     <copyright>Copyright (c) Dropbox Inc. 2016</copyright>
     <tags>Dropbox Api</tags>
@@ -40,4 +39,4 @@ What's new:
     <file src="bin\Release\portable40\Dropbox.Api.dll" target="lib\portable-net40+sl5+wp80+win8+wpa81\Dropbox.Api.dll" />
     <file src="bin\Release\portable40\Dropbox.Api.xml" target="lib\portable-net40+sl5+wp80+win8+wpa81\Dropbox.Api.xml" />
   </files>
-</package>
+</package>

Dropbox.Api/DropboxOauth2Helper.cs

@@ -372,9 +372,9 @@ public static async Task<OAuth2Response> ProcessCodeFlowAsync(string code, strin
                 }
 
                 var content = new FormUrlEncodedContent(parameters);
-                var response = await httpClient.PostAsync("https://api.dropbox.com/oauth2/token", content);
+                var response = await httpClient.PostAsync("https://api.dropbox.com/oauth2/token", content).ConfigureAwait(false);
 
-                var raw = await response.Content.ReadAsStringAsync();
+                var raw = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 var json = JObject.Parse(raw);
 
                 if (response.StatusCode != HttpStatusCode.OK)

Dropbox.Api/Generated/Auth/AccessError.cs

@@ -230,7 +230,7 @@ private class InvalidAccountTypeEncoder : enc.StructEncoder<InvalidAccountType>
                 /// <param name="writer">The writer.</param>
                 public override void EncodeFields(InvalidAccountType value, enc.IJsonWriter writer)
                 {
-                    Dropbox.Api.Auth.InvalidAccountTypeError.Encoder.EncodeFields(value.Value, writer);
+                    global::Dropbox.Api.Auth.InvalidAccountTypeError.Encoder.EncodeFields(value.Value, writer);
                 }
             }
 
@@ -264,7 +264,7 @@ protected override void SetField(InvalidAccountType value, string fieldName, enc
                     switch (fieldName)
                     {
                         case "invalid_account_type":
-                            value.Value = Dropbox.Api.Auth.InvalidAccountTypeError.Decoder.Decode(reader);
+                            value.Value = global::Dropbox.Api.Auth.InvalidAccountTypeError.Decoder.Decode(reader);
                             break;
                         default:
                             reader.Skip();
@@ -329,7 +329,7 @@ private class PaperAccessDeniedEncoder : enc.StructEncoder<PaperAccessDenied>
                 /// <param name="writer">The writer.</param>
                 public override void EncodeFields(PaperAccessDenied value, enc.IJsonWriter writer)
                 {
-                    Dropbox.Api.Auth.PaperAccessError.Encoder.EncodeFields(value.Value, writer);
+                    global::Dropbox.Api.Auth.PaperAccessError.Encoder.EncodeFields(value.Value, writer);
                 }
             }
 
@@ -363,7 +363,7 @@ protected override void SetField(PaperAccessDenied value, string fieldName, enc.
                     switch (fieldName)
                     {
                         case "paper_access_denied":
-                            value.Value = Dropbox.Api.Auth.PaperAccessError.Decoder.Decode(reader);
+                            value.Value = global::Dropbox.Api.Auth.PaperAccessError.Decoder.Decode(reader);
                             break;
                         default:
                             reader.Skip();

Dropbox.Api/Generated/Auth/AuthAppRoutes.cs

@@ -41,7 +41,7 @@ internal AuthAppRoutes(enc.ITransport transport)
         /// cref="TokenFromOAuth1Error"/>.</exception>
         public t.Task<TokenFromOAuth1Result> TokenFromOauth1Async(TokenFromOAuth1Arg tokenFromOAuth1Arg)
         {
-            return this.Transport.SendRpcRequestAsync<TokenFromOAuth1Arg, TokenFromOAuth1Result, TokenFromOAuth1Error>(tokenFromOAuth1Arg, "api", "/auth/token/from_oauth1", "app", Dropbox.Api.Auth.TokenFromOAuth1Arg.Encoder, Dropbox.Api.Auth.TokenFromOAuth1Result.Decoder, Dropbox.Api.Auth.TokenFromOAuth1Error.Decoder);
+            return this.Transport.SendRpcRequestAsync<TokenFromOAuth1Arg, TokenFromOAuth1Result, TokenFromOAuth1Error>(tokenFromOAuth1Arg, "api", "/auth/token/from_oauth1", "app", global::Dropbox.Api.Auth.TokenFromOAuth1Arg.Encoder, global::Dropbox.Api.Auth.TokenFromOAuth1Result.Decoder, global::Dropbox.Api.Auth.TokenFromOAuth1Error.Decoder);
         }
 
         /// <summary>

Dropbox.Api/Generated/Auth/RateLimitError.cs

@@ -81,7 +81,7 @@ private class RateLimitErrorEncoder : enc.StructEncoder<RateLimitError>
             /// <param name="writer">The writer.</param>
             public override void EncodeFields(RateLimitError value, enc.IJsonWriter writer)
             {
-                WriteProperty("reason", value.Reason, writer, Dropbox.Api.Auth.RateLimitReason.Encoder);
+                WriteProperty("reason", value.Reason, writer, global::Dropbox.Api.Auth.RateLimitReason.Encoder);
                 WriteProperty("retry_after", value.RetryAfter, writer, enc.UInt64Encoder.Instance);
             }
         }
@@ -116,7 +116,7 @@ protected override void SetField(RateLimitError value, string fieldName, enc.IJs
                 switch (fieldName)
                 {
                     case "reason":
-                        value.Reason = Dropbox.Api.Auth.RateLimitReason.Decoder.Decode(reader);
+                        value.Reason = global::Dropbox.Api.Auth.RateLimitReason.Decoder.Decode(reader);
                         break;
                     case "retry_after":
                         value.RetryAfter = enc.UInt64Decoder.Instance.Decode(reader);

Dropbox.Api/Generated/Files/AlphaGetMetadataArg.cs

@@ -13,7 +13,7 @@ namespace Dropbox.Api.Files
     /// <summary>
     /// <para>The alpha get metadata arg object</para>
     /// </summary>
-    /// <seealso cref="Dropbox.Api.Files.GetMetadataArg" />
+    /// <seealso cref="Global::Dropbox.Api.Files.GetMetadataArg" />
     public class AlphaGetMetadataArg : GetMetadataArg
     {
         #pragma warning disable 108

Dropbox.Api/Generated/Files/AlphaGetMetadataError.cs

@@ -203,7 +203,7 @@ private class PropertiesErrorEncoder : enc.StructEncoder<PropertiesError>
                 /// <param name="writer">The writer.</param>
                 public override void EncodeFields(PropertiesError value, enc.IJsonWriter writer)
                 {
-                    Dropbox.Api.Files.LookUpPropertiesError.Encoder.EncodeFields(value.Value, writer);
+                    global::Dropbox.Api.Files.LookUpPropertiesError.Encoder.EncodeFields(value.Value, writer);
                 }
             }
 
@@ -236,7 +236,7 @@ protected override void SetField(PropertiesError value, string fieldName, enc.IJ
                     switch (fieldName)
                     {
                         case "properties_error":
-                            value.Value = Dropbox.Api.Files.LookUpPropertiesError.Decoder.Decode(reader);
+                            value.Value = global::Dropbox.Api.Files.LookUpPropertiesError.Decoder.Decode(reader);
                             break;
                         default:
                             reader.Skip();
@@ -299,7 +299,7 @@ private class PathEncoder : enc.StructEncoder<Path>
                 /// <param name="writer">The writer.</param>
                 public override void EncodeFields(Path value, enc.IJsonWriter writer)
                 {
-                    Dropbox.Api.Files.LookupError.Encoder.EncodeFields(value.Value, writer);
+                    global::Dropbox.Api.Files.LookupError.Encoder.EncodeFields(value.Value, writer);
                 }
             }
 
@@ -332,7 +332,7 @@ protected override void SetField(Path value, string fieldName, enc.IJsonReader r
                     switch (fieldName)
                     {
                         case "path":
-                            value.Value = Dropbox.Api.Files.LookupError.Decoder.Decode(reader);
+                            value.Value = global::Dropbox.Api.Files.LookupError.Decoder.Decode(reader);
                             break;
                         default:
                             reader.Skip();

Dropbox.Api/Generated/Files/CommitInfo.cs

@@ -63,7 +63,7 @@ public CommitInfo(string path,
 
             if (mode == null)
             {
-                mode = Dropbox.Api.Files.WriteMode.Add.Instance;
+                mode = global::Dropbox.Api.Files.WriteMode.Add.Instance;
             }
             this.Path = path;
             this.Mode = mode;
@@ -80,7 +80,7 @@ public CommitInfo(string path,
         [sys.ComponentModel.EditorBrowsable(sys.ComponentModel.EditorBrowsableState.Never)]
         public CommitInfo()
         {
-            this.Mode = Dropbox.Api.Files.WriteMode.Add.Instance;
+            this.Mode = global::Dropbox.Api.Files.WriteMode.Add.Instance;
             this.Autorename = false;
             this.Mute = false;
         }
@@ -132,7 +132,7 @@ private class CommitInfoEncoder : enc.StructEncoder<CommitInfo>
             public override void EncodeFields(CommitInfo value, enc.IJsonWriter writer)
             {
                 WriteProperty("path", value.Path, writer, enc.StringEncoder.Instance);
-                WriteProperty("mode", value.Mode, writer, Dropbox.Api.Files.WriteMode.Encoder);
+                WriteProperty("mode", value.Mode, writer, global::Dropbox.Api.Files.WriteMode.Encoder);
                 WriteProperty("autorename", value.Autorename, writer, enc.BooleanEncoder.Instance);
                 if (value.ClientModified != null)
                 {
@@ -175,7 +175,7 @@ protected override void SetField(CommitInfo value, string fieldName, enc.IJsonRe
                         value.Path = enc.StringDecoder.Instance.Decode(reader);
                         break;
                     case "mode":
-                        value.Mode = Dropbox.Api.Files.WriteMode.Decoder.Decode(reader);
+                        value.Mode = global::Dropbox.Api.Files.WriteMode.Decoder.Decode(reader);
                         break;
                     case "autorename":
                         value.Autorename = enc.BooleanDecoder.Instance.Decode(reader);

Dropbox.Api/Generated/Files/CommitInfoWithProperties.cs

@@ -13,7 +13,7 @@ namespace Dropbox.Api.Files
     /// <summary>
     /// <para>The commit info with properties object</para>
     /// </summary>
-    /// <seealso cref="Dropbox.Api.Files.CommitInfo" />
+    /// <seealso cref="Global::Dropbox.Api.Files.CommitInfo" />
     public class CommitInfoWithProperties : CommitInfo
     {
         #pragma warning disable 108
@@ -52,7 +52,7 @@ public CommitInfoWithProperties(string path,
                                         bool autorename = false,
                                         sys.DateTime? clientModified = null,
                                         bool mute = false,
-                                        col.IEnumerable<Dropbox.Api.Properties.PropertyGroup> propertyGroups = null)
+                                        col.IEnumerable<global::Dropbox.Api.Properties.PropertyGroup> propertyGroups = null)
             : base(path, mode, autorename, clientModified, mute)
         {
             var propertyGroupsList = enc.Util.ToList(propertyGroups);
@@ -74,7 +74,7 @@ public CommitInfoWithProperties()
         /// <summary>
         /// <para>List of custom properties to add to file.</para>
         /// </summary>
-        public col.IList<Dropbox.Api.Properties.PropertyGroup> PropertyGroups { get; protected set; }
+        public col.IList<global::Dropbox.Api.Properties.PropertyGroup> PropertyGroups { get; protected set; }
 
         #region Encoder class
 
@@ -91,7 +91,7 @@ private class CommitInfoWithPropertiesEncoder : enc.StructEncoder<CommitInfoWith
             public override void EncodeFields(CommitInfoWithProperties value, enc.IJsonWriter writer)
             {
                 WriteProperty("path", value.Path, writer, enc.StringEncoder.Instance);
-                WriteProperty("mode", value.Mode, writer, Dropbox.Api.Files.WriteMode.Encoder);
+                WriteProperty("mode", value.Mode, writer, global::Dropbox.Api.Files.WriteMode.Encoder);
                 WriteProperty("autorename", value.Autorename, writer, enc.BooleanEncoder.Instance);
                 if (value.ClientModified != null)
                 {
@@ -100,7 +100,7 @@ public override void EncodeFields(CommitInfoWithProperties value, enc.IJsonWrite
                 WriteProperty("mute", value.Mute, writer, enc.BooleanEncoder.Instance);
                 if (value.PropertyGroups.Count > 0)
                 {
-                    WriteListProperty("property_groups", value.PropertyGroups, writer, Dropbox.Api.Properties.PropertyGroup.Encoder);
+                    WriteListProperty("property_groups", value.PropertyGroups, writer, global::Dropbox.Api.Properties.PropertyGroup.Encoder);
                 }
             }
         }
@@ -139,7 +139,7 @@ protected override void SetField(CommitInfoWithProperties value, string fieldNam
                         value.Path = enc.StringDecoder.Instance.Decode(reader);
                         break;
                     case "mode":
-                        value.Mode = Dropbox.Api.Files.WriteMode.Decoder.Decode(reader);
+                        value.Mode = global::Dropbox.Api.Files.WriteMode.Decoder.Decode(reader);
                         break;
                     case "autorename":
                         value.Autorename = enc.BooleanDecoder.Instance.Decode(reader);
@@ -151,7 +151,7 @@ protected override void SetField(CommitInfoWithProperties value, string fieldNam
                         value.Mute = enc.BooleanDecoder.Instance.Decode(reader);
                         break;
                     case "property_groups":
-                        value.PropertyGroups = ReadList<Dropbox.Api.Properties.PropertyGroup>(reader, Dropbox.Api.Properties.PropertyGroup.Decoder);
+                        value.PropertyGroups = ReadList<global::Dropbox.Api.Properties.PropertyGroup>(reader, global::Dropbox.Api.Properties.PropertyGroup.Decoder);
                         break;
                     default:
                         reader.Skip();