Compare commits
12 Commits
4cd89c6a83
...
developmen
| Author | SHA1 | Date | |
|---|---|---|---|
| 07cd891ade | |||
| 8cfbad61fb | |||
| 9b7e55c439 | |||
| 806b5242b0 | |||
|
|
24f5711e1c | ||
| e3d75fbfa8 | |||
| 9872c1b88b | |||
| fe4c0696e8 | |||
| 3b752f182f | |||
| 4a2ed52a2f | |||
| 5277896bdc | |||
| 9a02f0e4d6 |
@@ -5,9 +5,9 @@ using Microsoft.Extensions.Configuration;
|
||||
namespace Core.Thalos.BuildingBlocks
|
||||
{
|
||||
public class GoogleAuthorization(
|
||||
IGoogleAuthHelper googleHelper, IConfiguration config) : IGoogleAuthorization
|
||||
IGoogleAuthHelper googleHelper, IConfiguration config, GoogleAuthSettings googlesettings) : IGoogleAuthorization
|
||||
{
|
||||
private string RedirectUrl = config["Authentication:Google:RedirectUri"]!;
|
||||
private string RedirectUrl = googlesettings.RedirectUri ?? string.Empty;
|
||||
|
||||
public async Task<UserCredential> ExchangeCodeForToken(string code)
|
||||
{
|
||||
|
||||
@@ -58,5 +58,6 @@ namespace Core.Thalos.BuildingBlocks
|
||||
public const string GoogleClientId = "GoogleClientId";
|
||||
public const string GoogleClientSecret = "GoogleClientSecret";
|
||||
public const string GoogleRedirectUri = "GoogleRedirectUri";
|
||||
public const string GoogleLocalRedirectUri = "GoogleLocalRedirectUri";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
|
||||
<PackageReference Include="Core.Blueprint.KeyVault" Version="1.0.3" />
|
||||
<PackageReference Include="Core.Blueprint.KeyVault" Version="1.0.0" />
|
||||
<PackageReference Include="Core.Blueprint.Mongo" Version="1.0.0" />
|
||||
<PackageReference Include="Google.Apis.Auth" Version="1.70.0" />
|
||||
<PackageReference Include="Google.Apis.Oauth2.v2" Version="1.68.0.1869" />
|
||||
|
||||
@@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Microsoft.Identity.Web;
|
||||
using Microsoft.IdentityModel.Tokens;
|
||||
using System.Security.Cryptography;
|
||||
@@ -87,8 +86,6 @@ namespace Core.Thalos.BuildingBlocks.Configuration
|
||||
options.Audience = jwtIssuerOptions?.Audience;
|
||||
options.SigningCredentials = new SigningCredentials(rsaPrivateKey, SecurityAlgorithms.RsaSha256);
|
||||
});
|
||||
|
||||
services.AddSingleton<IOptions<JwtIssuerOptions>>(Microsoft.Extensions.Options.Options.Create(jwtIssuerOptions));
|
||||
}
|
||||
|
||||
public static void AddAzureAuthentication(AuthSettings authSettings, IConfiguration configuration, IServiceCollection services)
|
||||
@@ -116,6 +113,8 @@ namespace Core.Thalos.BuildingBlocks.Configuration
|
||||
|
||||
public static void AddGoogleAuthentication(IServiceCollection services, GoogleAuthSettings googleAuthSettings)
|
||||
{
|
||||
services.AddSingleton<GoogleAuthSettings>(googleAuthSettings);
|
||||
|
||||
services.AddAuthentication(options =>
|
||||
{
|
||||
options.DefaultAuthenticateScheme = Schemes.GoogleScheme;
|
||||
|
||||
@@ -10,6 +10,7 @@ using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Microsoft.OpenApi.Any;
|
||||
using Microsoft.OpenApi.Interfaces;
|
||||
using Microsoft.OpenApi.Models;
|
||||
using Swashbuckle.AspNetCore.SwaggerGen;
|
||||
using Swashbuckle.AspNetCore.SwaggerUI;
|
||||
@@ -114,6 +115,12 @@ namespace Core.Thalos.BuildingBlocks.Configuration
|
||||
c.AddSecurityDefinition(googleScheme, new OpenApiSecurityScheme
|
||||
{
|
||||
Type = SecuritySchemeType.OAuth2,
|
||||
|
||||
Extensions = new Dictionary<string, IOpenApiExtension>
|
||||
{
|
||||
["x-tokenName"] = new OpenApiString("id_token")
|
||||
},
|
||||
|
||||
Flows = new OpenApiOAuthFlows
|
||||
{
|
||||
AuthorizationCode = new OpenApiOAuthFlow
|
||||
|
||||
@@ -11,7 +11,10 @@ namespace Core.Thalos.BuildingBlocks
|
||||
public class GoogleAccessTokenAuthenticationHandler(IOptionsMonitor<AuthenticationSchemeOptions> options,
|
||||
ILoggerFactory logger,
|
||||
UrlEncoder encoder,
|
||||
IConfiguration config) : AuthenticationHandler<AuthenticationSchemeOptions>(options, logger, encoder)
|
||||
IConfiguration config,
|
||||
GoogleAuthSettings googleSettings
|
||||
) : AuthenticationHandler<AuthenticationSchemeOptions>(options, logger, encoder)
|
||||
|
||||
{
|
||||
protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
|
||||
{
|
||||
@@ -31,7 +34,7 @@ namespace Core.Thalos.BuildingBlocks
|
||||
idToken,
|
||||
new GoogleJsonWebSignature.ValidationSettings
|
||||
{
|
||||
Audience = new[] { config["Authentication:Google:ClientId"]! }
|
||||
Audience = new[] { googleSettings.ClientId! }
|
||||
});
|
||||
}
|
||||
catch (InvalidJwtException)
|
||||
|
||||
@@ -112,7 +112,7 @@ namespace Core.Thalos.BuildingBlocks
|
||||
{
|
||||
googleSettings.ClientId = (await keyVaultProvider.GetSecretAsync(Secrets.GoogleClientId, new CancellationToken { })).Secret.Value; ;
|
||||
googleSettings.ClientSecret = (await keyVaultProvider.GetSecretAsync(Secrets.GoogleClientSecret, new CancellationToken { })).Secret.Value;
|
||||
googleSettings.RedirectUri = (await keyVaultProvider.GetSecretAsync(Secrets.GoogleRedirectUri, new CancellationToken { })).Secret.Value;
|
||||
googleSettings.RedirectUri = builder.Configuration.GetSection(Secrets.GoogleLocalRedirectUri).Value;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -4,12 +4,12 @@ using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace Core.Thalos.BuildingBlocks
|
||||
{
|
||||
public class GoogleAuthHelper(IConfiguration config) : IGoogleAuthHelper
|
||||
public class GoogleAuthHelper(IConfiguration config, GoogleAuthSettings googleSettings) : IGoogleAuthHelper
|
||||
{
|
||||
public ClientSecrets GetClientSecrets()
|
||||
{
|
||||
string clientId = config["Authentication:Google:ClientId"]!;
|
||||
string clientSecret = config["Authentication:Google:ClientSecret"]!;
|
||||
string clientId = googleSettings.ClientId ?? string.Empty;
|
||||
string clientSecret = googleSettings.ClientSecret ?? string.Empty;
|
||||
|
||||
return new() { ClientId = clientId, ClientSecret = clientSecret };
|
||||
}
|
||||
|
||||
9
nuget.config
Normal file
9
nuget.config
Normal file
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<packageSources>
|
||||
<!-- Tu BaGet primero -->
|
||||
<add key="BaGet" value="https://nuget.dream-views.com/v3/index.json" protocolVersion="3" />
|
||||
<!-- NuGet oficial como fallback (si quieres) -->
|
||||
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
Reference in New Issue
Block a user