Additional FirebaseApp Tests (#2)

* Starter code for the .NET SDK

* Added documentation

* Added newlines at eof

* Responding to code review comments

* Added logging; More documentation and cleanup

* Removed AppOptionsInternal

* Updated unit test

* Reading project ID from service account

* Adding newline at eof

* Upgraded to latest Google API client; Re-enabled service accountt test

* newline at eof

* Fixes based on code review comments

Author: hiranya911

FirebaseAdmin/FirebaseAdmin.IntegrationTests/FirebaseAdmin.IntegrationTests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Apis.Auth" Version="1.34.0" />
+    <PackageReference Include="Google.Apis.Auth" Version="1.35.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Apis.Auth" Version="1.34.0" />
+    <PackageReference Include="Google.Apis.Auth" Version="1.35.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAppTest.cs

@@ -22,6 +22,11 @@ namespace FirebaseAdmin.Tests
 {
     public class FirebaseAppTest: IDisposable
     {
+        private static readonly AppOptions TestOptions = new AppOptions()
+        {
+            Credential = GoogleCredential.FromAccessToken("token"),
+        };
+
         [Fact]
         public void GetNonExistingDefaultInstance()
         {
@@ -37,11 +42,11 @@ public void GetNonExistingInstance()
         [Fact]
         public void DefaultInstance()
         {
-            var app = FirebaseApp.Create();
+            var app = FirebaseApp.Create(TestOptions);
             Assert.Equal("[DEFAULT]", app.Name);
             Assert.NotNull(app.Options);
             Assert.Same(app, FirebaseApp.DefaultInstance);
-            Assert.Throws<ArgumentException>(() => FirebaseApp.Create());
+            Assert.Throws<ArgumentException>(() => FirebaseApp.Create(TestOptions));
             app.Delete();
             Assert.Null(FirebaseApp.DefaultInstance);
         }
@@ -50,19 +55,19 @@ public void DefaultInstance()
         public void CreateNamedInstance()
         {
             const string name = "MyApp";
-            var app = FirebaseApp.Create(name);
+            var app = FirebaseApp.Create(TestOptions, name);
             Assert.Equal(name, app.Name);
             Assert.NotNull(app.Options);
             Assert.Same(app, FirebaseApp.GetInstance(name));
-            Assert.Throws<ArgumentException>(() => FirebaseApp.Create(name: name));
+            Assert.Throws<ArgumentException>(() => FirebaseApp.Create(TestOptions, name));
             app.Delete();
-            Assert.Null(FirebaseApp.GetInstance(name: name));
+            Assert.Null(FirebaseApp.GetInstance(name));
         }
 
         [Fact]
         public void CreateWithInvalidName()
         {
-            Assert.Throws<ArgumentException>(() => FirebaseApp.Create((String) null));
+            Assert.Throws<ArgumentException>(() => FirebaseApp.Create(name: null));
             Assert.Throws<ArgumentException>(() => FirebaseApp.Create(name: string.Empty));
         }
 
@@ -114,32 +119,80 @@ public void ServiceAccountCredentialScoping()
             Assert.NotSame(options, copy);
             Assert.NotSame(credential, copy.Credential);
             Assert.IsType<ServiceAccountCredential>(copy.Credential.UnderlyingCredential);
-            var credentialScopes = (copy.Credential.UnderlyingCredential as ServiceAccountCredential).Scopes;
+            var credentialScopes = (copy.Credential.UnderlyingCredential
+                as ServiceAccountCredential).Scopes;
             foreach (var scope in FirebaseApp.DefaultScopes)
             {
                 Assert.Contains(scope, credentialScopes);
             }
         }
 
+        [Fact]
+        public void ApplicationDefaultCredentials()
+        {
+            Environment.SetEnvironmentVariable(
+                "GOOGLE_APPLICATION_CREDENTIALS", "./resources/service_account.json");
+            try
+            {
+                var app = FirebaseApp.Create();
+                Assert.NotNull(app.Options.Credential.ToServiceAccountCredential());
+            }
+            finally
+            {
+                Environment.SetEnvironmentVariable("GOOGLE_APPLICATION_CREDENTIALS", "");
+            }
+        }
+
         [Fact]
         public void GetProjectIdFromOptions()
         {
             var options = new AppOptions()
             {
                 Credential = GoogleCredential.FromAccessToken("token"),
-                ProjectId = "test-project",
+                ProjectId = "explicit-project",
+            };
+            var app = FirebaseApp.Create(options);
+            Assert.Equal("explicit-project", app.GetProjectId());
+        }
+
+        [Fact]
+        public void GetProjectIdFromServiceAccount()
+        {
+            var options = new AppOptions()
+            {
+                Credential = GoogleCredential.FromFile("./resources/service_account.json"),
             };
             var app = FirebaseApp.Create(options);
             Assert.Equal("test-project", app.GetProjectId());
         }
 
+        [Fact]
+        public void GetProjectIdFromEnvironment()
+        {
+            foreach (var name in new string[]{"GOOGLE_CLOUD_PROJECT", "GCLOUD_PROJECT"})
+            {
+                Environment.SetEnvironmentVariable(name, "env-project");
+                try
+                {
+                    var app = FirebaseApp.Create(TestOptions);
+                    Assert.Equal("env-project", app.GetProjectId());
+                    app.Delete();
+                }
+                finally
+                {
+                    Environment.SetEnvironmentVariable(name, "");    
+                }
+            }
+        }
+
         [Fact]
         public void GetOrInitService()
         {
-            ServiceFactory<MockService> factory = () => {
+            ServiceFactory<MockService> factory = () =>
+            {
                 return new MockService();
             };
-            var app = FirebaseApp.Create();
+            var app = FirebaseApp.Create(TestOptions);
             var service1 = app.GetOrInit("MockService", factory);
             var service2 = app.GetOrInit("MockService", factory);
             Assert.Same(service1, service2);

FirebaseAdmin/FirebaseAdmin/Extensions.cs

@@ -0,0 +1,33 @@
+// Copyright 2018, 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.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using Google.Apis.Auth.OAuth2;
+
+namespace FirebaseAdmin
+{
+    /// <summary>
+    /// A collection of extension methods for internal use.
+    /// </summary>
+    internal static class Extensions  
+    {
+        public static ServiceAccountCredential ToServiceAccountCredential(this GoogleCredential credential)
+        {
+            if (credential.UnderlyingCredential is GoogleCredential)
+            {
+                return ((GoogleCredential) credential.UnderlyingCredential).ToServiceAccountCredential();
+            }
+            return credential.UnderlyingCredential as ServiceAccountCredential;
+        }
+    }
+}

FirebaseAdmin/FirebaseAdmin/FirebaseAdmin.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Apis.Auth" Version="1.34.0" />
+    <PackageReference Include="Google.Apis.Auth" Version="1.35.1" />
     <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
   </ItemGroup>
 

FirebaseAdmin/FirebaseAdmin/FirebaseApp.cs

@@ -154,9 +154,14 @@ internal string GetProjectId()
             {
                 return Options.ProjectId;
             }
+            var projectId = Options.Credential.ToServiceAccountCredential()?.ProjectId;
+            if (!String.IsNullOrEmpty(projectId))
+            {
+                return projectId;
+            }
             foreach (var variableName in new [] {"GOOGLE_CLOUD_PROJECT", "GCLOUD_PROJECT"})
             {
-                string projectId = Environment.GetEnvironmentVariable(variableName);
+                projectId = Environment.GetEnvironmentVariable(variableName);
                 if (!String.IsNullOrEmpty(projectId))
                 {
                     return projectId;