ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor refactoring (typo, private fields, etc.), fix comparing hosts in GrantUrlTesterService

Browse Source
This commit is contained in:
Daniyar Alpyspayev 2022-08-20 00:06:27 +06:00
parent 1807e952cf
commit a339e213ba
5 changed files with 47 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Services/Webhooks/Webhooks.API/Controllers/WebhooksController.cs
View File

@ -69,10 +69,8 @@ public class WebhooksController : ControllerBase
await _dbContext.SaveChangesAsync(); await _dbContext.SaveChangesAsync();
return CreatedAtAction("GetByUserAndId", new { id = subscription.Id }, subscription); return CreatedAtAction("GetByUserAndId", new { id = subscription.Id }, subscription);
} }
else
{ return StatusCode(418, "Grant url can't be validated");
return StatusCode(418, "Grant url can't be validated");
}
} }
[Authorize] [Authorize]

20
src/Services/Webhooks/Webhooks.API/Infrastructure/HttpGlobalExceptionFilter.cs
View File

@ -2,18 +2,18 @@
public class HttpGlobalExceptionFilter : IExceptionFilter public class HttpGlobalExceptionFilter : IExceptionFilter
{ {
private readonly IWebHostEnvironment env; private readonly IWebHostEnvironment _env;
private readonly ILogger<HttpGlobalExceptionFilter> logger; private readonly ILogger<HttpGlobalExceptionFilter> _logger;
public HttpGlobalExceptionFilter(IWebHostEnvironment env, ILogger<HttpGlobalExceptionFilter> logger) public HttpGlobalExceptionFilter(IWebHostEnvironment env, ILogger<HttpGlobalExceptionFilter> logger)
{ {
this.env = env; _env = env;
this.logger = logger; _logger = logger;
} }
public void OnException(ExceptionContext context) public void OnException(ExceptionContext context)
{ {
logger.LogError(new EventId(context.Exception.HResult), _logger.LogError(new EventId(context.Exception.HResult),
context.Exception, context.Exception,
context.Exception.Message); context.Exception.Message);
@ -26,7 +26,7 @@ public class HttpGlobalExceptionFilter : IExceptionFilter
Detail = "Please refer to the errors property for additional details." Detail = "Please refer to the errors property for additional details."
}; };
problemDetails.Errors.Add("DomainValidations", new string[] { context.Exception.Message.ToString() }); problemDetails.Errors.Add("DomainValidations", new [] { context.Exception.Message });
context.Result = new BadRequestObjectResult(problemDetails); context.Result = new BadRequestObjectResult(problemDetails);
context.HttpContext.Response.StatusCode = (int)HttpStatusCode.BadRequest; context.HttpContext.Response.StatusCode = (int)HttpStatusCode.BadRequest;
@ -35,12 +35,12 @@ public class HttpGlobalExceptionFilter : IExceptionFilter
{ {
var json = new JsonErrorResponse var json = new JsonErrorResponse
{ {
Messages = new[] { "An error ocurred." } Messages = new[] { "An error occurred." }
}; };
if (env.IsDevelopment()) if (_env.IsDevelopment())
{ {
json.DeveloperMeesage = context.Exception; json.DeveloperMessage = context.Exception;
} }
context.Result = new InternalServerErrorObjectResult(json); context.Result = new InternalServerErrorObjectResult(json);
@ -53,6 +53,6 @@ public class HttpGlobalExceptionFilter : IExceptionFilter
{ {
public string[] Messages { get; set; } public string[] Messages { get; set; }
public object DeveloperMeesage { get; set; } public object DeveloperMessage { get; set; }
} }
} }

2
src/Services/Webhooks/Webhooks.API/Services/GrantUrlTesterService.cs
View File

@ -45,6 +45,6 @@ class GrantUrlTesterService : IGrantUrlTesterService
return firstUrl.Scheme == secondUrl.Scheme && return firstUrl.Scheme == secondUrl.Scheme &&
firstUrl.Port == secondUrl.Port && firstUrl.Port == secondUrl.Port &&
firstUrl.Host == firstUrl.Host; firstUrl.Host == secondUrl.Host;
} }
} }

2
src/Services/Webhooks/Webhooks.API/Services/IdentityService.cs
View File

@ -2,7 +2,7 @@
public class IdentityService : IIdentityService public class IdentityService : IIdentityService
{ {
private IHttpContextAccessor _context; private readonly IHttpContextAccessor _context;
public IdentityService(IHttpContextAccessor context) public IdentityService(IHttpContextAccessor context)
{ {

69
src/Services/Webhooks/Webhooks.API/Startup.cs
View File

@ -88,7 +88,7 @@ public class Startup
} }
} }
static class CustomExtensionMethods internal static class CustomExtensionMethods
{ {
public static IServiceCollection AddAppInsight(this IServiceCollection services, IConfiguration configuration) public static IServiceCollection AddAppInsight(this IServiceCollection services, IConfiguration configuration)
{ {
@ -171,53 +171,50 @@ static class CustomExtensionMethods
public static IServiceCollection AddEventBus(this IServiceCollection services, IConfiguration configuration) public static IServiceCollection AddEventBus(this IServiceCollection services, IConfiguration configuration)
{ {
if (configuration.GetValue<bool>("AzureServiceBusEnabled")) if (configuration.GetValue<bool>("AzureServiceBusEnabled"))
{
services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
{ {
services.AddSingleton<IEventBus, EventBusServiceBus>(sp => var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>();
{ var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>();
var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>(); var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>(); var eventBusSubscriptionManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>(); string subscriptionName = configuration["SubscriptionClientName"];
var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
string subscriptionName = configuration["SubscriptionClientName"];
return new EventBusServiceBus(serviceBusPersisterConnection, logger, return new EventBusServiceBus(serviceBusPersisterConnection, logger,
eventBusSubcriptionsManager, iLifetimeScope, subscriptionName); eventBusSubscriptionManager, iLifetimeScope, subscriptionName);
}); });
} }
else else
{
services.AddSingleton<IEventBus, EventBusRabbitMQ>(sp =>
{ {
services.AddSingleton<IEventBus, EventBusRabbitMQ>(sp => var subscriptionClientName = configuration["SubscriptionClientName"];
var rabbitMQPersistentConnection = sp.GetRequiredService<IRabbitMQPersistentConnection>();
var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>();
var logger = sp.GetRequiredService<ILogger<EventBusRabbitMQ>>();
var eventBusSubscriptionManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
var retryCount = 5;
if (!string.IsNullOrEmpty(configuration["EventBusRetryCount"]))
{ {
var subscriptionClientName = configuration["SubscriptionClientName"]; retryCount = int.Parse(configuration["EventBusRetryCount"]);
var rabbitMQPersistentConnection = sp.GetRequiredService<IRabbitMQPersistentConnection>(); }
var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>();
var logger = sp.GetRequiredService<ILogger<EventBusRabbitMQ>>();
var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
var retryCount = 5; return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubscriptionManager, subscriptionClientName, retryCount);
if (!string.IsNullOrEmpty(configuration["EventBusRetryCount"])) });
{ }
retryCount = int.Parse(configuration["EventBusRetryCount"]);
}
return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubcriptionsManager, subscriptionClientName, retryCount); services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
}); services.AddTransient<ProductPriceChangedIntegrationEventHandler>();
} services.AddTransient<OrderStatusChangedToShippedIntegrationEventHandler>();
services.AddTransient<OrderStatusChangedToPaidIntegrationEventHandler>();
services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>(); return services;
services.AddTransient<ProductPriceChangedIntegrationEventHandler>();
services.AddTransient<OrderStatusChangedToShippedIntegrationEventHandler>();
services.AddTransient<OrderStatusChangedToPaidIntegrationEventHandler>();
return services;
} }
public static IServiceCollection AddCustomHealthCheck(this IServiceCollection services, IConfiguration configuration) public static IServiceCollection AddCustomHealthCheck(this IServiceCollection services, IConfiguration configuration)
{ {
var accountName = configuration.GetValue<string>("AzureStorageAccountName");
var accountKey = configuration.GetValue<string>("AzureStorageAccountKey");
var hcBuilder = services.AddHealthChecks(); var hcBuilder = services.AddHealthChecks();
hcBuilder hcBuilder