Cleaning up the code

Author: hiranya911

FirebaseAdmin/FirebaseAdmin/Auth/FirebaseAuth.cs

@@ -321,15 +321,8 @@ void IFirebaseService.Delete()
             lock (this.authLock)
             {
                 this.deleted = true;
-                if (this.tokenFactory.IsValueCreated)
-                {
-                    this.tokenFactory.Value.Dispose();
-                }
-
-                if (this.userManager.IsValueCreated)
-                {
-                    this.userManager.Value.Dispose();
-                }
+                this.tokenFactory.DisposeIfCreated();
+                this.userManager.DisposeIfCreated();
             }
         }
 

FirebaseAdmin/FirebaseAdmin/Auth/FirebaseUserManager.cs

@@ -88,28 +88,36 @@ public void Dispose()
         private async Task<TResult> PostAndDeserializeAsync<TResult>(
             string path, object body, CancellationToken cancellationToken)
         {
+            var json = await this.PostAsync(path, body, cancellationToken).ConfigureAwait(false);
             try
             {
-                var json = await this.PostAsync(path, body, cancellationToken)
-                    .ConfigureAwait(false);
                 return NewtonsoftJsonSerializer.Instance.Deserialize<TResult>(json);
             }
-            catch (FirebaseException)
-            {
-                throw;
-            }
             catch (Exception e)
             {
-                throw new FirebaseException("Error while calling Firebase Auth service", e);
+                throw new FirebaseException("Error while parsing Auth service response", e);
             }
         }
 
         private async Task<string> PostAsync(
             string path, object body, CancellationToken cancellationToken)
         {
-            var requestUri = $"{this.baseUrl}/{path}";
-            var response = await this.httpClient
-                .PostJsonAsync(requestUri, body, cancellationToken)
+            try
+            {
+                var url = $"{this.baseUrl}/{path}";
+                return await this.SendRequestAsync(url, body, cancellationToken)
+                    .ConfigureAwait(false);
+            }
+            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)

FirebaseAdmin/FirebaseAdmin/Extensions.cs

@@ -14,6 +14,7 @@
 
 using System;
 using System.Net.Http;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Google.Apis.Auth.OAuth2;
@@ -93,7 +94,7 @@ 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, System.Text.Encoding.UTF8, "application/json");
+            var content = new StringContent(payload, Encoding.UTF8, "application/json");
             return await client.PostAsync(requestUri, content, cancellationToken)
                 .ConfigureAwait(false);
         }
@@ -108,5 +109,19 @@ public static long UnixTimestamp(this IClock clock)
             var timeSinceEpoch = clock.UtcNow.Subtract(new DateTime(1970, 1, 1));
             return (long)timeSinceEpoch.TotalSeconds;
         }
+
+        /// <summary>
+        /// Disposes a lazy-initialized object if the object has already been created.
+        /// </summary>
+        /// <param name="lazy">The lazy initializer containing a disposable object.</param>
+        /// <typeparam name="T">Type of the object that needs to be disposed.</typeparam>
+        public static void DisposeIfCreated<T>(this Lazy<T> lazy)
+        where T : IDisposable
+        {
+            if (lazy.IsValueCreated)
+            {
+                lazy.Value.Dispose();
+            }
+        }
     }
 }