Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
WorkContext - Minor improvements - prevent for null HttpContext
KrzysztofPajakb5c38577c5af
diff --git a/src/Web/Grand.Web.Common/WorkContext.cs b/src/Web/Grand.Web.Common/WorkContext.csindex ad0493e8c..b4dfb8b64 100644--- a/src/Web/Grand.Web.Common/WorkContext.cs+++ b/src/Web/Grand.Web.Common/WorkContext.cs@@ -365,8 +365,8 @@ namespace Grand.Web.Common{Language language = null;- var adminAreaUrl = _httpContextAccessor.HttpContext.Request.Path.StartsWithSegments(new PathString("/Admin"));- var allStoreLanguages = await _languageService.GetAllLanguages(showHidden: adminAreaUrl);+ var adminAreaUrl = _httpContextAccessor.HttpContext?.Request?.Path.StartsWithSegments(new PathString("/Admin"));+ var allStoreLanguages = await _languageService.GetAllLanguages(showHidden: adminAreaUrl ?? false);if (allStoreLanguages.Count() == 1)return _cachedLanguage = allStoreLanguages.FirstOrDefault();@@ -417,8 +417,8 @@ namespace Grand.Web.Commonpublic virtual async Task<Currency> SetWorkingCurrency(Customer customer){//return store currency when we're you are in admin panel- var adminAreaUrl = _httpContextAccessor.HttpContext.Request.Path.StartsWithSegments(new PathString("/Admin"));- if (adminAreaUrl)+ var adminAreaUrl = _httpContextAccessor.HttpContext?.Request?.Path.StartsWithSegments(new PathString("/Admin"));+ if (adminAreaUrl.HasValue && adminAreaUrl.Value){var primaryStoreCurrency = await _currencyService.GetPrimaryStoreCurrency();if (primaryStoreCurrency != null)@@ -429,7 +429,7 @@ namespace Grand.Web.Common}var allStoreCurrencies = await _currencyService.GetAllCurrencies(storeId: CurrentStore?.Id);- if (allStoreCurrencies.Count() == 1)+ if (allStoreCurrencies.Count == 1)return _cachedCurrency = allStoreCurrencies.FirstOrDefault();var customerCurrencyId = customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.CurrencyId, CurrentStore.Id);