Revise CBB and remove unnecessary code

Reviewed-on: #3
Reviewed-by: efrain_marin <efrain.marin@agilewebs.com>
Reviewed-by: Sergio Matías <sergio.matias@agilewebs.com>

Core.Thalos.BFF.Api/Controllers/AuthenticationController.cs

@@ -1,8 +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;
 using Core.Thalos.External.Clients.Thalos.Requests.Users;
 using LSA.Dashboard.External.Clients.Dashboard;
 using Microsoft.AspNetCore.Authorization;
@@ -18,8 +16,22 @@ namespace Core.Thalos.BFF.Api.Controllers
     [Produces(MimeTypes.ApplicationJson)]
     [Consumes(MimeTypes.ApplicationJson)]
     [ApiController]
-    public class AuthenticationController(IThalosServiceClient thalosServiceClient, ILogger<AuthenticationController> logger, ITokenService tokenService) : BaseController(logger)
+    public class AuthenticationController(
+    IThalosServiceClient thalosServiceClient,
+    ILogger<AuthenticationController> logger,
+    ITokenService tokenService,
+    IGoogleAuthorization googleAuthorization) : BaseController(logger)
     {
+        [HttpGet]
+        public IActionResult Authorize() => Ok(googleAuthorization.GetAuthorizationUrl());
+
+        [HttpGet("callback")]
+        public async Task<IActionResult> Callback(string code)
+        {
+            var userCredential = await googleAuthorization.ExchangeCodeForToken(code);
+
+            return Ok(new { Token = userCredential!.Token.IdToken });
+        }
         /// <summary>
         /// Get token for user.
         /// </summary>
@@ -30,7 +42,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [HttpGet]
         [Route(Routes.GenerateToken)]
         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.AzureScheme)]
+        [Authorize(AuthenticationSchemes = Schemes.GoogleScheme)]
         public async Task<IActionResult> GenerateTokenService(CancellationToken cancellationToken)
         {
             try

Core.Thalos.BFF.Api/Controllers/ModuleController.cs

@@ -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;
@@ -19,7 +17,7 @@ namespace Core.Thalos.BFF.Api.Controllers
     [Consumes("application/json")]
     [Produces("application/json")]
     [ApiController]
-    //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
+    [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
     public class ModuleController(IThalosServiceClient thalosServiceClient, ILogger<ModuleController> logger) : BaseController(logger)
     {
         /// <summary>
@@ -32,7 +30,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
         [ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        //[Permission("ModuleManagement.Read, RoleManagement.Read")]
+        [Permission("ModuleManagement.Read, RoleManagement.Read")]
         public async Task<IActionResult> GetAllModulesService(CancellationToken cancellationToken)
         {
             try
@@ -65,7 +63,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
         [ProducesResponseType(StatusCodes.Status401Unauthorized)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        //[Permission("ModuleManagement.Read")]
+        [Permission("ModuleManagement.Read")]
         public async Task<IActionResult> GetAllModulesByListAsync([FromBody] GetAllModulesByListRequest request, CancellationToken cancellationToken)
         {
             try
@@ -98,7 +96,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
         [ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        //[Permission("ModuleManagement.Write")]
+        [Permission("ModuleManagement.Write")]
         public async Task<IActionResult> CreateModuleService(CreateModuleRequest newModule, CancellationToken cancellationToken)
         {
             try
@@ -132,7 +130,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
         [ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        //[Permission("ModuleManagement.Read")]
+        [Permission("ModuleManagement.Read")]
         public async Task<IActionResult> GetModuleByIdService(GetModuleRequest request, CancellationToken cancellationToken)
         {
             try
@@ -160,7 +158,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
         [ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        //[Permission("ModuleManagement.Write")]
+        [Permission("ModuleManagement.Write")]
         public async Task<IActionResult> UpdateModuleService(UpdateModuleRequest newModule, CancellationToken cancellationToken)
         {
             try
@@ -196,7 +194,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
         [ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        //[Permission("ModuleManagement.Write")]
+        [Permission("ModuleManagement.Write")]
         public async Task<IActionResult> ChangeModuleStatusService([FromBody] ChangeModuleStatusRequest request, CancellationToken cancellationToken)
         {
             try

Core.Thalos.BFF.Api/Controllers/PermissionController.cs

@@ -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;
@@ -20,7 +18,7 @@ namespace Core.Thalos.BFF.Api.Controllers
     [Consumes("application/json")]
     [Produces("application/json")]
     [ApiController]
-    //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
+    [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
     public class PermissionController(IThalosServiceClient thalosServiceClient, ILogger<PermissionController> logger) : BaseController(logger)
     {
         /// <summary>

Core.Thalos.BFF.Api/Controllers/RoleController.cs

@@ -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;
@@ -18,7 +17,7 @@ namespace Core.Thalos.BFF.Api.Controllers
     [Consumes("application/json")]
     [Produces("application/json")]
     [ApiController]
-    //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
+    [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
     public class RoleController(IThalosServiceClient thalosServiceClient, ILogger<RoleController> logger) : BaseController(logger)
     {
         /// <summary>

Core.Thalos.BFF.Api/Controllers/UserController.cs

@@ -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;
@@ -31,7 +30,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
         [ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
+        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [Permission("UserManagement.Read")]
         public async Task<IActionResult> GetAllUsersService(CancellationToken cancellationToken)
         {
@@ -58,7 +57,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
         [ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
+        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [Permission("UserManagement.Write")]
         public async Task<IActionResult> CreateUserService(CreateUserRequest newUser, CancellationToken cancellationToken)
         {
@@ -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)
@@ -97,7 +94,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
         [ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
+        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [Permission("UserManagement.Read")]
         public async Task<IActionResult> GetUserByIdService(GetUserRequest request, CancellationToken cancellationToken)
         {
@@ -126,7 +123,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
         [ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
+        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [Permission("UserManagement.Read")]
         public async Task<IActionResult> GetUserByEmailService(GetUserByEmailRequest request, CancellationToken cancellationToken)
         {
@@ -155,7 +152,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
         [ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
+        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [Permission("UserManagement.Write")]
         public async Task<IActionResult> UpdateUserService(UpdateUserRequest request, CancellationToken cancellationToken)
         {
@@ -194,7 +191,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
         [ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        [Authorize(AuthenticationSchemes = $"{Schemes.AzureScheme}, {Schemes.DefaultScheme}")]
+        [Authorize(AuthenticationSchemes = $"{Schemes.GoogleScheme}, {Schemes.DefaultScheme}")]
         public async Task<IActionResult> LoginUserService([FromBody] LoginUserRequest request, CancellationToken cancellationToken)
         {
             try
@@ -222,7 +219,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
         [ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        [Authorize(AuthenticationSchemes = $"{Schemes.AzureScheme}, {Schemes.DefaultScheme}")]
+        [Authorize(AuthenticationSchemes = $"{Schemes.GoogleScheme}, {Schemes.DefaultScheme}")]
         public async Task<IActionResult> LogoutUserService([FromBody] LogoutUserRequest request, CancellationToken cancellationToken)
         {
             try
@@ -252,7 +249,7 @@ namespace Core.Thalos.BFF.Api.Controllers
         [ProducesResponseType(typeof(Notification), StatusCodes.Status412PreconditionFailed)]
         [ProducesResponseType(typeof(Notification), StatusCodes.Status422UnprocessableEntity)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
+        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [Permission("UserManagement.Write")]
         public async Task<IActionResult> ChangeUserStatusService([FromBody] ChangeUserStatusRequest request, CancellationToken cancellationToken)
         {
@@ -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>

Core.Thalos.BFF.Api/Core.Thalos.BFF.Api.csproj

@@ -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>

Core.Thalos.BFF.Api/Program.cs

@@ -1,23 +1,30 @@
-using Asp.Versioning;
-using Azure.Identity;
+using Core.Blueprint.KeyVault.Configuration;
 using Core.Blueprint.Logging.Configuration;
-using Core.Thalos.Adapters.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 Microsoft.Extensions.Configuration.AzureAppConfiguration;
 using OpenTelemetry.Logs;
 using OpenTelemetry.Resources;
-using Swashbuckle.AspNetCore.SwaggerUI;
 using System.IO.Compression;
 using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 
-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);
@@ -80,20 +87,13 @@ builder.Host.ConfigureServices((context, services) =>
     });
     services.AddResponseCaching();
     services.AddControllers();
-    services.AddEndpointsApiExplorer();
-    services.AddSwaggerGen();
+    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 =>
@@ -107,30 +107,37 @@ 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();

Core.Thalos.BFF.Api/appsettings.Local.json

@@ -7,6 +7,19 @@
   },
   "LocalGateways": {
     "ThalosService": "https://localhost:7253/api"
+  },
+  "ServiceSettings": {
+    "ApplicationName": "thalos",
+    "LayerName": "bff"
+  },
+  "Vault": {
+    "Address": "http://100.123.31.103:8200",
+    "Token": "hvs.e37LQvLuPhTd5ALS5QQ03Cwm",
+    "SecretMount": "secret"
+  },
+  "IdentityProviders": {
+    "Google": true,
+    "Azure": true
   }
 }
 

Core.Thalos.External/ClientConfiguration/RegisterClientConfiguration.cs

@@ -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;

Core.Thalos.External/Clients/Thalos/IThalosServiceClient.cs

@@ -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);
 

Core.Thalos.External/Clients/Thalos/Requests/Modules/CreateModuleRequest.cs

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

Core.Thalos.External/Clients/Thalos/Requests/Modules/UpdateModuleRequest.cs

@@ -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

Core.Thalos.External/Clients/Thalos/Requests/Permissions/CreatePermissionRequest.cs

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

Core.Thalos.External/Clients/Thalos/Requests/Permissions/UpdatePermissionRequest.cs

@@ -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

Core.Thalos.External/Clients/Thalos/Requests/Roles/AddApplicationToRoleRequest.cs

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

Core.Thalos.External/Clients/Thalos/Requests/Roles/CreateRoleRequest.cs

@@ -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

Core.Thalos.External/Clients/Thalos/Requests/Roles/RemoveApplicationFromRoleRequest.cs

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

Core.Thalos.External/Clients/Thalos/Requests/Roles/UpdateRoleRequest.cs

@@ -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;
 

Core.Thalos.External/Clients/Thalos/Requests/Users/AddCompanyToUserRequest.cs

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

Core.Thalos.External/Clients/Thalos/Requests/Users/AddProjectToUserRequest.cs

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

Core.Thalos.External/Clients/Thalos/Requests/Users/CreateUserRequest.cs

@@ -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; }
     }
 }

Core.Thalos.External/Clients/Thalos/Requests/Users/RemoveCompanyFromUserRequest.cs

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

Core.Thalos.External/Clients/Thalos/Requests/Users/RemoveProjectFromUserRequest.cs

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

Core.Thalos.External/Core.Thalos.External.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Core.Thalos.BuildingBlocks" Version="1.0.2" />
+    <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>