alexandr/myoffice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
alexandr
2023-12-05 20:21:21 +02:00
parent 045f60e373
commit 775146ee86
12 changed files with 307 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyOffice.Web/Controllers/BaseApiController.cs
+3 -1
View File
@@ -1,11 +1,13 @@
namespace MyOffice.Web.Controllers;
using System.Security.Authentication;
using Microsoft.AspNetCore.Mvc;
using Core.Extensions;
using IdentityModel;
using Microsoft.AspNetCore.Mvc;
using MyOffice.Web.Infrastructure.Attributes;
using MyOffice.Web.Models;
[DefaultFromBody]
public class BaseApiController : ControllerBase
{
public Guid UserId
MyOffice.Web/Controllers/CurrencyController.cs
+4 -11
View File
@@ -3,7 +3,6 @@ namespace MyOffice.Web.Controllers;
using AutoMapper;
using Core;
using Core.Extensions;
using Data.Models.Currencies;
using Infrastructure.Attributes;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
@@ -12,8 +11,7 @@ using Services.Currency;
using Services.Currency.Domain;
[Authorize]
[ApiController]
[Route("api/[controller]")]
[DefaultFromBody]
public class CurrencyController : BaseApiController
{
private readonly CurrencyService _currencyService;
@@ -31,7 +29,6 @@ public class CurrencyController : BaseApiController
_mapper = mapper;
}
[HttpGet("~/api/settings/currencies")]
public ObjectResult Get()
{
var list = _currencyService.GetAllWithRates(UserId);
@@ -39,8 +36,7 @@ public class CurrencyController : BaseApiController
return OkResponse(_mapper.Map<List<CurrencyViewModel>>(list).OrderBy(x => x.Id));
}
[HttpPost("~/api/settings/currencies")]
public ObjectResult Post(CurrencyAddModel currency)
public ObjectResult Add(CurrencyAddModel currency)
{
var exec = _currencyService.CurrencyAdd(UserId, new CurrencyDto
{
@@ -71,7 +67,6 @@ public class CurrencyController : BaseApiController
}
}
[HttpPut("~/api/settings/currencies/{id}")]
public ObjectResult Update(string id, CurrencyEditModel currency)
{
var exec = _currencyService.CurrencyUpdate(
@@ -94,8 +89,7 @@ public class CurrencyController : BaseApiController
}
}
[HttpDelete("~/api/settings/currencies/{id}")]
public ObjectResult Update([AsGuid] string id)
public ObjectResult Delete([AsGuid] string id)
{
var exec = _currencyService.Remove(UserId, id.AsGuid());
@@ -113,8 +107,7 @@ public class CurrencyController : BaseApiController
}
}
[HttpPost("~/api/settings/currencies/{id}/rate")]
public ObjectResult Add(string id, CurrencyRateModel currencyRate)
public ObjectResult AddRate(string id, CurrencyRateModel currencyRate)
{
var exec = _currencyService.CurrencyRateAdd(UserId, id.AsGuid(), new CurrencyRateDto
{
MyOffice.Web/Controllers/GeneralController.cs
+3 -4
View File
@@ -5,10 +5,10 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
using Models.Currency;
using Services.Currency;
using MyOffice.Web.Infrastructure.Attributes;
[Authorize]
[ApiController]
[Route("api/[controller]")]
[DefaultFromBody]
public class GeneralController : BaseApiController
{
private readonly CurrencyService _currencyService;
@@ -23,8 +23,7 @@ public class GeneralController : BaseApiController
_mapper = mapper;
}
[HttpGet("~/api/general/currencies")]
public ObjectResult Get()
public ObjectResult GetGlobalCurrencies()
{
var list = _currencyService.GetGlobalAll();
MyOffice.Web/Infrastructure/Attributes/DefaultFromBodyAttribute.cs
+63
View File
@@ -0,0 +1,63 @@
namespace MyOffice.Web.Infrastructure.Attributes;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ApplicationModels;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.AspNetCore.Mvc.ModelBinding;
[AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
public sealed class DefaultFromBodyAttribute : Attribute
{
}
public class GlobalModelStateValidatorAttribute : ActionFilterAttribute
{
private readonly ProblemDetailsFactory _problemDetailsFactory;
public GlobalModelStateValidatorAttribute(ProblemDetailsFactory problemDetailsFactory)
{
_problemDetailsFactory = problemDetailsFactory;
}
public override void OnActionExecuting(ActionExecutingContext context)
{
if (!context.ModelState.IsValid)
{
context.Result = new ObjectResult(_problemDetailsFactory.CreateValidationProblemDetails(context.HttpContext, context.ModelState))
{
StatusCode = StatusCodes.Status400BadRequest
};
}
base.OnActionExecuting(context);
}
}
public class DefaultFromBodyBindingConvention : IActionModelConvention
{
public void Apply(ActionModel action)
{
if (action == null)
{
throw new ArgumentNullException(nameof(action));
}
if (action.Controller.Attributes.Any(a => a is DefaultFromBodyAttribute))
{
foreach (var parameter in action.Parameters)
{
var paramType = parameter.ParameterInfo.ParameterType;
var isSimpleType = paramType.IsPrimitive
|| paramType.IsEnum
|| paramType == typeof(string)
|| paramType == typeof(decimal);
if (!isSimpleType)
{
parameter.BindingInfo = parameter.BindingInfo ?? new BindingInfo();
parameter.BindingInfo.BindingSource = BindingSource.Body;
}
}
}
}
}
MyOffice.Web/Infrastructure/CustomProblemDetailsFactory.cs
+95
View File
@@ -0,0 +1,95 @@
namespace MyOffice.Web.Infrastructure;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.Extensions.Options;
public class CustomProblemDetailsFactory : ProblemDetailsFactory
{
private readonly ApiBehaviorOptions options;
private readonly JsonOptions jsonOptions;
public CustomProblemDetailsFactory(IOptions<ApiBehaviorOptions> options, IOptions<JsonOptions> jsonOptions)
{
this.options = options?.Value ?? throw new ArgumentNullException(nameof(options));
this.jsonOptions = jsonOptions?.Value ?? throw new ArgumentNullException(nameof(jsonOptions));
}
public override ProblemDetails CreateProblemDetails(
HttpContext httpContext,
int? statusCode = null,
string? title = null,
string? type = null,
string? detail = null,
string? instance = null)
{
statusCode ??= 500;
var problemDetails = new ProblemDetails
{
Status = statusCode,
Title = title,
Type = type,
Detail = detail,
Instance = instance,
};
ApplyProblemDetailsDefaults(httpContext, problemDetails, statusCode.Value);
return problemDetails;
}
public override ValidationProblemDetails CreateValidationProblemDetails(
HttpContext httpContext,
ModelStateDictionary modelStateDictionary,
int? statusCode = null,
string? title = null,
string? type = null,
string? detail = null,
string? instance = null)
{
if (modelStateDictionary == null)
{
throw new ArgumentNullException(nameof(modelStateDictionary));
}
statusCode ??= 400;
var errors = modelStateDictionary
.Where(x => x.Value?.Errors.Any() == true)
.ToDictionary(
kvp => jsonOptions?.JsonSerializerOptions?.PropertyNamingPolicy?.ConvertName(kvp.Key) ?? kvp.Key,
kvp => kvp.Value!.Errors.Select(x => x.ErrorMessage).ToArray()
);
var problemDetails = new ValidationProblemDetails(errors)
{
Status = statusCode,
Type = type,
Detail = detail,
Instance = instance,
};
if (title != null)
{
// For validation problem details, don't overwrite the default title with null.
problemDetails.Title = title;
}
ApplyProblemDetailsDefaults(httpContext, problemDetails, statusCode.Value);
return problemDetails;
}
private void ApplyProblemDetailsDefaults(HttpContext httpContext, ProblemDetails problemDetails, int statusCode)
{
problemDetails.Status ??= statusCode;
if (options.ClientErrorMapping.TryGetValue(statusCode, out var clientErrorData))
{
problemDetails.Title ??= clientErrorData.Title;
problemDetails.Type ??= clientErrorData.Link;
}
}
}
MyOffice.Web/Program.Routes.cs
+53
View File
@@ -0,0 +1,53 @@
namespace MyOffice.Web;
public partial class Program
{
private static void MapRoutes(WebApplication app)
{
MapRoute(app, Routes.GlobalCurrencies, "General", "GetGlobalCurrencies", HttpMethod.Get);
// Settings Currency
MapRoute(app, Routes.SettingsCurrencies, "Currency", "Get", HttpMethod.Get);
MapRoute(app, Routes.SettingsCurrencies, "Currency", "Add", HttpMethod.Post);
MapRoute(app, Routes.SettingsCurrency, "Currency", "Update", HttpMethod.Put);
MapRoute(app, Routes.SettingsCurrency, "Currency", "Delete", HttpMethod.Delete);
MapRoute(app, Routes.SettingsCurrencyRate, "Currency", "AddRate", HttpMethod.Post);
}
private static void MapRoute(
WebApplication app,
string route,
string controller,
string action,
params HttpMethod[] methods
)
{
object? constraints = null;
if (methods?.Any() == true)
{
constraints = new
{
httpMethod = new Microsoft.AspNetCore.Routing.Constraints.HttpMethodRouteConstraint(methods.Select(x => x.ToString()).ToArray())
};
}
app.MapControllerRoute(
name: $"{controller}_{action}",
pattern: route,
defaults: new
{
controller,
action,
},
constraints: constraints
);
}
}
public static class Routes
{
public static readonly string GlobalCurrencies = "api/general/currencies";
public static readonly string SettingsCurrencies = "api/settings/currencies";
public static readonly string SettingsCurrency = "api/settings/currencies/{id}";
public static readonly string SettingsCurrencyRate = "api/settings/currencies/{id}/rate";
}
MyOffice.Web/Program.cs
+37 -7
View File
@@ -43,8 +43,11 @@ using Services.Account;
using Services.Item;
using MyOffice.Services.Dashboard;
using MyOffice.Services.Identity;
using MyOffice.Services.Mapper;
using MyOffice.Services.Account.Domain;
using MyOffice.Web.Infrastructure.Attributes;
using System.Text.Json;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Infrastructure;
//TODO: Data.Model only Repository and Service, response <-> mapper <-> web <-> mapper <-> service <-> repository
//TODO: Project management
@@ -73,7 +76,7 @@ using MyOffice.Services.Account.Domain;
//TODO: report income
//TODO: report outcome
public class Program
public partial class Program
{
public static void Main(string[] args)
{
@@ -88,6 +91,8 @@ public class Program
private static void AddServices(WebApplicationBuilder builder)
{
#region Loging
builder.Services.AddLogging(logging =>
logging.AddSimpleConsole(options =>
{
@@ -99,6 +104,8 @@ public class Program
//File Logger
builder.Logging.AddFile(builder.Configuration.GetSection("Logging"));
#endregion Loging
builder.Services.Configure<LoggerFilterOptions>(options =>
{
//options.AddFilter("IdentityServer4", LogLevel.Warning); // or LogLevel.None to completely disable
@@ -108,7 +115,8 @@ public class Program
// shared configuration
builder.Configuration.AddConfiguration(SharedConfiguration.CreateConfigurationContainer());
// Database
#region Database
var databaseProvider = builder.Configuration["DatabaseProvider"];
if (databaseProvider == null)
throw new NullReferenceException($"Configuration DatabaseProvider {databaseProvider}");
@@ -120,6 +128,8 @@ public class Program
var connectionConfiguration = new ConnectionConfiguration(databaseProvider, connectionString);
RepositoryInitializer.Initialize(builder.Services, connectionConfiguration);
#endregion Database
// Configurations
builder.Services.Configure<ExternalProvidersConfig>(
builder.Configuration.GetSection("ExternalProviders")
@@ -131,7 +141,7 @@ public class Program
builder.Services.AddScoped<IContextProvider, ContextProvider>();
AddMapping(builder);
AddAutoMapper(builder);
AddRepositories(builder);
@@ -145,6 +155,8 @@ public class Program
options.JsonSerializerOptions.MaxDepth = 0;
options.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles;
options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
options.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
options.JsonSerializerOptions.DictionaryKeyPolicy = JsonNamingPolicy.CamelCase;
});
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
@@ -152,6 +164,21 @@ public class Program
//builder.Services.AddSwaggerGen();
builder.Services.AddCors();
builder.Services.AddControllersWithViews(options =>
{
options.Conventions.Add(new DefaultFromBodyBindingConvention());
options.Filters.Add(typeof(GlobalModelStateValidatorAttribute));
});
builder.Services.Configure<MvcOptions>(options =>
{
});
builder.Services.Configure<ApiBehaviorOptions>(x => {
});
builder.Services.AddSingleton<ProblemDetailsFactory, CustomProblemDetailsFactory>();
}
private static void InitializeGlobalSettings(WebApplicationBuilder builder)
@@ -245,7 +272,7 @@ public class Program
}
}
private static void AddMapping(WebApplicationBuilder builder)
private static void AddAutoMapper(WebApplicationBuilder builder)
{
builder.Services.AddAutoMapper(
c =>
@@ -253,7 +280,7 @@ public class Program
c.AllowNullCollections = true;
c.AllowNullDestinationValues = true;
},
typeof(AccountDto).Assembly,
typeof(AccountDto).Assembly,
typeof(AccountViewModel).Assembly
);
}
@@ -272,7 +299,7 @@ public class Program
builder.Services.AddScoped<IAccountAccessRepository, AccountAccessRepository>();
builder.Services.AddScoped<IAccountAccessInviteRepository, AccountAccessInviteRepository>();
builder.Services.AddScoped<IAccountAccountCategoryRepository, AccountAccountCategoryRepository>();
builder.Services.AddScoped<IItemCategoryRepository, ItemCategoryRepository>();
builder.Services.AddScoped<IItemRepository, ItemRepository>();
builder.Services.AddScoped<IItemGlobalRepository, ItemGlobalRepository>();
@@ -423,8 +450,11 @@ public class Program
app.UseIdentityServer();
//app.UseAuthentication();
//app.UseRouting();
app.UseAuthorization();
MapRoutes(app);
app.MapControllers();
}