Merge pull request #34 from nixj14/master

Proxy Support

Author: hiranya911

FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAppTest.cs

@@ -16,6 +16,7 @@
 using System.Threading.Tasks;
 using FirebaseAdmin;
 using Google.Apis.Auth.OAuth2;
+using Google.Apis.Http;
 using Xunit;
 
 namespace FirebaseAdmin.Tests
@@ -93,6 +94,7 @@ public void CreateAppOptions()
                 Credential = credential,
                 ProjectId = "test-project",
                 ServiceAccountId = "[email protected]",
+                HttpClientFactory = new MockHttpClientFactory(new MockMessageHandler()),
             };
             var app = FirebaseApp.Create(options);
             Assert.Equal("[DEFAULT]", app.Name);
@@ -102,6 +104,42 @@ public void CreateAppOptions()
             Assert.Same(credential, copy.Credential);
             Assert.Equal("test-project", copy.ProjectId);
             Assert.Equal("[email protected]", copy.ServiceAccountId);
+            Assert.Same(typeof(MockHttpClientFactory), copy.HttpClientFactory.GetType());
+        }
+
+        [Fact]
+        public void CreateAppOptionsNoClientFactory()
+        {
+            var credential = GoogleCredential.FromAccessToken("token");
+            var options = new AppOptions()
+            {
+                Credential = credential,
+                ProjectId = "test-project",
+                ServiceAccountId = "[email protected]",
+            };
+            var app = FirebaseApp.Create(options);
+            Assert.Equal("[DEFAULT]", app.Name);
+
+            var copy = app.Options;
+            Assert.NotSame(options, copy);
+            Assert.Same(credential, copy.Credential);
+            Assert.Equal("test-project", copy.ProjectId);
+            Assert.Equal("[email protected]", copy.ServiceAccountId);
+            Assert.Same(typeof(HttpClientFactory), copy.HttpClientFactory.GetType());
+        }
+
+        [Fact]
+        public void NoHttpClientFactory()
+        {
+            var credential = GoogleCredential.FromAccessToken("token");
+            var options = new AppOptions()
+            {
+                Credential = credential,
+                ProjectId = "test-project",
+                ServiceAccountId = "[email protected]",
+                HttpClientFactory = null,
+            };
+            Assert.Throws<ArgumentNullException>(() => FirebaseApp.Create(options));
         }
 
         [Fact]

FirebaseAdmin/FirebaseAdmin.Tests/Messaging/FirebaseMessagingTest.cs

@@ -17,6 +17,7 @@
 using System.Threading.Tasks;
 using FirebaseAdmin.Tests;
 using Google.Apis.Auth.OAuth2;
+using Google.Apis.Http;
 using Xunit;
 
 namespace FirebaseAdmin.Messaging.Tests
@@ -54,6 +55,28 @@ public void GetMessaging()
             Assert.Throws<InvalidOperationException>(() => FirebaseMessaging.GetMessaging(app));
         }
 
+        [Fact]
+        public async Task GetMessagingWithClientFactory()
+        {
+            var handler = new MockMessageHandler()
+            {
+                Response = new FirebaseMessagingClient.SendResponse()
+                {
+                    Name = "test-response",
+                },
+            };
+            var factory = new MockHttpClientFactory(handler);
+
+            var app = FirebaseApp.Create(new AppOptions() { Credential = GoogleCredential.FromAccessToken("test-token"), HttpClientFactory = factory, ProjectId = "test-project" });
+            FirebaseMessaging messaging = FirebaseMessaging.GetMessaging(app);
+            Assert.NotNull(messaging);
+            Assert.Same(messaging, FirebaseMessaging.GetMessaging(app));
+
+            var response = await messaging.SendAsync(new Message() { Topic = "test-topic" });
+            Assert.Equal("test-response", response);
+            app.Delete();
+        }
+
         [Fact]
         public async Task UseAfterDelete()
         {
@@ -67,8 +90,18 @@ await Assert.ThrowsAsync<ObjectDisposedException>(
         [Fact]
         public async Task SendMessageCancel()
         {
-            var cred = GoogleCredential.FromFile("./resources/service_account.json");
-            FirebaseApp.Create(new AppOptions() { Credential = cred });
+            FirebaseApp.Create(new AppOptions() { Credential = MockCredential });
+            var canceller = new CancellationTokenSource();
+            canceller.Cancel();
+            await Assert.ThrowsAsync<OperationCanceledException>(
+                async () => await FirebaseMessaging.DefaultInstance.SendAsync(
+                    new Message() { Topic = "test-topic" }, canceller.Token));
+        }
+
+        [Fact]
+        public async Task SendMessageCancelWithClientFactory()
+        {
+            FirebaseApp.Create(new AppOptions() { Credential = MockCredential, HttpClientFactory = new HttpClientFactory() });
             var canceller = new CancellationTokenSource();
             canceller.Cancel();
             await Assert.ThrowsAsync<OperationCanceledException>(

FirebaseAdmin/FirebaseAdmin/AppOptions.cs

@@ -15,6 +15,7 @@
 using System;
 using System.Collections.Generic;
 using Google.Apis.Auth.OAuth2;
+using Google.Apis.Http;
 
 namespace FirebaseAdmin
 {
@@ -28,13 +29,17 @@ public sealed class AppOptions
         /// <summary>
         /// Initializes a new instance of the  <see cref="AppOptions"/> class.
         /// </summary>
-        public AppOptions() { }
+        public AppOptions()
+        {
+            this.HttpClientFactory = new HttpClientFactory();
+        }
 
         internal AppOptions(AppOptions options)
         {
             this.Credential = options.Credential;
             this.ProjectId = options.ProjectId;
             this.ServiceAccountId = options.ServiceAccountId;
+            this.HttpClientFactory = options.HttpClientFactory;
         }
 
         /// <summary>
@@ -58,5 +63,10 @@ internal AppOptions(AppOptions options)
         /// JSON.</para>
         /// </summary>
         public string ServiceAccountId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the HttpClientFactory to use when making Firebase requests.
+        /// </summary>
+        public HttpClientFactory HttpClientFactory { get; set; }
     }
 }

FirebaseAdmin/FirebaseAdmin/Auth/FirebaseTokenFactory.cs

@@ -85,13 +85,13 @@ public static FirebaseTokenFactory Create(FirebaseApp app)
             {
                 // If no service account ID is specified, attempt to discover one and invoke the
                 // IAM service with it.
-                signer = new IAMSigner(new HttpClientFactory(), app.Options.Credential);
+                signer = new IAMSigner(app.Options.HttpClientFactory, app.Options.Credential);
             }
             else
             {
                 // If a service account ID is specified, invoke the IAM service with it.
                 signer = new FixedAccountIAMSigner(
-                    new HttpClientFactory(), app.Options.Credential, app.Options.ServiceAccountId);
+                    app.Options.HttpClientFactory, app.Options.Credential, app.Options.ServiceAccountId);
             }
 
             return new FirebaseTokenFactory(signer, SystemClock.Default);

FirebaseAdmin/FirebaseAdmin/Auth/FirebaseTokenVerifier.cs

@@ -85,7 +85,7 @@ internal static FirebaseTokenVerifier CreateIDTokenVerifier(FirebaseApp app)
             }
 
             var keySource = new HttpPublicKeySource(
-                IdTokenCertUrl, SystemClock.Default, new HttpClientFactory());
+                IdTokenCertUrl, SystemClock.Default, app.Options.HttpClientFactory);
             var args = new FirebaseTokenVerifierArgs()
             {
                 ProjectId = projectId,

FirebaseAdmin/FirebaseAdmin/Auth/FirebaseUserManager.cs

@@ -1,4 +1,4 @@
-// Copyright 2019, Google Inc. All rights reserved.
+// Copyright 2019, Google Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@ public static FirebaseUserManager Create(FirebaseApp app)
         {
             var args = new FirebaseUserManagerArgs
             {
-                ClientFactory = new HttpClientFactory(),
+                ClientFactory = app.Options.HttpClientFactory,
                 Credential = app.Options.Credential,
                 ProjectId = app.GetProjectId(),
             };

FirebaseAdmin/FirebaseAdmin/FirebaseApp.cs

@@ -79,6 +79,11 @@ private FirebaseApp(AppOptions options, string name)
                 this.options.Credential = this.options.Credential.CreateScoped(DefaultScopes);
             }
 
+            if (this.options.HttpClientFactory == null)
+            {
+                throw new ArgumentNullException("HttpClientFactory must be set");
+            }
+
             this.Name = name;
         }
 

FirebaseAdmin/FirebaseAdmin/Messaging/FirebaseMessaging.cs

@@ -31,7 +31,7 @@ public sealed class FirebaseMessaging : IFirebaseService
         private FirebaseMessaging(FirebaseApp app)
         {
             this.messagingClient = new FirebaseMessagingClient(
-                new HttpClientFactory(), app.Options.Credential, app.GetProjectId());
+                    app.Options.HttpClientFactory, app.Options.Credential, app.GetProjectId());
         }
 
         /// <summary>