Add user token to GRPC call.

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/BasketService.cs

@@ -7,6 +7,10 @@ using Grpc.Net.Client;
 using System.Linq;
 using GrpcBasket;
 using System.Net.Http;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Infrastructure;
+using System.Net.Http.Headers;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
 {
@@ -15,12 +19,14 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
         private readonly UrlsConfig _urls;
         public readonly HttpClient _httpClient;
         private readonly ILogger<BasketService> _logger;
+        private readonly IIdentityService _identityService;
 
-        public BasketService(HttpClient httpClient, IOptions<UrlsConfig> config, ILogger<BasketService> logger)
+        public BasketService(HttpClient httpClient, IOptions<UrlsConfig> config, ILogger<BasketService> logger, IIdentityService identityService)
         {
             _urls = config.Value;
             _httpClient = httpClient;
             _logger = logger;
+            _identityService = identityService;
         }
 
 
@@ -44,9 +50,17 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
                 var client = new Basket.BasketClient(channel);
                 _logger.LogDebug("Grpc update basket currentBasket {@currentBasket}", currentBasket);
                 var request = MapToCustomerBasketRequest(currentBasket);
-                _logger.LogDebug("Grpc update basket request {@request}", request);
 
-                return await client.UpdateBasketAsync(request);
+                //Get token from httpcontext and create Authorization header
+                var token = _identityService.GetUserToken();
+                var headers = new Grpc.Core.Metadata
+                {
+                      { "Authorization", $"Bearer {token.Result}" }
+                };
+
+                //Add GRPC Metadata parameter containing authorization attribute to service call.
+                _logger.LogDebug("Grpc update basket request {@request}", request);
+                return await client.UpdateBasketAsync(request,headers);
             });
         }
 

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/IIdentityService.cs

@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
+{
+    public interface IIdentityService
+    {
+        string GetUserIdentity();
+        string GetUserName();
+        Task<string> GetUserToken();
+    }
+}

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/IdentityService.cs

@@ -0,0 +1,33 @@
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
+{
+    public class IdentityService : IIdentityService
+    {
+        private IHttpContextAccessor _context; 
+
+        public IdentityService(IHttpContextAccessor context)
+        {
+            _context = context ?? throw new ArgumentNullException(nameof(context));
+        }
+
+        public string GetUserIdentity()
+        {
+            return _context.HttpContext.User.FindFirst("sub").Value;
+        }
+
+        public string GetUserName()
+        {
+            return _context.HttpContext.User.FindFirst(x => x.Type == ClaimTypes.Name).Value;
+        }
+
+        public async Task<string> GetUserToken()
+        {
+            return await _context.HttpContext.GetTokenAsync("access_token");
+        }
+    }
+}

src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs

@@ -180,6 +180,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
             //register delegating handlers
             services.AddTransient<HttpClientAuthorizationDelegatingHandler>();
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+            services.AddTransient<IIdentityService, IdentityService>();
 
             //register http services
 
@@ -197,7 +198,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
             services.AddHttpClient<IOrderingService, OrderingService>()
                 .AddHttpMessageHandler<HttpClientAuthorizationDelegatingHandler>()
                 .AddDevspacesSupport();
-
+           
             return services;
         }
 

src/Services/Basket/Basket.API/Basket.API.csproj

@@ -22,7 +22,7 @@
     <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.4" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="5.0.0-rc1" />
     <PackageReference Include="Google.Protobuf" Version="3.10.0-rc1" />
-    <PackageReference Include="Grpc.AspNetCore.Server" Version="0.2.23-pre2" />
+    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.25.0" />
     <PackageReference Include="Grpc.Tools" Version="2.24.0-pre1" PrivateAssets="All" />   
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.8.0-beta3" />
     <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.11.0-beta2" />

src/Services/Basket/Basket.API/Controllers/BasketController.cs

@@ -50,24 +50,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Controllers
         [ProducesResponseType(typeof(CustomerBasket), (int)HttpStatusCode.OK)]
         public async Task<ActionResult<CustomerBasket>> UpdateBasketAsync([FromBody]CustomerBasket value)
         {
-            var basket = await _repository.UpdateBasketAsync(value);
-            var buyerName = _identityService.GetUserName();
-          
-            var integrationEvent = new UserAddedCatalogItemToBasketIntegrationEvent(buyerName, value.Items.Count);
-            try
-            {
-                _logger.LogInformation("----- Publishing integration event: {IntegrationEventId} from {AppName} - ({@IntegrationEvent})", integrationEvent.Id, Program.AppName, integrationEvent);
-
-                _eventBus.Publish(integrationEvent);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "ERROR Publishing integration event: {IntegrationEventId} from {AppName}", integrationEvent.Id, Program.AppName);
-
-                throw;
-            }
-
-            return Ok(basket);
+            return Ok(await _repository.UpdateBasketAsync(value));
         }
 
         [Route("checkout")]

src/Services/Basket/Basket.API/Grpc/BasketService.cs

@@ -5,6 +5,14 @@ using Microsoft.Extensions.Logging;
 using System.Linq;
 using System.Threading.Tasks;
 using GrpcBasket;
+using Basket.API.IntegrationEvents.Events;
+using System;
+using Microsoft.eShopOnContainers.Services.Basket.API.Services;
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+using Microsoft.eShopOnContainers.Services.Basket.API;
+using Microsoft.AspNetCore.Http;
+using Grpc.AspNetCore.Server.Internal;
+using System.Security.Claims;
 
 namespace GrpcBasket
 {
@@ -12,11 +20,17 @@ namespace GrpcBasket
     {
         private readonly IBasketRepository _repository;
         private readonly ILogger<BasketService> _logger;
+        private readonly IIdentityService _identityService;
+        private readonly IEventBus _eventBus;
 
-        public BasketService(IBasketRepository repository, ILogger<BasketService> logger)
+        public BasketService(IBasketRepository repository, ILogger<BasketService> logger,
+            IIdentityService identityService,
+            IEventBus eventBus)
         {
             _repository = repository;
             _logger = logger;
+            _identityService = identityService;
+            _eventBus = eventBus;
         }
 
         [AllowAnonymous]
@@ -48,6 +62,21 @@ namespace GrpcBasket
 
             var response = await _repository.UpdateBasketAsync(customerBasket);
 
+            var buyerName = _identityService.GetUserName();
+            var integrationEvent = new UserAddedCatalogItemToBasketIntegrationEvent(buyerName, request.Items.Count);
+            try
+            {
+                _logger.LogInformation("----- Publishing integration event: {IntegrationEventId} from {AppName} - ({@IntegrationEvent})", integrationEvent.Id, Program.AppName, integrationEvent);
+
+                _eventBus.Publish(integrationEvent);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "ERROR Publishing integration event: {IntegrationEventId} from {AppName}", integrationEvent.Id, Program.AppName);
+
+                throw;
+            }
+
             if (response != null)
             {
                 return MapToCustomerBasketResponse(response);

src/Services/Basket/Basket.API/Services/IdentityService.cs

@@ -21,7 +21,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Services
 
         public string GetUserName()
         {
-            return _context.HttpContext.User.FindFirst("preferred_username").Value;
+            return _context.HttpContext.User.FindFirst(x => x.Type == ClaimTypes.Name).Value;
         }
     }
 }