Replace IServiceProvider with IHttpContextAccessor in Plugins

support · support · commit f2149b294562 · 2023-12-10T18:17:21.000+01:00
diff --git a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs
@@ -4,6 +4,7 @@
 using Grand.Business.Core.Utilities.Catalog;
 using Grand.Domain.Orders;
 using Grand.Infrastructure;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace DiscountRules.Standard.Providers
@@ -12,18 +13,18 @@ public class ShoppingCartDiscountRule : IDiscountRule
     {
         private readonly IWorkContext _workContext;
         private readonly IProductService _productService;
-        private readonly IServiceProvider _serviceProvider;
+        private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly ShoppingCartSettings _shoppingCartSettings;
 
         public ShoppingCartDiscountRule(
             IWorkContext workContext,
             IProductService productService,
-            IServiceProvider serviceProvider,
+            IHttpContextAccessor httpContextAccessor,
             ShoppingCartSettings shoppingCartSettings)
         {
             _workContext = workContext;
             _productService = productService;
-            _serviceProvider = serviceProvider;
+            _httpContextAccessor = httpContextAccessor;
             _shoppingCartSettings = shoppingCartSettings;
         }
 
@@ -59,7 +60,7 @@ public async Task<DiscountRuleValidationResult> CheckRequirement(DiscountRuleVal
             }
             double spentAmount = 0;
 
-            var priceCalculationService = _serviceProvider.GetRequiredService<IPricingService>();
+            var priceCalculationService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IPricingService>();
 
             foreach (var ca in cart)
             {
diff --git a/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs b/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
@@ -21,20 +21,17 @@ public class BrainTreePaymentProvider : IPaymentProvider
     {
         private readonly ITranslationService _translationService;
         private readonly ICustomerService _customerService;
-        private readonly IServiceProvider _serviceProvider;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly BrainTreePaymentSettings _brainTreePaymentSettings;
 
         public BrainTreePaymentProvider(
             ITranslationService translationService,
             ICustomerService customerService,
-            IServiceProvider serviceProvider,
             IHttpContextAccessor httpContextAccessor,
             BrainTreePaymentSettings brainTreePaymentSettings)
         {
             _translationService = translationService;
             _customerService = customerService;
-            _serviceProvider = serviceProvider;
             _httpContextAccessor = httpContextAccessor;
             _brainTreePaymentSettings = brainTreePaymentSettings;
         }
@@ -228,7 +225,7 @@ public async Task<double> GetAdditionalHandlingFee(IList<ShoppingCartItem> cart)
             if (_brainTreePaymentSettings.AdditionalFeePercentage)
             {
                 //percentage
-                var orderTotalCalculationService = _serviceProvider.GetRequiredService<IOrderCalculationService>();
+                var orderTotalCalculationService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IOrderCalculationService>();
                 var subtotal = await orderTotalCalculationService.GetShoppingCartSubTotal(cart, true);
                 result = (float)subtotal.subTotalWithDiscount *
                     (float)_brainTreePaymentSettings.AdditionalFee / 100f;
@@ -240,8 +237,8 @@ public async Task<double> GetAdditionalHandlingFee(IList<ShoppingCartItem> cart)
             }
 
             if (!(result > 0)) return await Task.FromResult(result);
-            var currencyService = _serviceProvider.GetRequiredService<ICurrencyService>();
-            var workContext = _serviceProvider.GetRequiredService<IWorkContext>();
+            var currencyService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<ICurrencyService>();
+            var workContext = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IWorkContext>();
             result = await currencyService.ConvertFromPrimaryStoreCurrency(result, workContext.WorkingCurrency);
 
             //return result;
diff --git a/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs b/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs
@@ -7,25 +7,25 @@
 using Grand.Domain.Orders;
 using Grand.Domain.Payments;
 using Grand.Infrastructure;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Payments.CashOnDelivery
 {
     public class CashOnDeliveryPaymentProvider : IPaymentProvider
     {
         private readonly ITranslationService _translationService;
-        private readonly IServiceProvider _serviceProvider;
+        private readonly IHttpContextAccessor _httpContextAccessor;
 
         private readonly CashOnDeliveryPaymentSettings _cashOnDeliveryPaymentSettings;
 
         public CashOnDeliveryPaymentProvider(
             ITranslationService translationService,
-            IServiceProvider serviceProvider,
-            CashOnDeliveryPaymentSettings cashOnDeliveryPaymentSettings
-            )
+            IHttpContextAccessor httpContextAccessor,
+            CashOnDeliveryPaymentSettings cashOnDeliveryPaymentSettings)
         {
             _translationService = translationService;
-            _serviceProvider = serviceProvider;
+            _httpContextAccessor = httpContextAccessor;
             _cashOnDeliveryPaymentSettings = cashOnDeliveryPaymentSettings;
         }
 
@@ -88,7 +88,7 @@ public async Task<double> GetAdditionalHandlingFee(IList<ShoppingCartItem> cart)
             if (_cashOnDeliveryPaymentSettings.AdditionalFeePercentage)
             {
                 //percentage
-                var orderTotalCalculationService = _serviceProvider.GetRequiredService<IOrderCalculationService>();
+                var orderTotalCalculationService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IOrderCalculationService>();
                 var subtotal = await orderTotalCalculationService.GetShoppingCartSubTotal(cart, true);
                 result = (float)subtotal.subTotalWithDiscount * (float)_cashOnDeliveryPaymentSettings.AdditionalFee / 100f;
             }
@@ -99,8 +99,8 @@ public async Task<double> GetAdditionalHandlingFee(IList<ShoppingCartItem> cart)
             }
 
             if (!(result > 0)) return result;
-            var currencyService = _serviceProvider.GetRequiredService<ICurrencyService>();
-            var workContext = _serviceProvider.GetRequiredService<IWorkContext>();
+            var currencyService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<ICurrencyService>();
+            var workContext = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IWorkContext>();
             result = await currencyService.ConvertFromPrimaryStoreCurrency(result, workContext.WorkingCurrency);
 
             //return result;
@@ -159,7 +159,7 @@ public async Task<VoidPaymentResult> Void(PaymentTransaction paymentTransaction)
         /// <returns>Result</returns>
         public async Task CancelPayment(PaymentTransaction paymentTransaction)
         {
-            var paymentTransactionService = _serviceProvider.GetRequiredService<IPaymentTransactionService>();
+            var paymentTransactionService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IPaymentTransactionService>();
             paymentTransaction.TransactionStatus = TransactionStatus.Canceled;
             await paymentTransactionService.UpdatePaymentTransaction(paymentTransaction);
         }
diff --git a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
@@ -30,10 +30,10 @@ public class PayPalStandardPaymentProvider : IPaymentProvider
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly ITaxService _taxService;
         private readonly IProductService _productService;
-        private readonly IServiceProvider _serviceProvider;
         private readonly IWorkContext _workContext;
         private readonly IOrderService _orderService;
-
+        private readonly ICountryService _countryService;
+        private readonly ICurrencyService _currencyService;
         #region Ctor
 
         public PayPalStandardPaymentProvider(
@@ -43,9 +43,10 @@ public PayPalStandardPaymentProvider(
             ITranslationService translationService,
             ITaxService taxService,
             IProductService productService,
-            IServiceProvider serviceProvider,
             IWorkContext workContext,
             IOrderService orderService,
+            ICountryService countryService, 
+            ICurrencyService currencyService,
             PayPalStandardPaymentSettings paypalStandardPaymentSettings)
         {
             _checkoutAttributeParser = checkoutAttributeParser;
@@ -54,9 +55,10 @@ public PayPalStandardPaymentProvider(
             _translationService = translationService;
             _taxService = taxService;
             _productService = productService;
-            _serviceProvider = serviceProvider;
             _workContext = workContext;
             _orderService = orderService;
+            _countryService = countryService;
+            _currencyService = currencyService;
             _paypalStandardPaymentSettings = paypalStandardPaymentSettings;
         }
 
@@ -101,15 +103,14 @@ private async Task<IDictionary<string, string>> CreateQueryParameters(Order orde
             var countryCode = "";
             if (!string.IsNullOrEmpty(order.ShippingAddress?.StateProvinceId))
             {
-                var countryService = _serviceProvider.GetRequiredService<ICountryService>();
-                var country = await countryService.GetCountryById(order.ShippingAddress?.CountryId);
+                var country = await _countryService.GetCountryById(order.ShippingAddress?.CountryId);
                 var state = country?.StateProvinces.FirstOrDefault(x => x.Id == order.ShippingAddress?.StateProvinceId);
                 if (state != null)
                     stateProvince = state.Abbreviation;
             }
             if (!string.IsNullOrEmpty(order.ShippingAddress?.CountryId))
             {
-                var country = await _serviceProvider.GetRequiredService<ICountryService>().GetCountryById(order.ShippingAddress?.CountryId);
+                var country = await _countryService.GetCountryById(order.ShippingAddress?.CountryId);
                 if (country != null)
                     countryCode = country.TwoLetterIsoCode;
             }
@@ -188,15 +189,12 @@ private async Task AddItemsParameters(IDictionary<string, string> parameters, Or
 
             //add checkout attributes as order items
             var checkoutAttributeValues = await _checkoutAttributeParser.ParseCheckoutAttributeValue(order.CheckoutAttributes);
-            var currencyService = _serviceProvider.GetRequiredService<ICurrencyService>();
-            var workContext = _serviceProvider.GetRequiredService<IWorkContext>();
-            var customer = await _serviceProvider.GetRequiredService<ICustomerService>().GetCustomerById(order.CustomerId);
             foreach (var attributeValue in checkoutAttributeValues)
             {
-                var attributePrice = await _taxService.GetCheckoutAttributePrice(attributeValue.ca, attributeValue.cav, false, customer);
+                var attributePrice = await _taxService.GetCheckoutAttributePrice(attributeValue.ca, attributeValue.cav, false, _workContext.CurrentCustomer);
                 if (attributePrice.checkoutPrice > 0)
                 {
-                    var roundedAttributePrice = Math.Round(await currencyService.ConvertFromPrimaryStoreCurrency(attributePrice.checkoutPrice, workContext.WorkingCurrency), 2);
+                    var roundedAttributePrice = Math.Round(await _currencyService.ConvertFromPrimaryStoreCurrency(attributePrice.checkoutPrice, _workContext.WorkingCurrency), 2);
                     //add query parameters
                     if (attributeValue.ca != null)
                     {
@@ -378,7 +376,7 @@ public async Task<double> GetAdditionalHandlingFee(IList<ShoppingCartItem> cart)
             if (_paypalStandardPaymentSettings.AdditionalFeePercentage)
             {
                 //percentage
-                var orderTotalCalculationService = _serviceProvider.GetRequiredService<IOrderCalculationService>();
+                var orderTotalCalculationService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IOrderCalculationService>();
                 var subtotal = await orderTotalCalculationService.GetShoppingCartSubTotal(cart, true);
                 result = (float)subtotal.subTotalWithDiscount * (float)_paypalStandardPaymentSettings.AdditionalFee / 100f;
             }
@@ -389,8 +387,7 @@ public async Task<double> GetAdditionalHandlingFee(IList<ShoppingCartItem> cart)
             }
 
             if (!(result > 0)) return await Task.FromResult(result);
-            var currencyService = _serviceProvider.GetRequiredService<ICurrencyService>();
-            result = await currencyService.ConvertFromPrimaryStoreCurrency(result, _workContext.WorkingCurrency);
+            result = await _currencyService.ConvertFromPrimaryStoreCurrency(result, _workContext.WorkingCurrency);
             //return result;
             return await Task.FromResult(result);
         }
diff --git a/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs b/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs
@@ -13,6 +13,7 @@
 using Grand.Domain.Orders;
 using Grand.Domain.Shipping;
 using Grand.Infrastructure;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Shipping.ByWeight.Services;
 
@@ -24,11 +25,11 @@ public class ByWeightShippingCalcPlugin : IShippingRateCalculationProvider
 
         private readonly IShippingMethodService _shippingMethodService;
         private readonly IWorkContext _workContext;
-        private readonly IServiceProvider _serviceProvider;
         private readonly ITranslationService _translationService;
         private readonly IProductService _productService;
         private readonly ICheckoutAttributeParser _checkoutAttributeParser;
         private readonly ICurrencyService _currencyService;
+        private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly ByWeightShippingSettings _byWeightShippingSettings;
 
         #endregion
@@ -39,18 +40,18 @@ public ByWeightShippingCalcPlugin(
             IWorkContext workContext,
             ITranslationService translationService,
             IProductService productService,
-            IServiceProvider serviceProvider,
             ICheckoutAttributeParser checkoutAttributeParser,
             ICurrencyService currencyService,
+            IHttpContextAccessor httpContextAccessor,
             ByWeightShippingSettings byWeightShippingSettings)
         {
             _shippingMethodService = shippingMethodService;
             _workContext = workContext;
             _translationService = translationService;
             _productService = productService;
-            _serviceProvider = serviceProvider;
             _checkoutAttributeParser = checkoutAttributeParser;
             _currencyService = currencyService;
+            _httpContextAccessor = httpContextAccessor;
             _byWeightShippingSettings = byWeightShippingSettings;
         }
         #endregion
@@ -61,14 +62,13 @@ public ByWeightShippingCalcPlugin(
             string storeId, string warehouseId, string countryId, string stateProvinceId, string zip)
         {
 
-            var shippingByWeightService = _serviceProvider.GetRequiredService<IShippingByWeightService>();
-            var shippingByWeightSettings = _serviceProvider.GetRequiredService<ByWeightShippingSettings>();
+            var shippingByWeightService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IShippingByWeightService>();
 
             var shippingByWeightRecord = await shippingByWeightService.FindRecord(shippingMethodId,
                 storeId, warehouseId, countryId, stateProvinceId, zip, weight);
             if (shippingByWeightRecord == null)
             {
-                if (shippingByWeightSettings.LimitMethodsToCreated)
+                if (_byWeightShippingSettings.LimitMethodsToCreated)
                     return null;
 
                 return 0;
@@ -211,7 +211,7 @@ public async Task<GetShippingOptionResponse> GetShippingOptions(GetShippingOptio
 
             var zip = getShippingOptionRequest.ShippingAddress.ZipPostalCode;
             double subTotal = 0;
-            var priceCalculationService = _serviceProvider.GetRequiredService<IPricingService>();
+            var priceCalculationService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IPricingService>();
 
             foreach (var packageItem in getShippingOptionRequest.Items)
             {
diff --git a/src/Plugins/Tax.CountryStateZip/Infrastructure/Cache/ModelCacheEventConsumer.cs b/src/Plugins/Tax.CountryStateZip/Infrastructure/Cache/ModelCacheEventConsumer.cs
@@ -23,12 +23,11 @@ public class ModelCacheEventConsumer :
 
         private readonly ICacheBase _cacheBase;
 
-        public ModelCacheEventConsumer(IServiceProvider serviceProvider)
+        public ModelCacheEventConsumer(ICacheBase cacheBase)
         {
-            //TODO inject static cache manager using constructor
-            this._cacheBase = serviceProvider.GetRequiredService<ICacheBase>();
+            this._cacheBase = cacheBase;
         }
-
+        
         //tax rates
         public async Task Handle(EntityInserted<TaxRate> eventMessage, CancellationToken cancellationToken)
         {
diff --git a/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs b/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,11 @@ public class ModelCacheEventConsumer :`
`23`	`23`
`24`	`24`	`private readonly ICacheBase _cacheBase;`
`25`	`25`
`26`		`- public ModelCacheEventConsumer(IServiceProvider serviceProvider)`
	`26`	`+ public ModelCacheEventConsumer(ICacheBase cacheBase)`
`27`	`27`	`{`
`28`		`- //TODO inject static cache manager using constructor`
`29`		`- this._cacheBase = serviceProvider.GetRequiredService<ICacheBase>();`
	`28`	`+ this._cacheBase = cacheBase;`
`30`	`29`	`}`
`31`		`-`
	`30`	`+`
`32`	`31`	`//tax rates`
`33`	`32`	`public async Task Handle(EntityInserted<TaxRate> eventMessage, CancellationToken cancellationToken)`
`34`	`33`	`{`