Browse Source

Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>
pull/1770/head
Sumit Ghosh 3 years ago
committed by GitHub
parent
commit
4c90ec2611
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 15 deletions
  1. +1
    -1
      src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
  2. +2
    -2
      src/ApiGateways/Web.Bff.Shopping/aggregator/Infrastructure/GrpcExceptionInterceptor.cs
  3. +4
    -4
      src/ApiGateways/Web.Bff.Shopping/aggregator/Infrastructure/HttpClientAuthorizationDelegatingHandler.cs
  4. +1
    -1
      src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs
  5. +1
    -1
      src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderData.cs
  6. +0
    -4
      src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemData.cs
  7. +1
    -1
      src/ApiGateways/Web.Bff.Shopping/aggregator/Program.cs
  8. +1
    -1
      src/ApiGateways/Web.Bff.Shopping/aggregator/Services/IBasketService.cs

+ 1
- 1
src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs View File

@ -24,7 +24,7 @@
{ {
new OpenApiSecurityRequirement new OpenApiSecurityRequirement
{ {
[ oAuthScheme ] = new [] { "Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator" }
[ oAuthScheme ] = new[] { "Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator" }
} }
}; };
} }


+ 2
- 2
src/ApiGateways/Web.Bff.Shopping/aggregator/Infrastructure/GrpcExceptionInterceptor.cs View File

@ -19,11 +19,11 @@ public class GrpcExceptionInterceptor : Interceptor
return new AsyncUnaryCall<TResponse>(HandleResponse(call.ResponseAsync), call.ResponseHeadersAsync, call.GetStatus, call.GetTrailers, call.Dispose); return new AsyncUnaryCall<TResponse>(HandleResponse(call.ResponseAsync), call.ResponseHeadersAsync, call.GetStatus, call.GetTrailers, call.Dispose);
} }
private async Task<TResponse> HandleResponse<TResponse>(Task<TResponse> t)
private async Task<TResponse> HandleResponse<TResponse>(Task<TResponse> task)
{ {
try try
{ {
var response = await t;
var response = await task;
return response; return response;
} }
catch (RpcException e) catch (RpcException e)


+ 4
- 4
src/ApiGateways/Web.Bff.Shopping/aggregator/Infrastructure/HttpClientAuthorizationDelegatingHandler.cs View File

@ -15,12 +15,12 @@ public class HttpClientAuthorizationDelegatingHandler
var authorizationHeader = _httpContextAccessor.HttpContext var authorizationHeader = _httpContextAccessor.HttpContext
.Request.Headers["Authorization"]; .Request.Headers["Authorization"];
if (!string.IsNullOrEmpty(authorizationHeader))
if (!string.IsNullOrWhitespace(authorizationHeader))
{ {
request.Headers.Add("Authorization", new List<string>() { authorizationHeader }); request.Headers.Add("Authorization", new List<string>() { authorizationHeader });
} }
var token = await GetToken();
var token = await GetTokenAsync();
if (token != null) if (token != null)
{ {
@ -30,11 +30,11 @@ public class HttpClientAuthorizationDelegatingHandler
return await base.SendAsync(request, cancellationToken); return await base.SendAsync(request, cancellationToken);
} }
async Task<string> GetToken()
Task<string> GetTokenAsync()
{ {
const string ACCESS_TOKEN = "access_token"; const string ACCESS_TOKEN = "access_token";
return await _httpContextAccessor.HttpContext
return _httpContextAccessor.HttpContext
.GetTokenAsync(ACCESS_TOKEN); .GetTokenAsync(ACCESS_TOKEN);
} }
} }

+ 1
- 1
src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs View File

@ -4,7 +4,7 @@ public class BasketData
{ {
public string BuyerId { get; set; } public string BuyerId { get; set; }
public List<BasketDataItem> Items { get; set; } = new List<BasketDataItem>();
public List<BasketDataItem> Items { get; set; } = new();
public BasketData() public BasketData()
{ {


+ 1
- 1
src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderData.cs View File

@ -38,6 +38,6 @@ public class OrderData
public string Buyer { get; set; } public string Buyer { get; set; }
public List<OrderItemData> OrderItems { get; } = new List<OrderItemData>();
public List<OrderItemData> OrderItems { get; } = new();
} }

+ 0
- 4
src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemData.cs View File

@ -6,8 +6,4 @@ public class UpdateBasketItemData
public int NewQty { get; set; } public int NewQty { get; set; }
public UpdateBasketItemData()
{
NewQty = 0;
}
} }

+ 1
- 1
src/ApiGateways/Web.Bff.Shopping/aggregator/Program.cs View File

@ -1,4 +1,4 @@
BuildWebHost(args).Run();
await BuildWebHost(args).RunAsync();
IWebHost BuildWebHost(string[] args) => IWebHost BuildWebHost(string[] args) =>
WebHost WebHost


+ 1
- 1
src/ApiGateways/Web.Bff.Shopping/aggregator/Services/IBasketService.cs View File

@ -2,7 +2,7 @@
public interface IBasketService public interface IBasketService
{ {
Task<BasketData> GetById(string id);
Task<BasketData> GetByIdAsync(string id);
Task UpdateAsync(BasketData currentBasket); Task UpdateAsync(BasketData currentBasket);
} }

Loading…
Cancel
Save