Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
6 changes: 3 additions & 3 deletions FirebaseAdmin/FirebaseAdmin.Snippets/FirebaseAppSnippets.cs
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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]
}
Expand Down Expand Up @@ -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]
}
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions FirebaseAdmin/FirebaseAdmin.Tests/Auth/Jwt/JwtTestUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAppTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions FirebaseAdmin/FirebaseAdmin/FirebaseAdmin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading