Update user agent. Support optional redirect url for oauth2 code flow. Also include minor style changes.

Author: qimingyuan

Dropbox.Api/Dropbox.Api.nuspec

@@ -2,8 +2,8 @@
 <package >
   <metadata>
     <id>$id$</id>
-    <version>1.1.2-beta</version>
-    <title>Dropbox v2 API</title>
+    <version>1.1.3</version>
+    <title>Dropbox v2 API Beta</title>
     <authors>Dropbox Inc</authors>
     <owners>Dropbox Inc</owners>
     <licenseUrl>https://github.com/dropbox/dropbox-sdk-dotnet/blob/master/LICENSE</licenseUrl>

Dropbox.Api/DropboxClient.common.cs

@@ -84,7 +84,7 @@ public sealed partial class DropboxClient : ITransport, IDisposable
         /// <summary>
         /// The base user agent, used to construct all user agent strings.
         /// </summary>
-        private const string BaseUserAgent = "OfficialDropboxDotNetV2SDK";
+        private const string BaseUserAgent = "OfficialDropboxDotNetSDKv2";
 
         /// <summary>
         /// The maximum retries on a 5xx error.

Dropbox.Api/DropboxOauth2Helper.cs

@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // <copyright file="DropboxOAuth2Helper.cs" company="Dropbox Inc">
 //  Copyright (c) Dropbox Inc. All rights reserved.
 // </copyright>
@@ -7,9 +7,9 @@
 namespace Dropbox.Api
 {
     using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Text;
+    using System.Collections.Generic;
+    using System.Net.Http;
+    using System.Text;
     using System.Threading.Tasks;
 
     /// <summary>
@@ -210,8 +210,6 @@ public static Uri GetAuthorizeUri(OAuthResponseType oauthResponseType, string cl
                 throw new ArgumentNullException("redirectUri");
             }
 
-            var dict = new Dictionary<string, string>();
-
             var queryBuilder = new StringBuilder();
 
             queryBuilder.Append("response_type=");
@@ -249,8 +247,10 @@ public static Uri GetAuthorizeUri(OAuthResponseType oauthResponseType, string cl
                 queryBuilder.Append("&disable_signup=true");
             }
 
-            var uriBuilder = new UriBuilder("https://www.dropbox.com/1/oauth2/authorize");
-            uriBuilder.Query = queryBuilder.ToString();
+            var uriBuilder = new UriBuilder("https://www.dropbox.com/1/oauth2/authorize")
+            {
+                Query = queryBuilder.ToString()
+            };
 
             return uriBuilder.Uri;
         }
@@ -271,15 +271,15 @@ public static OAuth2Response ParseTokenFragment(Uri redirectedUri)
             var fragment = redirectedUri.Fragment;
             if (string.IsNullOrWhiteSpace(fragment))
             {
-                throw new ArgumentException("redirectedUri", "The supplied uri doesn't contain a fragment");
+                throw new ArgumentException("The supplied uri doesn't contain a fragment", "redirectedUri");
             }
 
             fragment = fragment.TrimStart('#');
 
-            string access_token = null;
+            string accessToken = null;
             string uid = null;
             string state = null;
-            string token_type = null;
+            string tokenType = null;
 
             foreach (var pair in fragment.Split('&'))
             {
@@ -289,11 +289,10 @@ public static OAuth2Response ParseTokenFragment(Uri redirectedUri)
                     continue;
                 }
 
-
                 switch (elements[0])
                 {
                     case "access_token":
-                        access_token = Uri.UnescapeDataString(elements[1]);
+                        accessToken = Uri.UnescapeDataString(elements[1]);
                         break;
                     case "uid":
                         uid = Uri.UnescapeDataString(elements[1]);
@@ -302,14 +301,14 @@ public static OAuth2Response ParseTokenFragment(Uri redirectedUri)
                         state = Uri.UnescapeDataString(elements[1]);
                         break;
                     case "token_type":
-                        token_type = Uri.UnescapeDataString(elements[1]);
+                        tokenType = Uri.UnescapeDataString(elements[1]);
                         break;
                     default:
-                        throw new ArgumentException("redirectedUri", "Unexpected values in fragment");
+                        throw new ArgumentException("Unexpected values in fragment", "redirectedUri");
                 }
             }
 
-            return new OAuth2Response(access_token, uid, state, token_type);
+            return new OAuth2Response(accessToken, uid, state, tokenType);
         }
 
         /// <summary>
@@ -325,7 +324,7 @@ public static OAuth2Response ParseTokenFragment(Uri redirectedUri)
         /// again.</param>
         /// <param name="client">An optional http client instance used to make requests.</param>
         /// <returns>The authorization response, containing the access token and uid of the authorized user</returns>
-        public async static Task<OAuth2Response> ProcessCodeFlowAsync(string code, string appKey, string appSecret, string redirectUri, HttpClient client = null)
+        public async static Task<OAuth2Response> ProcessCodeFlowAsync(string code, string appKey, string appSecret, string redirectUri = null, HttpClient client = null)
         {
             if (string.IsNullOrEmpty(code))
             {
@@ -343,15 +342,20 @@ public async static Task<OAuth2Response> ProcessCodeFlowAsync(string code, strin
             var httpClient = client ?? new HttpClient();
             try
             {
-                var content = new FormUrlEncodedContent(
-                    new Dictionary<string, string>
-                    {
-                        {"code", code},
-                        {"grant_type", "authorization_code"},
-                        {"client_id", appKey},
-                        {"client_secret", appSecret},
-                        {"redirect_uri", redirectUri}
-                    });
+                var parameters = new Dictionary<string, string>
+                {
+                    {"code", code},
+                    {"grant_type", "authorization_code"},
+                    {"client_id", appKey},
+                    {"client_secret", appSecret}
+                };
+
+                if (!string.IsNullOrEmpty(redirectUri))
+                {
+                    parameters["redirect_uri"] = redirectUri;
+                }
+
+                var content = new FormUrlEncodedContent(parameters);
                 var response = await httpClient.PostAsync("https://api.dropbox.com/1/oauth2/token", content);
 
                 var raw = await response.Content.ReadAsStringAsync();
@@ -386,7 +390,7 @@ public async static Task<OAuth2Response> ProcessCodeFlowAsync(string code, strin
         /// <param name="state">The state parameter (if any) that matches that used in the initial authorize URI.</param>
         /// <param name="client">An optional http client instance used to make requests.</param>
         /// <returns>The authorization response, containing the access token and uid of the authorized user</returns>
-        public static Task<OAuth2Response> ProcessCodeFlowAsync(Uri responseUri, string appKey, string appSecret, string redirectUri, string state = null, HttpClient client = null)
+        public static Task<OAuth2Response> ProcessCodeFlowAsync(Uri responseUri, string appKey, string appSecret, string redirectUri = null, string state = null, HttpClient client = null)
         {
             if (responseUri == null)
             {
@@ -404,7 +408,7 @@ public static Task<OAuth2Response> ProcessCodeFlowAsync(Uri responseUri, string
             var query = responseUri.Query;
             if (string.IsNullOrEmpty(query))
             {
-                throw new ArgumentException("responseUri", "The redirect uri is missing expected query arguments.");
+                throw new ArgumentException("The redirect uri is missing expected query arguments.", "responseUri");
             }
 
             query = query.TrimStart('?');
@@ -429,23 +433,17 @@ public static Task<OAuth2Response> ProcessCodeFlowAsync(Uri responseUri, string
                         }
                         else if(state != Uri.UnescapeDataString(elements[1]))
                         {
-                            throw new ArgumentException(
-                                "responseUri",
-                                "The state in the responseUri does not match the provided value.");
+                            throw new ArgumentException("The state in the responseUri does not match the provided value.", "responseUri");
                         }
                         break;
                     default:
-                        throw new ArgumentException(
-                            "responseUri",
-                            "The responseUri contains unexpected values in the query component.");
+                        throw new ArgumentException("The responseUri contains unexpected values in the query component.", "responseUri");
                 }
             }
 
             if (string.IsNullOrEmpty(code))
             {
-                throw new ArgumentException(
-                    "responseUri",
-                    "The responseUri is missing a code value in the query component.");
+                throw new ArgumentException("The responseUri is missing a code value in the query component.", "responseUri");
             }
 
             return ProcessCodeFlowAsync(code, appKey, appSecret, redirectUri, client);
@@ -460,21 +458,21 @@ public sealed class OAuth2Response
         /// <summary>
         /// Initializes a new instance of the <see cref="OAuth2Response"/> class.
         /// </summary>
-        /// <param name="access_token">The access_token.</param>
+        /// <param name="accessToken">The access_token.</param>
         /// <param name="uid">The uid.</param>
         /// <param name="state">The state.</param>
-        /// <param name="token_type">The token_type.</param>
-        internal OAuth2Response(string access_token, string uid, string state, string token_type)
+        /// <param name="tokenType">The token_type.</param>
+        internal OAuth2Response(string accessToken, string uid, string state, string tokenType)
         {
-            if (string.IsNullOrEmpty(access_token) || string.IsNullOrEmpty(uid))
+            if (string.IsNullOrEmpty(accessToken) || string.IsNullOrEmpty(uid))
             {
                 throw new ArgumentException("Invalid OAuth 2.0 response, missing access_token and/or uid.");
             }
 
-            this.AccessToken = access_token;
+            this.AccessToken = accessToken;
             this.Uid = uid;
             this.State = state;
-            this.TokenType = token_type;
+            this.TokenType = tokenType;
         }
 
         /// <summary>

Examples/SimpleTest/LoginForm.xaml.cs

@@ -1,4 +1,4 @@
-using Dropbox.Api;
+using Dropbox.Api;
 using System;
 using System.Collections.Generic;
 using System.Globalization;

Examples/SimpleTest/Program.cs

@@ -1,4 +1,4 @@
-namespace SimpleTest
+namespace SimpleTest
 {
     using System;
     using System.Linq;
@@ -34,8 +34,8 @@ private async Task<int> Run()
         {
             InitializeCertPinning();
 
-            var access_token = await this.GetAccessToken();
-            if (string.IsNullOrEmpty(access_token))
+            var accessToken = await this.GetAccessToken();
+            if (string.IsNullOrEmpty(accessToken))
             {
                 return 1;
             }
@@ -49,7 +49,7 @@ private async Task<int> Run()
                 Timeout = TimeSpan.FromMinutes(20)
             };
 
-            this.client = new DropboxClient(access_token, userAgent: "SimpleTestApp", httpClient: httpClient);
+            this.client = new DropboxClient(accessToken, userAgent: "SimpleTestApp", httpClient: httpClient);
 
             try
             {
@@ -110,9 +110,9 @@ private async Task<string> GetAccessToken()
             }
             Console.WriteLine();
 
-            var access_token = Settings.Default.AccessToken;
+            var accessToken = Settings.Default.AccessToken;
 
-            if (string.IsNullOrEmpty(access_token))
+            if (string.IsNullOrEmpty(accessToken))
             {
                 Console.WriteLine("Waiting for credentials.");
                 var completion = new TaskCompletionSource<Tuple<string, string>>();
@@ -146,11 +146,11 @@ private async Task<string> GetAccessToken()
                     var result = await completion.Task;
                     Console.WriteLine("and back...");
 
-                    access_token = result.Item1;
+                    accessToken = result.Item1;
                     var uid = result.Item2;
                     Console.WriteLine("Uid: {0}", uid);
 
-                    Settings.Default.AccessToken = access_token;
+                    Settings.Default.AccessToken = accessToken;
                     Settings.Default.Uid = uid;
 
                     Settings.Default.Save();
@@ -163,7 +163,7 @@ private async Task<string> GetAccessToken()
                 }
             }
 
-            return access_token;
+            return accessToken;
         }
 
         /// <summary>