diff --git a/Core.Thalos.BFF.Api/Controllers/AuthenticationController.cs b/Core.Thalos.BFF.Api/Controllers/AuthenticationController.cs index f7192b3..6ecc9d4 100644 --- a/Core.Thalos.BFF.Api/Controllers/AuthenticationController.cs +++ b/Core.Thalos.BFF.Api/Controllers/AuthenticationController.cs @@ -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; diff --git a/Core.Thalos.BFF.Api/Controllers/ModuleController.cs b/Core.Thalos.BFF.Api/Controllers/ModuleController.cs index b349f1f..de504d7 100644 --- a/Core.Thalos.BFF.Api/Controllers/ModuleController.cs +++ b/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; diff --git a/Core.Thalos.BFF.Api/Controllers/PermissionController.cs b/Core.Thalos.BFF.Api/Controllers/PermissionController.cs index cf0c0a4..a85ee20 100644 --- a/Core.Thalos.BFF.Api/Controllers/PermissionController.cs +++ b/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; diff --git a/Core.Thalos.BFF.Api/Controllers/RoleController.cs b/Core.Thalos.BFF.Api/Controllers/RoleController.cs index 0d90bb6..79217f0 100644 --- a/Core.Thalos.BFF.Api/Controllers/RoleController.cs +++ b/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; diff --git a/Core.Thalos.BFF.Api/Controllers/UserController.cs b/Core.Thalos.BFF.Api/Controllers/UserController.cs index a3ea2bf..b9d003e 100644 --- a/Core.Thalos.BFF.Api/Controllers/UserController.cs +++ b/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; @@ -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 } } - /// - /// Adds a company to the user's list of companies. - /// - [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 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; - } - } - - /// - /// Removes a company from the user's list of companies. - /// - [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 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; - } - } - - /// - /// Adds a project to the user's list of companies. - /// - [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 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; - } - } - - /// - /// Removes a project from the user's list of companies. - /// - [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 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; - } - } - /// /// Gets the user by email. /// diff --git a/Core.Thalos.BFF.Api/Core.Thalos.BFF.Api.csproj b/Core.Thalos.BFF.Api/Core.Thalos.BFF.Api.csproj index 9d06f39..ead983c 100644 --- a/Core.Thalos.BFF.Api/Core.Thalos.BFF.Api.csproj +++ b/Core.Thalos.BFF.Api/Core.Thalos.BFF.Api.csproj @@ -9,7 +9,7 @@ - + diff --git a/Core.Thalos.BFF.Api/Program.cs b/Core.Thalos.BFF.Api/Program.cs index 2465156..0e24c63 100644 --- a/Core.Thalos.BFF.Api/Program.cs +++ b/Core.Thalos.BFF.Api/Program.cs @@ -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(); // 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(); +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(); \ No newline at end of file diff --git a/Core.Thalos.BFF.Api/appsettings.Local.json b/Core.Thalos.BFF.Api/appsettings.Local.json index 2ca5e21..4861752 100644 --- a/Core.Thalos.BFF.Api/appsettings.Local.json +++ b/Core.Thalos.BFF.Api/appsettings.Local.json @@ -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" }, - "JwtIssuerOptions": { - "Audience": "https://localhost:7239/", - "Issuer": "webApi" + "Vault": { + "Address": "http://100.123.31.103:8200", + "Token": "hvs.e37LQvLuPhTd5ALS5QQ03Cwm", + "SecretMount": "secret" }, - "SecretKey": "iNivDmHLpUA223sqsfhqGbMRdRj1PVkH1" + "IdentityProviders": { + "Google": true, + "Azure": true + } } diff --git a/Core.Thalos.External/ClientConfiguration/RegisterClientConfiguration.cs b/Core.Thalos.External/ClientConfiguration/RegisterClientConfiguration.cs index 7db7869..92dd72d 100644 --- a/Core.Thalos.External/ClientConfiguration/RegisterClientConfiguration.cs +++ b/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; diff --git a/Core.Thalos.External/Clients/Thalos/IThalosServiceClient.cs b/Core.Thalos.External/Clients/Thalos/IThalosServiceClient.cs index e1a37c2..152698f 100644 --- a/Core.Thalos.External/Clients/Thalos/IThalosServiceClient.cs +++ b/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> ChangeUserStatusService([Header("TrackingId")][Body] ChangeUserStatusRequest request, CancellationToken cancellationToken = default); - [Post("/v1/User/AddCompany")] - Task> AddCompanyToUserService([Header("TrackingId")][Body] AddCompanyToUserRequest request, CancellationToken cancellationToken = default); - - [Delete("/v1/User/RemoveCompany")] - Task> RemoveCompanyFromUserService([Header("TrackingId")][Body] RemoveCompanyFromUserRequest request, CancellationToken cancellationToken = default); - - [Post("/v1/User/AddProject")] - Task> AddProjectToUserService([Header("TrackingId")][Body] AddProjectToUserRequest request, CancellationToken cancellationToken = default); - - [Delete("/v1/User/RemoveProject")] - Task> RemoveProjectFromUserService([Header("TrackingId")][Body] RemoveProjectFromUserRequest request, CancellationToken cancellationToken = default); - [Post("/v1/User/GetTokenAdapter")] Task> GetTokenAdapterService([Header("TrackingId")][Body] GetTokenAdapterRequest request, CancellationToken cancellationToken = default); diff --git a/Core.Thalos.External/Clients/Thalos/Requests/Modules/CreateModuleRequest.cs b/Core.Thalos.External/Clients/Thalos/Requests/Modules/CreateModuleRequest.cs index 9c7e6cc..11aeaa1 100644 --- a/Core.Thalos.External/Clients/Thalos/Requests/Modules/CreateModuleRequest.cs +++ b/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 { diff --git a/Core.Thalos.External/Clients/Thalos/Requests/Modules/UpdateModuleRequest.cs b/Core.Thalos.External/Clients/Thalos/Requests/Modules/UpdateModuleRequest.cs index 0e4936e..9ba2e3f 100644 --- a/Core.Thalos.External/Clients/Thalos/Requests/Modules/UpdateModuleRequest.cs +++ b/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 diff --git a/Core.Thalos.External/Clients/Thalos/Requests/Permissions/CreatePermissionRequest.cs b/Core.Thalos.External/Clients/Thalos/Requests/Permissions/CreatePermissionRequest.cs index a474ea8..908ada1 100644 --- a/Core.Thalos.External/Clients/Thalos/Requests/Permissions/CreatePermissionRequest.cs +++ b/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 { diff --git a/Core.Thalos.External/Clients/Thalos/Requests/Permissions/UpdatePermissionRequest.cs b/Core.Thalos.External/Clients/Thalos/Requests/Permissions/UpdatePermissionRequest.cs index 2dbb77c..d1b9d50 100644 --- a/Core.Thalos.External/Clients/Thalos/Requests/Permissions/UpdatePermissionRequest.cs +++ b/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 diff --git a/Core.Thalos.External/Clients/Thalos/Requests/Roles/AddApplicationToRoleRequest.cs b/Core.Thalos.External/Clients/Thalos/Requests/Roles/AddApplicationToRoleRequest.cs index f044fb6..d8777f1 100644 --- a/Core.Thalos.External/Clients/Thalos/Requests/Roles/AddApplicationToRoleRequest.cs +++ b/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 { diff --git a/Core.Thalos.External/Clients/Thalos/Requests/Roles/CreateRoleRequest.cs b/Core.Thalos.External/Clients/Thalos/Requests/Roles/CreateRoleRequest.cs index e53d1c4..c616595 100644 --- a/Core.Thalos.External/Clients/Thalos/Requests/Roles/CreateRoleRequest.cs +++ b/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 diff --git a/Core.Thalos.External/Clients/Thalos/Requests/Roles/RemoveApplicationFromRoleRequest.cs b/Core.Thalos.External/Clients/Thalos/Requests/Roles/RemoveApplicationFromRoleRequest.cs index 3135d89..0709838 100644 --- a/Core.Thalos.External/Clients/Thalos/Requests/Roles/RemoveApplicationFromRoleRequest.cs +++ b/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 { diff --git a/Core.Thalos.External/Clients/Thalos/Requests/Roles/UpdateRoleRequest.cs b/Core.Thalos.External/Clients/Thalos/Requests/Roles/UpdateRoleRequest.cs index 8c389ec..ca782c9 100644 --- a/Core.Thalos.External/Clients/Thalos/Requests/Roles/UpdateRoleRequest.cs +++ b/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; diff --git a/Core.Thalos.External/Clients/Thalos/Requests/Users/AddCompanyToUserRequest.cs b/Core.Thalos.External/Clients/Thalos/Requests/Users/AddCompanyToUserRequest.cs deleted file mode 100644 index cb71b7c..0000000 --- a/Core.Thalos.External/Clients/Thalos/Requests/Users/AddCompanyToUserRequest.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Core.Thalos.Application.UseCases.Users.Input -{ - public class AddCompanyToUserRequest - { - public string UserId { get; set; } - public string CompanyId { get; set; } - } -} diff --git a/Core.Thalos.External/Clients/Thalos/Requests/Users/AddProjectToUserRequest.cs b/Core.Thalos.External/Clients/Thalos/Requests/Users/AddProjectToUserRequest.cs deleted file mode 100644 index 976577b..0000000 --- a/Core.Thalos.External/Clients/Thalos/Requests/Users/AddProjectToUserRequest.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Core.Thalos.Application.UseCases.Users.Input -{ - public class AddProjectToUserRequest - { - public string UserId { get; set; } - public string ProjectId { get; set; } - } -} diff --git a/Core.Thalos.External/Clients/Thalos/Requests/Users/CreateUserRequest.cs b/Core.Thalos.External/Clients/Thalos/Requests/Users/CreateUserRequest.cs index 66a3d45..10a1a74 100644 --- a/Core.Thalos.External/Clients/Thalos/Requests/Users/CreateUserRequest.cs +++ b/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; } } } diff --git a/Core.Thalos.External/Clients/Thalos/Requests/Users/RemoveCompanyFromUserRequest.cs b/Core.Thalos.External/Clients/Thalos/Requests/Users/RemoveCompanyFromUserRequest.cs deleted file mode 100644 index 8d53b90..0000000 --- a/Core.Thalos.External/Clients/Thalos/Requests/Users/RemoveCompanyFromUserRequest.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Core.Thalos.Application.UseCases.Users.Input -{ - public class RemoveCompanyFromUserRequest - { - public string UserId { get; set; } - public string CompanyId { get; set; } - } -} diff --git a/Core.Thalos.External/Clients/Thalos/Requests/Users/RemoveProjectFromUserRequest.cs b/Core.Thalos.External/Clients/Thalos/Requests/Users/RemoveProjectFromUserRequest.cs deleted file mode 100644 index b5a2c21..0000000 --- a/Core.Thalos.External/Clients/Thalos/Requests/Users/RemoveProjectFromUserRequest.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Core.Thalos.Application.UseCases.Users.Input -{ - public class RemoveProjectFromUserRequest - { - public string UserId { get; set; } - public string ProjectId { get; set; } - } -} diff --git a/Core.Thalos.External/Core.Thalos.External.csproj b/Core.Thalos.External/Core.Thalos.External.csproj index aab67ea..1019253 100644 --- a/Core.Thalos.External/Core.Thalos.External.csproj +++ b/Core.Thalos.External/Core.Thalos.External.csproj @@ -7,7 +7,7 @@ - +