AgileWebs/Core.Thalos.BFF
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: AgileWebs:feature/configure-authentication
Branches Tags
AgileWebs:main AgileWebs:development AgileWebs:feature/add-tenantproperty-touser AgileWebs:feature/tenant-services AgileWebs:feature/configure-authentication AgileWebs:feature/google-auth AgileWebs:feature/adapt-endpoints AgileWebs:feature/improvements-removedependencies
...
compare: AgileWebs:6a055bc3db99f3415a3dc0e3a214196aabb70a8c
Branches Tags
AgileWebs:development AgileWebs:feature/add-tenantproperty-touser AgileWebs:feature/tenant-services AgileWebs:feature/configure-authentication AgileWebs:feature/google-auth AgileWebs:feature/adapt-endpoints AgileWebs:feature/improvements-removedependencies AgileWebs:main

2 Commits
feature/co ... 6a055bc3db

Author SHA1 Message Date
Sergio Matias
6a055bc3db Revise CBB and remove unnecessary code 2025-07-27 19:32:34 -06:00
Sergio Matías
4e620e92f6 Merge pull request 'Configura authentication and authorization' (#3) from feature/configure-authentication into development 
Reviewed-on: #3
Reviewed-by: efrain_marin <efrain.marin@agilewebs.com>
Reviewed-by: Sergio Matías <sergio.matias@agilewebs.com>
 2025-07-18 00:59:09 +00:00
24 changed files with 65 additions and 251 deletions
Expand all files Collapse all files

5
Core.Thalos.BFF.Api/Controllers/AuthenticationController.cs
View File

@@ -1,9 +1,6 @@
using Asp.Versioning;
using Core.Thalos.Adapters;
using Core.Thalos.Adapters.Common.Constants;
using Core.Thalos.Adapters.Contracts;
using Core.Thalos.Application.UseCases.Users.Input;
using Core.Thalos.BuildingBlocks.Authentication.Authorization.Google;
using Core.Thalos.BuildingBlocks;
using Core.Thalos.External.Clients.Thalos.Requests.Users;
using LSA.Dashboard.External.Clients.Dashboard;
using Microsoft.AspNetCore.Authorization;

4
Core.Thalos.BFF.Api/Controllers/ModuleController.cs
View File

@@ -1,7 +1,5 @@
using Asp.Versioning;
using Core.Thalos.Adapters;
using Core.Thalos.Adapters.Attributes;
using Core.Thalos.Adapters.Common.Constants;
using Core.Thalos.BuildingBlocks;
using Core.Thalos.External.Clients.Thalos.Requests.Permissions;
using Lib.Architecture.BuildingBlocks;
using LSA.Dashboard.External.Clients.Dashboard;

4
Core.Thalos.BFF.Api/Controllers/PermissionController.cs
View File

@@ -1,7 +1,5 @@
using Asp.Versioning;
using Core.Thalos.Adapters;
using Core.Thalos.Adapters.Attributes;
using Core.Thalos.Adapters.Common.Constants;
using Core.Thalos.BuildingBlocks;
using Core.Thalos.External.Clients.Thalos.Requests.Permissions;
using Lib.Architecture.BuildingBlocks;
using LSA.Dashboard.External.Clients.Dashboard;

3
Core.Thalos.BFF.Api/Controllers/RoleController.cs
View File

@@ -1,7 +1,6 @@
using Asp.Versioning;
using Core.Thalos.Adapters.Attributes;
using Core.Thalos.Adapters.Common.Constants;
using Core.Thalos.Application.UseCases.Roles.Input;
using Core.Thalos.BuildingBlocks;
using Lib.Architecture.BuildingBlocks;
using LSA.Dashboard.External.Clients.Dashboard;
using Microsoft.AspNetCore.Authorization;

134
Core.Thalos.BFF.Api/Controllers/UserController.cs
View File

@@ -1,7 +1,6 @@
using Asp.Versioning;
using Core.Thalos.Adapters.Attributes;
using Core.Thalos.Adapters.Common.Constants;
using Core.Thalos.Application.UseCases.Users.Input;
using Core.Thalos.BuildingBlocks;
using Core.Thalos.External.Clients.Thalos.Requests.Users;
using Lib.Architecture.BuildingBlocks;
using LSA.Dashboard.External.Clients.Dashboard;
@@ -76,8 +75,6 @@ namespace Core.Thalos.BFF.Api.Controllers
if (string.IsNullOrEmpty(newUser.RoleId)) return BadRequest("Invalid role id");
if (!newUser.Companies.Any()) return BadRequest("The user must contain at least one company");
return await Handle(() => thalosServiceClient.CreateUserService(newUser, cancellationToken)).ConfigureAwait(false);
}
catch (Exception ex)
@@ -271,135 +268,6 @@ namespace Core.Thalos.BFF.Api.Controllers
}
}
/// <summary>
/// Adds a company to the user's list of companies.
/// </summary>
[HttpPost]
[Route("AddCompany")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status204NoContent)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
[ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
[Permission("UserManagement.Write")]
public async Task<IActionResult> AddCompanyToUserService([FromBody] AddCompanyToUserRequest request, CancellationToken cancellationToken)
{
try
{
logger.LogInformation($"{nameof(AddCompanyToUserService)} - Request received - Payload: {JsonSerializer.Serialize(request)}");
if (string.IsNullOrEmpty(request.UserId)) { return BadRequest("Invalid user identifier"); }
if (string.IsNullOrEmpty(request.CompanyId)) { return BadRequest("Invalid company identifier"); }
return await Handle(() => thalosServiceClient.AddCompanyToUserService(request, cancellationToken)).ConfigureAwait(false);
}
catch (Exception ex)
{
logger.LogError($"{nameof(AddCompanyToUserService)} - An Error Occurred- {ex.Message} - {ex.InnerException} - {ex.StackTrace} - with payload {JsonSerializer.Serialize(request)}");
throw;
}
}
/// <summary>
/// Removes a company from the user's list of companies.
/// </summary>
[HttpDelete]
[Route("RemoveCompany")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status204NoContent)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
[ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
[Permission("UserManagement.Write")]
public async Task<IActionResult> RemoveCompanyFromUserService([FromBody] RemoveCompanyFromUserRequest request, CancellationToken cancellationToken)
{
try
{
logger.LogInformation($"{nameof(RemoveCompanyFromUserService)} - Request received - Payload: {JsonSerializer.Serialize(request)}");
if (string.IsNullOrEmpty(request.UserId)) { return BadRequest("Invalid user identifier"); }
if (string.IsNullOrEmpty(request.CompanyId)) { return BadRequest("Invalid company identifier"); }
return await Handle(() => thalosServiceClient.RemoveCompanyFromUserService(request, cancellationToken)).ConfigureAwait(false);
}
catch (Exception ex)
{
logger.LogError($"{nameof(RemoveCompanyFromUserService)} - An Error Occurred- {ex.Message} - {ex.InnerException} - {ex.StackTrace} - with payload {JsonSerializer.Serialize(request)}");
throw;
}
}
/// <summary>
/// Adds a project to the user's list of companies.
/// </summary>
[HttpPost]
[Route("AddProject")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status204NoContent)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
[ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
[Permission("UserManagement.Write")]
public async Task<IActionResult> AddProjectToUserService([FromBody] AddProjectToUserRequest request, CancellationToken cancellationToken)
{
try
{
logger.LogInformation($"{nameof(AddProjectToUserService)} - Request received - Payload: {JsonSerializer.Serialize(request)}");
if (string.IsNullOrEmpty(request.UserId)) { return BadRequest("Invalid user identifier"); }
if (string.IsNullOrEmpty(request.ProjectId)) { return BadRequest("Invalid project identifier"); }
return await Handle(() => thalosServiceClient.AddProjectToUserService(request, cancellationToken)).ConfigureAwait(false);
}
catch (Exception ex)
{
logger.LogError($"{nameof(AddProjectToUserService)} - An Error Occurred- {ex.Message} - {ex.InnerException} - {ex.StackTrace} - with payload {JsonSerializer.Serialize(request)}");
throw;
}
}
/// <summary>
/// Removes a project from the user's list of companies.
/// </summary>
[HttpDelete]
[Route("RemoveProject")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status204NoContent)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
[ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
[Permission("UserManagement.Write")]
public async Task<IActionResult> RemoveProjectFromUserService([FromBody] RemoveProjectFromUserRequest request, CancellationToken cancellationToken)
{
try
{
logger.LogInformation($"{nameof(RemoveProjectFromUserService)} - Request received - Payload: {JsonSerializer.Serialize(request)}");
if (string.IsNullOrEmpty(request.UserId)) { return BadRequest("Invalid user identifier"); }
if (string.IsNullOrEmpty(request.ProjectId)) { return BadRequest("Invalid project identifier"); }
return await Handle(() => thalosServiceClient.RemoveProjectFromUserService(request, cancellationToken)).ConfigureAwait(false);
}
catch (Exception ex)
{
logger.LogError($"{nameof(RemoveProjectFromUserService)} - An Error Occurred- {ex.Message} - {ex.InnerException} - {ex.StackTrace} - with payload {JsonSerializer.Serialize(request)}");
throw;
}
}
/// <summary>
/// Gets the user by email.
/// </summary>

2
Core.Thalos.BFF.Api/Core.Thalos.BFF.Api.csproj
View File

@@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Asp.Versioning.Mvc" Version="8.1.0" />
<PackageReference Include="Core.Blueprint.Logging" Version="1.0.0" />
<PackageReference Include="Core.Blueprint.Logging" Version="1.0.1" />
</ItemGroup>
<ItemGroup>

69
Core.Thalos.BFF.Api/Program.cs
View File

@@ -1,25 +1,30 @@
using Core.Blueprint.KeyVault.Configuration;
using Core.Blueprint.Logging.Configuration;
using Core.Thalos.Adapters.Contracts;
using Core.Thalos.Adapters.Extensions;
using Core.Thalos.Adapters.Services;
using Core.Thalos.BuildingBlocks.Authentication.Extensions;
using Core.Thalos.BuildingBlocks;
using Core.Thalos.BuildingBlocks.Configuration;
using Core.Thalos.BuildingBlocks.Extensions;
using Core.Thalos.External.ClientConfiguration;
using Microsoft.AspNetCore.ResponseCompression;
using OpenTelemetry.Logs;
using OpenTelemetry.Resources;
using Swashbuckle.AspNetCore.SwaggerUI;
using System.IO.Compression;
using System.Reflection;
var builder = WebApplication.CreateBuilder(args);
builder.Services.ConfigureAuthentication(builder.Configuration);
builder.Services.AddEndpointsApiExplorer();
builder.Configuration
.AddUserSecrets(Assembly.GetExecutingAssembly())
.AddEnvironmentVariables();
var services = builder.Services.AddKeyVault(builder.Configuration);
var authSettings = await AuthHelper.GetAuthSettings(builder.Services, builder, "thalos_common");
builder.Services.ConfigureAuthentication(builder.Configuration, authSettings);
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddResponseCompression();
builder.Services.AddProblemDetails();
builder.Services.AddLogs(builder);
@@ -82,20 +87,13 @@ builder.Host.ConfigureServices((context, services) =>
});
services.AddResponseCaching();
services.AddControllers();
services.AddEndpointsApiExplorer();
services.AddSwaggerGen(builder.Configuration);
services.AddSwaggerGen(builder.Configuration, "Core.Thalos.BFF.Api.xml", authSettings);
services.AddVersioning(builder.Configuration);
services.AddLogging();
services.AddProblemDetails();
services.AddHttpContextAccessor();
services.AddTransient<TrackingMechanismExtension>(); // Register the TrackingIdHandler
services.RegisterExternalLayer(builder.Configuration);
services.AddApiVersioning(options => options.ReportApiVersions = true)
.AddApiExplorer(options =>
{
options.GroupNameFormat = "'v'VVV";
options.SubstituteApiVersionInUrl = true;
});
});
builder.Services.AddCors(options =>
@@ -111,30 +109,35 @@ builder.Services.AddCors(options =>
builder.Services.AddScoped<ITokenService, TokenService>();
builder.Services.AddOutputCache(options =>
{
options.AddBasePolicy(builder =>
builder.Expire(TimeSpan.FromSeconds(10)));
options.AddPolicy("Expire20", builder =>
builder.Expire(TimeSpan.FromSeconds(20)));
options.AddPolicy("Expire30", builder =>
builder.Expire(TimeSpan.FromSeconds(30)));
});
//*************************************************************************//
var app = builder.Build();
app.UseLogging(builder.Configuration);
app.UseSwaggerUI(builder.Configuration, authSettings);
app.ConfigureSwagger(builder.Configuration);
app.UseCors(options => options.AllowAnyHeader().AllowAnyMethod().AllowAnyOrigin());
app.UseSwagger();
app.UseSwaggerUI(options =>
{
foreach (var version in app.DescribeApiVersions().Select(version => version.GroupName))
options.SwaggerEndpoint($"/swagger/{version}/swagger.json", version);
options.DisplayRequestDuration();
options.EnableTryItOutByDefault();
options.DocExpansion(DocExpansion.None);
});
app.UseResponseCompression();
app.UseResponseCaching();
app.UseRouting();
app.UseCors();
app.UseHttpsRedirection();
app.UseStaticFiles();
app.UseResponseCompression();
app.UseOutputCache();
app.UseResponseCaching();
app.UseAuthentication();
app.UseAuthorization();
app.MapControllers();
app.UseHsts();
app.UseAntiforgery();
app.UseLogging(builder.Configuration);
//app.MapHealthChecks("/health");
app.Run();

24
Core.Thalos.BFF.Api/appsettings.Local.json
View File

@@ -8,18 +8,18 @@
"LocalGateways": {
"ThalosService": "https://localhost:7253/api"
},
"Authentication": {
"Google": {
"ClientId": "128345072002-mtfdgpcur44o9tbd7q6e0bb9qnp2crfp.apps.googleusercontent.com",
"ClientSecret": "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",
"ApplicationName": "Thalos",
"RedirectUri": "https://localhost:7239/api/v1/Authentication/callback"
"ServiceSettings": {
"ApplicationName": "thalos",
"LayerName": "bff"
},
"Vault": {
"Address": "http://100.123.31.103:8200",
"Token": "hvs.e37LQvLuPhTd5ALS5QQ03Cwm",
"SecretMount": "secret"
},
"IdentityProviders": {
"Google": true,
"Azure": true
}
},
"JwtIssuerOptions": {
"Audience": "https://localhost:7239/",
"Issuer": "webApi"
},
"SecretKey": "iNivDmHLpUA223sqsfhqGbMRdRj1PVkH1"
}

4
Core.Thalos.External/ClientConfiguration/RegisterClientConfiguration.cs
View File

@@ -1,6 +1,4 @@
using Core.Thalos.Adapters.Contracts;
using Core.Thalos.Adapters.Handlers;
using Core.Thalos.Adapters.TokenProvider;
using Core.Thalos.BuildingBlocks;
using Core.Thalos.External.GatewayConfigurations;
using LSA.Dashboard.External.Clients.Dashboard;
using Microsoft.AspNetCore.Http;

16
Core.Thalos.External/Clients/Thalos/IThalosServiceClient.cs
View File

@@ -1,6 +1,6 @@
using Core.Thalos.Adapters;
using Core.Thalos.Application.UseCases.Roles.Input;
using Core.Thalos.Application.UseCases.Roles.Input;
using Core.Thalos.Application.UseCases.Users.Input;
using Core.Thalos.BuildingBlocks;
using Core.Thalos.External.Clients.Thalos.Requests.Permissions;
using Core.Thalos.External.Clients.Thalos.Requests.Users;
using Microsoft.AspNetCore.Mvc;
@@ -40,18 +40,6 @@ namespace LSA.Dashboard.External.Clients.Dashboard
[Patch("/v1/User/ChangeStatus")]
Task<ApiResponse<UserAdapter>> ChangeUserStatusService([Header("TrackingId")][Body] ChangeUserStatusRequest request, CancellationToken cancellationToken = default);
[Post("/v1/User/AddCompany")]
Task<ApiResponse<UserAdapter>> AddCompanyToUserService([Header("TrackingId")][Body] AddCompanyToUserRequest request, CancellationToken cancellationToken = default);
[Delete("/v1/User/RemoveCompany")]
Task<ApiResponse<UserAdapter>> RemoveCompanyFromUserService([Header("TrackingId")][Body] RemoveCompanyFromUserRequest request, CancellationToken cancellationToken = default);
[Post("/v1/User/AddProject")]
Task<ApiResponse<UserAdapter>> AddProjectToUserService([Header("TrackingId")][Body] AddProjectToUserRequest request, CancellationToken cancellationToken = default);
[Delete("/v1/User/RemoveProject")]
Task<ApiResponse<UserAdapter>> RemoveProjectFromUserService([Header("TrackingId")][Body] RemoveProjectFromUserRequest request, CancellationToken cancellationToken = default);
[Post("/v1/User/GetTokenAdapter")]
Task<ApiResponse<TokenAdapter>> GetTokenAdapterService([Header("TrackingId")][Body] GetTokenAdapterRequest request, CancellationToken cancellationToken = default);

2
Core.Thalos.External/Clients/Thalos/Requests/Modules/CreateModuleRequest.cs
View File

@@ -1,4 +1,4 @@
using Core.Thalos.Adapters.Common.Enums;
using Core.Thalos.BuildingBlocks;
namespace Core.Thalos.External.Clients.Thalos.Requests.Permissions
{

3
Core.Thalos.External/Clients/Thalos/Requests/Modules/UpdateModuleRequest.cs
View File

@@ -1,5 +1,4 @@
using Core.Blueprint.Mongo;
using Core.Thalos.Adapters.Common.Enums;
using Core.Thalos.BuildingBlocks;
using StatusEnum = Core.Blueprint.Mongo.StatusEnum;
namespace Core.Thalos.External.Clients.Thalos.Requests.Permissions

2
Core.Thalos.External/Clients/Thalos/Requests/Permissions/CreatePermissionRequest.cs
View File

@@ -1,4 +1,4 @@
using Core.Thalos.Adapters.Common.Constants;
using Core.Thalos.BuildingBlocks;
namespace Core.Thalos.External.Clients.Thalos.Requests.Permissions
{

2
Core.Thalos.External/Clients/Thalos/Requests/Permissions/UpdatePermissionRequest.cs
View File

@@ -1,4 +1,4 @@
using Core.Thalos.Adapters.Common.Constants;
using Core.Thalos.BuildingBlocks;
using StatusEnum = Core.Blueprint.Mongo.StatusEnum;
namespace Core.Thalos.External.Clients.Thalos.Requests.Permissions

2
Core.Thalos.External/Clients/Thalos/Requests/Roles/AddApplicationToRoleRequest.cs
View File

@@ -1,4 +1,4 @@
using Core.Thalos.Adapters.Common.Enums;
using Core.Thalos.BuildingBlocks;
namespace Core.Thalos.Application.UseCases.Roles.Input
{

2
Core.Thalos.External/Clients/Thalos/Requests/Roles/CreateRoleRequest.cs
View File

@@ -1,4 +1,4 @@
using Core.Thalos.Adapters.Common.Enums;
using Core.Thalos.BuildingBlocks;
using System.Text.Json.Serialization;
namespace Core.Thalos.Application.UseCases.Roles.Input

2
Core.Thalos.External/Clients/Thalos/Requests/Roles/RemoveApplicationFromRoleRequest.cs
View File

@@ -1,4 +1,4 @@
using Core.Thalos.Adapters.Common.Enums;
using Core.Thalos.BuildingBlocks;
namespace Core.Thalos.Application.UseCases.Roles.Input
{

2
Core.Thalos.External/Clients/Thalos/Requests/Roles/UpdateRoleRequest.cs
View File

@@ -1,4 +1,4 @@
using Core.Thalos.Adapters.Common.Enums;
using Core.Thalos.BuildingBlocks;
using System.Text.Json.Serialization;
using StatusEnum = Core.Blueprint.Mongo.StatusEnum;

8
Core.Thalos.External/Clients/Thalos/Requests/Users/AddCompanyToUserRequest.cs
View File

@@ -1,8 +0,0 @@
namespace Core.Thalos.Application.UseCases.Users.Input
{
public class AddCompanyToUserRequest
{
public string UserId { get; set; }
public string CompanyId { get; set; }
}
}

8
Core.Thalos.External/Clients/Thalos/Requests/Users/AddProjectToUserRequest.cs
View File

@@ -1,8 +0,0 @@
namespace Core.Thalos.Application.UseCases.Users.Input
{
public class AddProjectToUserRequest
{
public string UserId { get; set; }
public string ProjectId { get; set; }
}
}

2
Core.Thalos.External/Clients/Thalos/Requests/Users/CreateUserRequest.cs
View File

@@ -7,8 +7,6 @@
public string? MiddleName { get; set; }
public string LastName { get; set; } = null!;
public string RoleId { get; set; } = null!;
public string[] Companies { get; set; } = null!;
public string[]? Projects { get; set; }
public bool SendInvitation { get; set; }
}
}

8
Core.Thalos.External/Clients/Thalos/Requests/Users/RemoveCompanyFromUserRequest.cs
View File

@@ -1,8 +0,0 @@
namespace Core.Thalos.Application.UseCases.Users.Input
{
public class RemoveCompanyFromUserRequest
{
public string UserId { get; set; }
public string CompanyId { get; set; }
}
}

8
Core.Thalos.External/Clients/Thalos/Requests/Users/RemoveProjectFromUserRequest.cs
View File

@@ -1,8 +0,0 @@
namespace Core.Thalos.Application.UseCases.Users.Input
{
public class RemoveProjectFromUserRequest
{
public string UserId { get; set; }
public string ProjectId { get; set; }
}
}

2
Core.Thalos.External/Core.Thalos.External.csproj
View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Core.Thalos.BuildingBlocks" Version="1.0.5" />
<PackageReference Include="Core.Thalos.BuildingBlocks" Version="1.0.8" />
<PackageReference Include="Lib.Architecture.BuildingBlocks" Version="1.0.0" />
<PackageReference Include="Refit" Version="8.0.0" />
</ItemGroup>