Cleaned up the http client code in user manager

Author: hiranya911

FirebaseAdmin/FirebaseAdmin/Auth/FirebaseUserManager.cs

@@ -38,24 +38,23 @@ internal class FirebaseUserManager : IDisposable
 
         internal FirebaseUserManager(FirebaseUserManagerArgs args)
         {
+            if (string.IsNullOrEmpty(args.ProjectId))
+            {
+                throw new ArgumentException(
+                    "Must initialize FirebaseApp with a project ID to manage users.");
+            }
+
             this.httpClient = args.ClientFactory.CreateAuthorizedHttpClient(args.Credential);
             this.baseUrl = string.Format(IdTooklitUrl, args.ProjectId);
         }
 
         public static FirebaseUserManager Create(FirebaseApp app)
         {
-            var projectId = app.GetProjectId();
-            if (string.IsNullOrEmpty(projectId))
-            {
-                throw new ArgumentException(
-                    "Must initialize FirebaseApp with a project ID to manage users.");
-            }
-
             var args = new FirebaseUserManagerArgs
             {
                 ClientFactory = new HttpClientFactory(),
                 Credential = app.Options.Credential,
-                ProjectId = projectId,
+                ProjectId = app.GetProjectId(),
             };
 
             return new FirebaseUserManager(args);
@@ -89,6 +88,11 @@ private async Task<TResult> PostAndDeserializeAsync<TResult>(
             string path, object body, CancellationToken cancellationToken)
         {
             var json = await this.PostAsync(path, body, cancellationToken).ConfigureAwait(false);
+            return this.SafeDeserialize<TResult>(json);
+        }
+
+        private TResult SafeDeserialize<TResult>(string json)
+        {
             try
             {
                 return NewtonsoftJsonSerializer.Instance.Deserialize<TResult>(json);
@@ -101,34 +105,38 @@ private async Task<TResult> PostAndDeserializeAsync<TResult>(
 
         private async Task<string> PostAsync(
             string path, object body, CancellationToken cancellationToken)
+        {
+            var request = new HttpRequestMessage()
+            {
+                Method = HttpMethod.Post,
+                RequestUri = new Uri($"{this.baseUrl}/{path}"),
+                Content = NewtonsoftJsonSerializer.Instance.CreateJsonHttpContent(body),
+            };
+            return await this.SendAsync(request, cancellationToken).ConfigureAwait(false);
+        }
+
+        private async Task<string> SendAsync(
+            HttpRequestMessage request, CancellationToken cancellationToken)
         {
             try
             {
-                var url = $"{this.baseUrl}/{path}";
-                return await this.SendRequestAsync(url, body, cancellationToken)
+                var response = await this.httpClient.SendAsync(request, cancellationToken)
                     .ConfigureAwait(false);
+                var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                if (!response.IsSuccessStatusCode)
+                {
+                    var error = "Response status code does not indicate success: "
+                            + $"{(int)response.StatusCode} ({response.StatusCode})"
+                            + $"{Environment.NewLine}{json}";
+                    throw new FirebaseException(error);
+                }
+
+                return json;
             }
             catch (HttpRequestException e)
             {
                 throw new FirebaseException("Error while calling Firebase Auth service", e);
             }
         }
-
-        private async Task<string> SendRequestAsync(
-            string url, object body, CancellationToken cancellationToken)
-        {
-            var response = await this.httpClient.PostJsonAsync(url, body, cancellationToken)
-                .ConfigureAwait(false);
-            var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-            if (!response.IsSuccessStatusCode)
-            {
-                var error = "Response status code does not indicate success: "
-                        + $"{(int)response.StatusCode} ({response.StatusCode})"
-                        + $"{Environment.NewLine}{json}";
-                throw new FirebaseException(error);
-            }
-
-            return json;
-        }
     }
 }

FirebaseAdmin/FirebaseAdmin/Extensions.cs

@@ -93,12 +93,26 @@ public static ConfigurableHttpClient CreateAuthorizedHttpClient(
         public static async Task<HttpResponseMessage> PostJsonAsync<T>(
             this HttpClient client, string requestUri, T body, CancellationToken cancellationToken)
         {
-            var payload = NewtonsoftJsonSerializer.Instance.Serialize(body);
-            var content = new StringContent(payload, Encoding.UTF8, "application/json");
+            var content = NewtonsoftJsonSerializer.Instance.CreateJsonHttpContent(body);
             return await client.PostAsync(requestUri, content, cancellationToken)
                 .ConfigureAwait(false);
         }
 
+        /// <summary>
+        /// Serializes the <paramref name="body"/> into JSON, and wraps the result in an instance
+        /// of <see cref="HttpContent"/>, which can be included in an outgoing HTTP request.
+        /// </summary>
+        /// <returns>An instance of <see cref="HttpContent"/> containing the JSON representation
+        /// of <paramref name="body"/>.</returns>
+        /// <param name="serializer">The JSON serializer to serialize the given object.</param>
+        /// <param name="body">The object that will be serialized into JSON.</param>
+        public static HttpContent CreateJsonHttpContent(
+            this NewtonsoftJsonSerializer serializer, object body)
+        {
+            var payload = serializer.Serialize(body);
+            return new StringContent(payload, Encoding.UTF8, "application/json");
+        }
+
         /// <summary>
         /// Returns a Unix-styled timestamp (seconds from epoch) from the <see cref="IClock"/>.
         /// </summary>