chore: Upgrade Google.Apis.Auth and Google.Api.Gax.Rest (#509)

jonathanedey · web-flow · commit 443272080fcb · 2026-03-19T14:35:58.000-04:00
* fix: Upgrade Google.Apis.Auth from 1.68.0 to 1.73.0 and Google.Api.Gax.Rest from 4.8.0 to 4.13.1

* fix snippet

* Added gemini suggested changes
diff --git a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/IntegrationTestUtils.cs b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/IntegrationTestUtils.cs
@@ -27,7 +27,7 @@ internal static class IntegrationTestUtils
             {
                 var options = new AppOptions()
                 {
-                    Credential = GoogleCredential.FromFile(ServiceAccountFile),
+                    Credential = CredentialFactory.FromFile<ServiceAccountCredential>(ServiceAccountFile).ToGoogleCredential(),
                 };
                 return FirebaseApp.Create(options);
             },
diff --git a/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAdmin.Snippets.csproj b/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAdmin.Snippets.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Apis.Auth" Version="1.68.0" />
+    <PackageReference Include="Google.Apis.Auth" Version="1.73.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.9" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
diff --git a/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAppSnippets.cs b/FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAppSnippets.cs
@@ -1,4 +1,4 @@
-﻿// Copyright 2018, Google Inc. All rights reserved.
+// 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.
@@ -27,7 +27,7 @@ internal static void InitSdkWithServiceAccount()
             // [START initialize_sdk_with_service_account]
             FirebaseApp.Create(new AppOptions()
             {
-                Credential = GoogleCredential.FromFile("path/to/serviceAccountKey.json"),
+                Credential = CredentialFactory.FromFile<ServiceAccountCredential>("path/to/serviceAccountKey.json").ToGoogleCredential(),
             });
             // [END initialize_sdk_with_service_account]
         }
@@ -58,7 +58,7 @@ internal static void InitSdkWithRefreshToken()
             // [START initialize_sdk_with_refresh_token]
             FirebaseApp.Create(new AppOptions()
             {
-                Credential = GoogleCredential.FromFile("path/to/refreshToken.json"),
+                Credential = CredentialFactory.FromFile<UserCredential>("path/to/refreshToken.json").ToGoogleCredential(),
             });
             // [END initialize_sdk_with_refresh_token]
         }
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs
@@ -147,7 +147,7 @@ public void ServiceAccountCredential()
         {
             var options = new AppOptions
             {
-                Credential = GoogleCredential.FromFile("./resources/service_account.json"),
+                Credential = CredentialFactory.FromFile<ServiceAccountCredential>("./resources/service_account.json").ToGoogleCredential(),
             };
             var app = FirebaseApp.Create(options);
 
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Jwt/FirebaseTokenVerifierTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Jwt/FirebaseTokenVerifierTest.cs
@@ -61,7 +61,7 @@ public void ProjectIdFromServiceAccount()
         {
             var app = FirebaseApp.Create(new AppOptions()
             {
-                Credential = GoogleCredential.FromFile("./resources/service_account.json"),
+                Credential = CredentialFactory.FromFile<ServiceAccountCredential>("./resources/service_account.json").ToGoogleCredential(),
             });
             var verifier = FirebaseTokenVerifier.CreateIdTokenVerifier(app);
             Assert.Equal("test-project", verifier.ProjectId);
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Jwt/JwtTestUtils.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Jwt/JwtTestUtils.cs
@@ -107,8 +107,8 @@ internal static void AssertRequest(MockMessageHandler.IncomingRequest request)
 
         private static ISigner CreateTestSigner(string filePath)
         {
-            var credential = GoogleCredential.FromFile(filePath);
-            return new ServiceAccountSigner(credential.ToServiceAccountCredential());
+            var credential = CredentialFactory.FromFile<ServiceAccountCredential>(filePath);
+            return new ServiceAccountSigner(credential);
         }
 
         private sealed class ByteArrayPublicKeySource : IPublicKeySource
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Jwt/ServiceAccountSignerTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Jwt/ServiceAccountSignerTest.cs
@@ -28,8 +28,7 @@ public class ServiceAccountSignerTest
         [Fact]
         public async Task Signer()
         {
-            var credential = GoogleCredential.FromFile("./resources/service_account.json");
-            var serviceAccount = (ServiceAccountCredential)credential.UnderlyingCredential;
+            var serviceAccount = CredentialFactory.FromFile<ServiceAccountCredential>("./resources/service_account.json");
             var signer = new ServiceAccountSigner(serviceAccount);
             Assert.Equal(
                 "client@test-project.iam.gserviceaccount.com", await signer.GetKeyIdAsync());
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj b/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj
@@ -15,7 +15,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Google.Apis.Auth" Version="1.68.0" />
+    <PackageReference Include="Google.Apis.Auth" Version="1.73.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.3" />
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAppTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAppTest.cs
@@ -142,7 +142,7 @@ public void NoHttpClientFactory()
         [Fact]
         public void ServiceAccountCredentialScoping()
         {
-            var credential = GoogleCredential.FromFile("./resources/service_account.json");
+            var credential = CredentialFactory.FromFile<ServiceAccountCredential>("./resources/service_account.json").ToGoogleCredential();
             var options = new AppOptions()
             {
                 Credential = credential,
@@ -195,7 +195,7 @@ public void GetProjectIdFromServiceAccount()
         {
             var options = new AppOptions()
             {
-                Credential = GoogleCredential.FromFile("./resources/service_account.json"),
+                Credential = CredentialFactory.FromFile<ServiceAccountCredential>("./resources/service_account.json").ToGoogleCredential(),
             };
             var app = FirebaseApp.Create(options);
             Assert.Equal("test-project", app.GetProjectId());
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Messaging/FirebaseMessagingTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Messaging/FirebaseMessagingTest.cs
@@ -26,7 +26,7 @@ namespace FirebaseAdmin.Messaging.Tests
     public class FirebaseMessagingTest : IDisposable
     {
         private static readonly GoogleCredential MockCredential =
-            GoogleCredential.FromFile("./resources/service_account.json");
+            CredentialFactory.FromFile<ServiceAccountCredential>("./resources/service_account.json").ToGoogleCredential();
 
         [Fact]
         public void GetMessagingWithoutApp()
diff --git a/FirebaseAdmin/FirebaseAdmin/FirebaseAdmin.csproj b/FirebaseAdmin/FirebaseAdmin/FirebaseAdmin.csproj
@@ -30,8 +30,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
-    <PackageReference Include="Google.Api.Gax.Rest" Version="4.8.0" />
-    <PackageReference Include="Google.Apis.Auth" Version="1.68.0" />
+    <PackageReference Include="Google.Api.Gax.Rest" Version="4.13.1" />
+    <PackageReference Include="Google.Apis.Auth" Version="1.73.0" />
     <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ internal static class IntegrationTestUtils`
`27`	`27`	`{`
`28`	`28`	`var options = new AppOptions()`
`29`	`29`	`{`
`30`		`- Credential = GoogleCredential.FromFile(ServiceAccountFile),`
	`30`	`+ Credential = CredentialFactory.FromFile<ServiceAccountCredential>(ServiceAccountFile).ToGoogleCredential(),`
`31`	`31`	`};`
`32`	`32`	`return FirebaseApp.Create(options);`
`33`	`33`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2018, Google Inc. All rights reserved.`
	`1`	`+// Copyright 2018, Google Inc. All rights reserved.`
`2`	`2`	`//`
`3`	`3`	`// Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`// you may not use this file except in compliance with the License.`
`@@ -27,7 +27,7 @@ internal static void InitSdkWithServiceAccount()`
`27`	`27`	`// [START initialize_sdk_with_service_account]`
`28`	`28`	`FirebaseApp.Create(new AppOptions()`
`29`	`29`	`{`
`30`		`- Credential = GoogleCredential.FromFile("path/to/serviceAccountKey.json"),`
	`30`	`+ Credential = CredentialFactory.FromFile<ServiceAccountCredential>("path/to/serviceAccountKey.json").ToGoogleCredential(),`
`31`	`31`	`});`
`32`	`32`	`// [END initialize_sdk_with_service_account]`
`33`	`33`	`}`
`@@ -58,7 +58,7 @@ internal static void InitSdkWithRefreshToken()`
`58`	`58`	`// [START initialize_sdk_with_refresh_token]`
`59`	`59`	`FirebaseApp.Create(new AppOptions()`
`60`	`60`	`{`
`61`		`- Credential = GoogleCredential.FromFile("path/to/refreshToken.json"),`
	`61`	`+ Credential = CredentialFactory.FromFile<UserCredential>("path/to/refreshToken.json").ToGoogleCredential(),`
`62`	`62`	`});`
`63`	`63`	`// [END initialize_sdk_with_refresh_token]`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public void ServiceAccountCredential()`
`147`	`147`	`{`
`148`	`148`	`var options = new AppOptions`
`149`	`149`	`{`
`150`		`- Credential = GoogleCredential.FromFile("./resources/service_account.json"),`
	`150`	`+ Credential = CredentialFactory.FromFile<ServiceAccountCredential>("./resources/service_account.json").ToGoogleCredential(),`
`151`	`151`	`};`
`152`	`152`	`var app = FirebaseApp.Create(options);`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public void ProjectIdFromServiceAccount()`
`61`	`61`	`{`
`62`	`62`	`var app = FirebaseApp.Create(new AppOptions()`
`63`	`63`	`{`
`64`		`- Credential = GoogleCredential.FromFile("./resources/service_account.json"),`
	`64`	`+ Credential = CredentialFactory.FromFile<ServiceAccountCredential>("./resources/service_account.json").ToGoogleCredential(),`
`65`	`65`	`});`
`66`	`66`	`var verifier = FirebaseTokenVerifier.CreateIdTokenVerifier(app);`
`67`	`67`	`Assert.Equal("test-project", verifier.ProjectId);`
Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,8 @@ internal static void AssertRequest(MockMessageHandler.IncomingRequest request)`
`107`	`107`
`108`	`108`	`private static ISigner CreateTestSigner(string filePath)`
`109`	`109`	`{`
`110`		`- var credential = GoogleCredential.FromFile(filePath);`
`111`		`- return new ServiceAccountSigner(credential.ToServiceAccountCredential());`
	`110`	`+ var credential = CredentialFactory.FromFile<ServiceAccountCredential>(filePath);`
	`111`	`+ return new ServiceAccountSigner(credential);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`private sealed class ByteArrayPublicKeySource : IPublicKeySource`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public void NoHttpClientFactory()`
`142`	`142`	`[Fact]`
`143`	`143`	`public void ServiceAccountCredentialScoping()`
`144`	`144`	`{`
`145`		`- var credential = GoogleCredential.FromFile("./resources/service_account.json");`
	`145`	`+ var credential = CredentialFactory.FromFile<ServiceAccountCredential>("./resources/service_account.json").ToGoogleCredential();`
`146`	`146`	`var options = new AppOptions()`
`147`	`147`	`{`
`148`	`148`	`Credential = credential,`
`@@ -195,7 +195,7 @@ public void GetProjectIdFromServiceAccount()`
`195`	`195`	`{`
`196`	`196`	`var options = new AppOptions()`
`197`	`197`	`{`
`198`		`- Credential = GoogleCredential.FromFile("./resources/service_account.json"),`
	`198`	`+ Credential = CredentialFactory.FromFile<ServiceAccountCredential>("./resources/service_account.json").ToGoogleCredential(),`
`199`	`199`	`};`
`200`	`200`	`var app = FirebaseApp.Create(options);`
`201`	`201`	`Assert.Equal("test-project", app.GetProjectId());`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace FirebaseAdmin.Messaging.Tests`
`26`	`26`	`public class FirebaseMessagingTest : IDisposable`
`27`	`27`	`{`
`28`	`28`	`private static readonly GoogleCredential MockCredential =`
`29`		`- GoogleCredential.FromFile("./resources/service_account.json");`
	`29`	`+ CredentialFactory.FromFile<ServiceAccountCredential>("./resources/service_account.json").ToGoogleCredential();`
`30`	`30`
`31`	`31`	`[Fact]`
`32`	`32`	`public void GetMessagingWithoutApp()`