updated style

Author: HaikAsatryan

Directory.Packages.props

@@ -12,11 +12,11 @@
  <PackageVersion Include="Hangfire" Version="1.8.14" />
  <PackageVersion Include="Hangfire.Dashboard.Basic.Authentication" Version="7.0.1" />
  <PackageVersion Include="Hangfire.EntityFrameworkCore" Version="0.6.0" />
- <PackageVersion Include="Hangfire.PostgreSql" Version="1.20.8" />
+ <PackageVersion Include="Hangfire.PostgreSql" Version="1.20.9" />
  <PackageVersion Include="MassTransit.RabbitMQ" Version="8.2.3" />
  <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
  <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
- <PackageVersion Include="MediatR" />
+ <PackageVersion Include="MediatR" Version="12.3.0" />
  <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -39,19 +39,20 @@
  <PackageVersion Include="PandaTech.BaseConverter" Version="4.0.4" />
  <PackageVersion Include="Pandatech.DistributedCache" Version="1.1.0" />
  <PackageVersion Include="Pandatech.EFCore.AuditBase" Version="1.0.3" />
+ <PackageVersion Include="PandaTech.FileExporter" Version="3.1.1" />
  <PackageVersion Include="Pandatech.FluentMinimalApiMapper" Version="1.1.0" />
  <PackageVersion Include="Pandatech.CommissionCalculator" Version="3.3.0" />
  <PackageVersion Include="Pandatech.Communicator" Version="1.0.5" />
  <PackageVersion Include="Pandatech.Crypto" Version="2.5.0" />
- <PackageVersion Include="Pandatech.GridifyExtensions" Version="1.3.6" />
+ <PackageVersion Include="Pandatech.GridifyExtensions" Version="1.4.0" />
  <PackageVersion Include="Pandatech.MassTransit.PostgresOutbox" Version="1.0.7" />
  <PackageVersion Include="Pandatech.PandaVaultClient" Version="3.1.0" />
  <PackageVersion Include="Pandatech.RegexBox" Version="1.2.4" />
- <PackageVersion Include="Pandatech.ResponseCrafter" Version="2.1.3" />
+ <PackageVersion Include="Pandatech.ResponseCrafter" Version="2.2.2" />
  <PackageVersion Include="Serilog.AspNetCore" Version="8.0.1" />
  <PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1" />
  <PackageVersion Include="Serilog.Sinks.Elasticsearch" Version="10.0.0" />
- <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.27.0.93347">
+ <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.28.0.94264">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageVersion>

src/Pandatech.CleanArchitecture.Api/Endpoints/Auth/AuthenticationEndpoints.cs

@@ -8,7 +8,6 @@
 using Pandatech.CleanArchitecture.Application.Features.Auth.Application.UpdatePasswordForced;
 using Pandatech.CleanArchitecture.Application.Features.Auth.Helpers;
 using Pandatech.CleanArchitecture.Application.Features.Auth.Helpers.ApiAuth.MinimalApiExtensions;
-using Pandatech.CleanArchitecture.Application.Features.MyAccount.Application.RevokeCurrentToken;
 using Pandatech.CleanArchitecture.Application.Features.MyAccount.Application.UpdateOwnPassword;
 using Pandatech.CleanArchitecture.Core.Enums;
 using ResponseCrafter.Extensions;
@@ -50,7 +49,7 @@ public void AddRoutes(IEndpointRouteBuilder app)
  .WithSummary(" \ud83c\udf6a Cookies for the browser and token for the rest of the clients. \ud83c\udf6a")
  .WithDescription(
  "This endpoint is used to authenticate a user. Be aware that the response will be different depending on the client type.")
- .ProducesErrorResponse(400);
+ .ProducesBadRequest();
 
 
  groupApp.MapPost("/refresh-token",
@@ -73,7 +72,7 @@ public void AddRoutes(IEndpointRouteBuilder app)
  })
  .WithSummary(" \ud83c\udf6a Cookies for the browser and token for the rest of the clients. \ud83c\udf6a")
  .WithDescription("This endpoint is used to refresh the user token.")
- .ProducesErrorResponse(400);
+ .ProducesBadRequest();
 
 
  groupApp.MapGet("/state", async (ISender sender, CancellationToken token) =>
@@ -95,6 +94,6 @@ public void AddRoutes(IEndpointRouteBuilder app)
  .Authorize(UserRole.User)
  .ForcedPasswordChange()
  .WithDescription("This endpoint is used to update the user password when it is forced.")
- .ProducesErrorResponse(400);
+ .ProducesBadRequest();
  }
 }

src/Pandatech.CleanArchitecture.Api/Endpoints/MyAccount/MyAccountEndpoints.cs

@@ -4,8 +4,8 @@
 using Pandatech.CleanArchitecture.Api.Helpers;
 using Pandatech.CleanArchitecture.Application.Features.Auth.Helpers;
 using Pandatech.CleanArchitecture.Application.Features.Auth.Helpers.ApiAuth.MinimalApiExtensions;
+using Pandatech.CleanArchitecture.Application.Features.MyAccount.Application.Logout;
 using Pandatech.CleanArchitecture.Application.Features.MyAccount.Application.PersonalInformation;
-using Pandatech.CleanArchitecture.Application.Features.MyAccount.Application.RevokeCurrentToken;
 using Pandatech.CleanArchitecture.Application.Features.MyAccount.Application.UpdateOwnPassword;
 using Pandatech.CleanArchitecture.Core.Enums;
 using ResponseCrafter.Extensions;
@@ -24,6 +24,7 @@ public void AddRoutes(IEndpointRouteBuilder app)
  .MapGroup(RoutePrefix)
  .WithTags(TagName)
  .WithGroupName(ApiHelper.GroupNameClean)
+ .DisableAntiforgery()
  .WithOpenApi();
 
  groupApp.MapGet("/personal-information", async (ISender sender, CancellationToken token) =>
@@ -42,7 +43,7 @@ public void AddRoutes(IEndpointRouteBuilder app)
  })
  .Authorize(UserRole.User)
  .WithDescription("This endpoint is used to update the user password from its own profile.")
- .ProducesErrorResponse(400);
+ .ProducesBadRequest();
 
 
  groupApp.MapPost("/logout",
@@ -56,6 +57,6 @@ public void AddRoutes(IEndpointRouteBuilder app)
  })
  .Authorize(UserRole.User)
  .WithDescription("This endpoint is used to logout the user and delete cookies. \ud83c\udf6a")
- .ProducesErrorResponse(404);
+ .ProducesNotFound();
  }
 }

src/Pandatech.CleanArchitecture.Api/Endpoints/UserConfig/UserConfigEndpoints.cs

@@ -0,0 +1,61 @@
+using FluentMinimalApiMapper;
+using MediatR;
+using Microsoft.AspNetCore.Mvc;
+using Pandatech.CleanArchitecture.Api.Helpers;
+using Pandatech.CleanArchitecture.Application.Features.Auth.Helpers.ApiAuth.MinimalApiExtensions;
+using Pandatech.CleanArchitecture.Application.Features.UserConfig.CreateOrUpdate;
+using Pandatech.CleanArchitecture.Application.Features.UserConfig.Delete;
+using Pandatech.CleanArchitecture.Application.Features.UserConfig.Get;
+using Pandatech.CleanArchitecture.Core.Enums;
+using ResponseCrafter.Extensions;
+
+namespace Pandatech.CleanArchitecture.Api.Endpoints.UserConfig;
+
+public class UserConfigEndpoints : IEndpoint
+{
+ private const string BaseRoute = "/user";
+ private const string TagName = "user-configs";
+ private static string RoutePrefix => ApiHelper.GetRoutePrefix(1, BaseRoute);
+
+ public void AddRoutes(IEndpointRouteBuilder app)
+ {
+ var groupApp = app
+ .MapGroup(RoutePrefix)
+ .WithTags(TagName)
+ .WithGroupName(ApiHelper.GroupNameClean)
+ .DisableAntiforgery()
+ .WithOpenApi();
+ 
+ groupApp.MapPost("/frontend/configs",
+ async ([FromBody] CreateOrUpdateUserConfigCommand request, [FromServices] ISender sender,
+ CancellationToken token) =>
+ {
+ await sender.Send(request, token);
+ return TypedResults.Ok();
+ })
+ .WithSummary("Create or update user frontend configs")
+ .Authorize(UserRole.User)
+ .ProducesBadRequest();
+
+ groupApp.MapGet("/frontend/configs",
+ async ([AsParameters] GetUserConfigsQuery query, [FromServices] ISender sender, CancellationToken token) =>
+ {
+ var configs = await sender.Send(query, token);
+ return TypedResults.Ok(configs);
+ })
+ .WithSummary("Get user frontend configs")
+ .Authorize(UserRole.User)
+ .ProducesBadRequest();
+
+ groupApp.MapDelete("/frontend/configs",
+ async ([FromBody] DeleteUserConfigsCommand request, [FromServices] ISender sender,
+ CancellationToken token) =>
+ {
+ await sender.Send(request, token);
+ return TypedResults.Ok();
+ })
+ .WithSummary("Delete user frontend configs")
+ .Authorize(UserRole.User)
+ .ProducesBadRequest();
+ }
+}

src/Pandatech.CleanArchitecture.Api/Endpoints/Users/UserEndpoints.cs

@@ -32,15 +32,16 @@ public void AddRoutes(IEndpointRouteBuilder app)
  .MapGroup(RoutePrefix)
  .WithTags(TagName)
  .WithGroupName(ApiHelper.GroupNameClean)
+ .DisableAntiforgery()
  .WithOpenApi();
 
- groupApp.MapPost("", async (ISender sender, [FromForm] CreateUserCommand command, CancellationToken token) =>
+ groupApp.MapPost("", async (ISender sender, [FromBody] CreateUserCommand command, CancellationToken token) =>
  {
  await sender.Send(command, token);
  return TypedResults.Ok();
  })
  .Authorize()
- .ProducesErrorResponse(400);
+ .ProducesBadRequest();
 
  groupApp.MapGet("/{id}", async (ISender sender, long id, CancellationToken token) =>
  {
@@ -49,45 +50,45 @@ public void AddRoutes(IEndpointRouteBuilder app)
  })
  .Authorize()
  .RouteBaseConverter()
- .ProducesErrorResponse(404);
+ .ProducesNotFound();
 
 
  groupApp.MapPut("/{id}",
- async (ISender sender, long id, [FromForm] UpdateUserCommand command, CancellationToken token) =>
+ async (ISender sender, long id, [FromBody] UpdateUserCommand command, CancellationToken token) =>
  {
  command.Id = id;
  await sender.Send(command, token);
  return TypedResults.Ok();
  })
  .Authorize()
  .RouteBaseConverter()
- .ProducesErrorResponse(400)
- .ProducesErrorResponse(409);
+ .ProducesBadRequest()
+ .ProducesConflict();
 
 
  groupApp.MapPatch("/{id}/password",
- async (ISender sender, long id, [FromForm] UpdateUserPasswordCommand command, CancellationToken token) =>
+ async (ISender sender, long id, [FromBody] UpdateUserPasswordCommand command, CancellationToken token) =>
  {
  command.Id = id;
  await sender.Send(command, token);
  return TypedResults.Ok();
  })
  .Authorize()
  .RouteBaseConverter()
- .ProducesErrorResponse(400)
- .ProducesErrorResponse(404);
+ .ProducesBadRequest()
+ .ProducesNotFound();
 
  groupApp.MapPatch("/{id}/status",
- async (ISender sender, long id, [FromForm] UpdateUserStatusCommand command, CancellationToken token) =>
+ async (ISender sender, long id, [FromBody] UpdateUserStatusCommand command, CancellationToken token) =>
  {
  command.Id = id;
  await sender.Send(command, token);
  return TypedResults.Ok();
  })
  .Authorize()
  .RouteBaseConverter()
- .ProducesErrorResponse(400)
- .ProducesErrorResponse(404);
+ .ProducesBadRequest()
+ .ProducesNotFound();
 
  groupApp.MapDelete("",
  async (ISender sender, [FromBody] DeleteUsersCommand command, CancellationToken token) =>
@@ -96,15 +97,15 @@ public void AddRoutes(IEndpointRouteBuilder app)
  return TypedResults.Ok();
  })
  .Authorize()
- .ProducesErrorResponse(400);
+ .ProducesBadRequest();
 
  groupApp.MapGet("", async ([AsParameters] GetUsersQuery request, ISender sender, CancellationToken token) =>
  {
  var users = await sender.Send(request, token);
  return TypedResults.Ok(users);
  })
  .Authorize()
- .ProducesErrorResponse(400);
+ .ProducesBadRequest();
 
  groupApp.MapGet("/column/distinct",
  async ([AsParameters] GetUserColumnDistinctValuesQuery query, ISender sender, CancellationToken token) =>
@@ -113,11 +114,11 @@ public void AddRoutes(IEndpointRouteBuilder app)
  return TypedResults.Ok(distinctValues);
  })
  .Authorize()
- .ProducesErrorResponse(400);
+ .ProducesBadRequest();
 
  groupApp.MapGet("/filters", () => TypedResults.Ok(QueryableExtensions.GetMappings<User>()))
  .Authorize()
  .WithSummary("Get filter technical information")
- .ProducesErrorResponse(400);
+ .ProducesBadRequest();
  }
 }

src/Pandatech.CleanArchitecture.Api/appsettings.Local.json

@@ -25,7 +25,7 @@
  "Security": {
  "SuperUser": {
  "Username": "admin@admin.com",
- "Password": "Qwerty123"
+ "Password": "Qwertyui123@"
  },
  "Hangfire": {
  "Username": "test",

src/Pandatech.CleanArchitecture.Application/Features/Auth/Application/Auth/AuthQueryHandler.cs

@@ -30,24 +30,17 @@ public async Task Handle(AuthQuery request, CancellationToken cancellationToken)
  return;
  }
 
- if (string.IsNullOrWhiteSpace(accessTokenSignature))
- {
- throw new UnauthorizedException(ErrorMessages.AccessTokenIsRequired);
- }
+ UnauthorizedException.ThrowIfNullOrWhiteSpace(accessTokenSignature, ErrorMessages.AccessTokenIsRequired);
 
- var accessTokenHash = Sha3.Hash(accessTokenSignature);
 
- var tokenEntity = await unitOfWork.UserTokens.GetUserTokenByAccessTokenAsync(accessTokenHash, cancellationToken);
+ var accessTokenHash = Sha3.Hash(accessTokenSignature);
 
- if (tokenEntity is null || tokenEntity.User.Status is not UserStatus.Active)
- {
- throw new UnauthorizedException();
- }
+ var tokenEntity = await unitOfWork.Tokens.GetTokenByAccessTokenAsync(accessTokenHash, cancellationToken);
 
- if (tokenEntity.AccessTokenExpiresAt <= DateTime.UtcNow)
- {
-  throw new UnauthorizedException(ErrorMessages.AccessTokenIsExpired);
- }
+ UnauthorizedException.ThrowIfNull(tokenEntity);
+ UnauthorizedException.ThrowIf(tokenEntity.User.Status is not UserStatus.Active);
+ UnauthorizedException.ThrowIf(tokenEntity.AccessTokenExpiresAt <= DateTime.UtcNow,
+  ErrorMessages.AccessTokenIsExpired);
 
  var identity = new Identity
  {
@@ -59,7 +52,7 @@ public async Task Handle(AuthQuery request, CancellationToken cancellationToken)
  UserRole = tokenEntity.User.Role,
  CreatedAt = tokenEntity.User.CreatedAt,
  UpdatedAt = tokenEntity.User.UpdatedAt,
- UserTokenId = tokenEntity.Id,
+ TokenId = tokenEntity.Id,
  AccessTokenSignature = accessTokenSignature,
  AccessTokenExpiration = tokenEntity.AccessTokenExpiresAt
  };

src/Pandatech.CleanArchitecture.Application/Features/Auth/Application/CreateToken/CreateTokenCommandHandler.cs

@@ -36,7 +36,7 @@ public async Task<CreateTokenCommandResponse> Handle(CreateTokenCommand request,
  UpdatedAt = now
  };
 
- unitOfWork.UserTokens.Add(token);
+ unitOfWork.Tokens.Add(token);
  await unitOfWork.SaveChangesAsync(cancellationToken);
 
  return CreateTokenCommandResponse.MapFromEntity(token, accessTokenSignature, refreshTokenSignature);

src/Pandatech.CleanArchitecture.Application/Features/Auth/Application/Login/LoginCommandHandler.cs

@@ -20,11 +20,11 @@ public async Task<LoginCommandResponse> Handle(LoginCommand request, Cancellatio
  if (user is null || user.Status != UserStatus.Active ||
  !argon2Id.VerifyHash(request.Password, user.PasswordHash))
  {
- throw new BadRequestException(ErrorMessages.InvalidUsernameOrPassword);
+ throw new BadRequestException(ErrorMessages.InvalidCredentials);
  }
 
- var userToken = await sender.Send(new CreateTokenCommand(user.Id), cancellationToken);
+ var token = await sender.Send(new CreateTokenCommand(user.Id), cancellationToken);
 
- return LoginCommandResponse.MapFromEntity(userToken, user.Role, user.ForcePasswordChange);
+ return LoginCommandResponse.MapFromEntity(token, user.Role, user.ForcePasswordChange);
  }
 }