Skip to content

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.

Further improvements - remove files related with MongoDb settings manager

KrzysztofPajakd76cb6b5b14a
diff --git a/src/API/Grand.Api/Controllers/TokenWebController.cs b/src/API/Grand.Api/Controllers/TokenWebController.cs
index 9356aae79..b6cfdd70f 100644
--- a/src/API/Grand.Api/Controllers/TokenWebController.cs
+++ b/src/API/Grand.Api/Controllers/TokenWebController.cs
@@ -1,5 +1,6 @@
using Grand.Api.Commands.Models.Common;
using Grand.Api.DTOs;
+using Grand.Api.Models.Common;
using Grand.Business.Authentication.Interfaces;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Customers.Interfaces;
@@ -61,7 +62,7 @@ namespace Grand.Api.Controllers
[AllowAnonymous]
[IgnoreAntiforgeryToken]
[HttpPost]
- public async Task<IActionResult> Create([FromBody] Models.Common.LoginModel model)
+ public async Task<IActionResult> Create([FromBody] LoginModel model)
{
var result = await _customerManagerService.LoginCustomer(model.Email, model.Password);
if (!result.Equals(CustomerLoginResults.Successful))
diff --git a/src/API/Grand.Api/DTOs/TokenDto.cs b/src/API/Grand.Api/DTOs/TokenDto.cs
index 59ca83c27..e919a0c13 100644
--- a/src/API/Grand.Api/DTOs/TokenDto.cs
+++ b/src/API/Grand.Api/DTOs/TokenDto.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Grand.Api.DTOs
+namespace Grand.Api.DTOs
{
public class TokenDto
{
diff --git a/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs b/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs
index a7d0e5f4a..ab8e42622 100644
--- a/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs
+++ b/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs
@@ -77,7 +77,7 @@ namespace Grand.Api.Filters
if (actionFilter?.IgnoreFilter ?? _ignoreFilter)
return;
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
//there is AdminAuthorizeFilter, so check access
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs
index 6832b2170..41fa5a9b5 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs
@@ -101,12 +101,10 @@ namespace Grand.Business.System.Services.Installation
adminUser.ShippingAddress = defaultAdminUserAddress;
adminUser.Groups.Add(crAdministrators.Id);
adminUser.Groups.Add(crRegistered.Id);
+ adminUser.UserFields.Add(new UserField() { Key = SystemCustomerFieldNames.FirstName, Value = "John" });
+ adminUser.UserFields.Add(new UserField() { Key = SystemCustomerFieldNames.LastName, Value = "Smith" });
await _customerRepository.InsertAsync(adminUser);
- //set default customer name
- await _userFieldService.SaveField(adminUser, SystemCustomerFieldNames.FirstName, "John");
- await _userFieldService.SaveField(adminUser, SystemCustomerFieldNames.LastName, "Smith");
-
//Anonymous user
var anonymousUser = new Customer
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs
index 28fe7f2a4..171fbbc63 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs
@@ -22,7 +22,6 @@ using Grand.Domain.Shipping;
using Grand.Domain.Stores;
using Grand.Domain.Tax;
using Grand.Domain.Vendors;
-using Grand.SharedKernel.Extensions;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
@@ -37,8 +36,7 @@ namespace Grand.Business.System.Services.Installation
{
var _settingService = _serviceProvider.GetRequiredService<ISettingService>();
- await _settingService.SaveSetting(new MenuItemSettings
- {
+ await _settingService.SaveSetting(new MenuItemSettings {
DisplayHomePageMenu = !installSampleData,
DisplayNewProductsMenu = true,
DisplaySearchMenu = !installSampleData,
@@ -47,15 +45,13 @@ namespace Grand.Business.System.Services.Installation
DisplayContactUsMenu = true
});
- await _settingService.SaveSetting(new PdfSettings
- {
+ await _settingService.SaveSetting(new PdfSettings {
LogoPictureId = "",
InvoiceHeaderText = null,
InvoiceFooterText = null,
});
- await _settingService.SaveSetting(new CommonSettings
- {
+ await _settingService.SaveSetting(new CommonSettings {
StoreInDatabaseContactUsForm = true,
UseSystemEmailForContactUsForm = true,
SitemapEnabled = true,
@@ -66,16 +62,13 @@ namespace Grand.Business.System.Services.Installation
PopupForTermsOfServiceLinks = true,
AllowToSelectStore = false,
});
- await _settingService.SaveSetting(new SystemSettings
- {
+ await _settingService.SaveSetting(new SystemSettings {
DeleteGuestTaskOlderThanMinutes = 1440,
});
- await _settingService.SaveSetting(new SecuritySettings
- {
+ await _settingService.SaveSetting(new SecuritySettings {
AdminAreaAllowedIpAddresses = null
});
- await _settingService.SaveSetting(new MediaSettings
- {
+ await _settingService.SaveSetting(new MediaSettings {
BlogThumbPictureSize = 450,
ProductThumbPictureSize = 415,
ProductDetailsPictureSize = 800,
@@ -98,8 +91,7 @@ namespace Grand.Business.System.Services.Installation
StoreInDb = true
});
- await _settingService.SaveSetting(new SeoSettings
- {
+ await _settingService.SaveSetting(new SeoSettings {
PageTitleSeparator = ". ",
PageTitleSeoAdjustment = true,
DefaultTitle = "Your store",
@@ -167,15 +159,13 @@ namespace Grand.Business.System.Services.Installation
},
});
- await _settingService.SaveSetting(new AdminAreaSettings
- {
+ await _settingService.SaveSetting(new AdminAreaSettings {
DefaultGridPageSize = 15,
GridPageSizes = "10, 15, 20, 50, 100",
UseIsoDateTimeConverterInJson = true,
});
- await _settingService.SaveSetting(new CatalogSettings
- {
+ await _settingService.SaveSetting(new CatalogSettings {
AllowViewUnpublishedProductPage = true,
DisplayDiscontinuedMessageForUnpublishedProducts = true,
PublishBackProductWhenCancellingOrders = false,
@@ -249,15 +239,13 @@ namespace Grand.Business.System.Services.Installation
SecondPictureOnCatalogPages = true
});
- await _settingService.SaveSetting(new LanguageSettings
- {
+ await _settingService.SaveSetting(new LanguageSettings {
DefaultAdminLanguageId = _languageRepository.Table.Single(l => l.Name == "English").Id,
AutomaticallyDetectLanguage = false,
IgnoreRtlPropertyForAdminArea = false,
});
- await _settingService.SaveSetting(new CustomerSettings
- {
+ await _settingService.SaveSetting(new CustomerSettings {
UsernamesEnabled = false,
CheckUsernameAvailabilityEnabled = false,
AllowUsersToChangeUsernames = false,
@@ -311,8 +299,7 @@ namespace Grand.Business.System.Services.Installation
TwoFactorAuthenticationEnabled = false,
});
- await _settingService.SaveSetting(new AddressSettings
- {
+ await _settingService.SaveSetting(new AddressSettings {
CompanyEnabled = true,
StreetAddressEnabled = true,
StreetAddressRequired = true,
@@ -329,8 +316,7 @@ namespace Grand.Business.System.Services.Installation
NoteEnabled = false,
});
- await _settingService.SaveSetting(new StoreInformationSettings
- {
+ await _settingService.SaveSetting(new StoreInformationSettings {
StoreClosed = false,
DefaultStoreTheme = "Default",
AllowCustomerToSelectTheme = false,
@@ -344,8 +330,7 @@ namespace Grand.Business.System.Services.Installation
PinterestLink = "",
});
- await _settingService.SaveSetting(new LoyaltyPointsSettings
- {
+ await _settingService.SaveSetting(new LoyaltyPointsSettings {
Enabled = true,
ExchangeRate = 1,
PointsForRegistration = 0,
@@ -357,22 +342,19 @@ namespace Grand.Business.System.Services.Installation
PointsAccumulatedForAllStores = true,
});
- await _settingService.SaveSetting(new CurrencySettings
- {
+ await _settingService.SaveSetting(new CurrencySettings {
PrimaryStoreCurrencyId = _currencyRepository.Table.Single(c => c.CurrencyCode == "USD").Id,
PrimaryExchangeRateCurrencyId = _currencyRepository.Table.Single(c => c.CurrencyCode == "USD").Id,
ActiveExchangeRateProviderSystemName = "CurrencyExchange.MoneyConverter",
AutoUpdateEnabled = false
});
- await _settingService.SaveSetting(new MeasureSettings
- {
+ await _settingService.SaveSetting(new MeasureSettings {
BaseDimensionId = _measureDimensionRepository.Table.Single(m => m.SystemKeyword == "centimetres").Id,
BaseWeightId = _measureWeightRepository.Table.Single(m => m.SystemKeyword == "lb").Id,
});
-
- await _settingService.SaveSetting(new ShoppingCartSettings
- {
+
+ await _settingService.SaveSetting(new ShoppingCartSettings {
DisplayCartAfterAddingProduct = false,
DisplayWishlistAfterAddingProduct = false,
MaximumShoppingCartItems = 1000,
@@ -394,8 +376,7 @@ namespace Grand.Business.System.Services.Installation
AllowCartItemEditing = true,
});
- await _settingService.SaveSetting(new OrderSettings
- {
+ await _settingService.SaveSetting(new OrderSettings {
IsReOrderAllowed = true,
MinOrderSubtotalAmount = 0,
MinOrderSubtotalAmountIncludingTax = false,
@@ -422,8 +403,7 @@ namespace Grand.Business.System.Services.Installation
PageSize = 10
});
- await _settingService.SaveSetting(new ShippingSettings
- {
+ await _settingService.SaveSetting(new ShippingSettings {
AllowPickUpInStore = true,
FreeShippingOverXEnabled = false,
FreeShippingOverXValue = decimal.Zero,
@@ -434,13 +414,11 @@ namespace Grand.Business.System.Services.Installation
SkipShippingMethodSelectionIfOnlyOne = false,
});
- await _settingService.SaveSetting(new ShippingProviderSettings
- {
+ await _settingService.SaveSetting(new ShippingProviderSettings {
ActiveSystemNames = new List<string> { "Shipping.FixedRate" },
});
- await _settingService.SaveSetting(new PaymentSettings
- {
+ await _settingService.SaveSetting(new PaymentSettings {
ActivePaymentProviderSystemNames = new List<string>
{
"Payments.CashOnDelivery",
@@ -453,8 +431,7 @@ namespace Grand.Business.System.Services.Installation
SkipPaymentInfo = false,
});
- await _settingService.SaveSetting(new TaxSettings
- {
+ await _settingService.SaveSetting(new TaxSettings {
TaxBasedOn = TaxBasedOn.BillingAddress,
TaxDisplayType = TaxDisplayType.ExcludingTax,
DisplayTaxSuffix = false,
@@ -480,18 +457,15 @@ namespace Grand.Business.System.Services.Installation
EuVatAssumeValid = false
});
- await _settingService.SaveSetting(new TaxProviderSettings
- {
+ await _settingService.SaveSetting(new TaxProviderSettings {
ActiveTaxProviderSystemName = "Tax.FixedRate",
});
- await _settingService.SaveSetting(new DateTimeSettings
- {
+ await _settingService.SaveSetting(new DateTimeSettings {
DefaultStoreTimeZoneId = "",
});
- await _settingService.SaveSetting(new BlogSettings
- {
+ await _settingService.SaveSetting(new BlogSettings {
Enabled = true,
PostsPageSize = 10,
AllowNotRegisteredUsersToLeaveComments = false,
@@ -502,21 +476,18 @@ namespace Grand.Business.System.Services.Installation
MaxTextSizeHomePage = 200
});
- await _settingService.SaveSetting(new KnowledgebaseSettings
- {
+ await _settingService.SaveSetting(new KnowledgebaseSettings {
Enabled = false,
AllowNotRegisteredUsersToLeaveComments = false,
NotifyAboutNewArticleComments = false
});
- await _settingService.SaveSetting(new PushNotificationsSettings
- {
+ await _settingService.SaveSetting(new PushNotificationsSettings {
Enabled = false,
AllowGuestNotifications = true
});
- await _settingService.SaveSetting(new AdminSearchSettings
- {
+ await _settingService.SaveSetting(new AdminSearchSettings {
BlogsDisplayOrder = 0,
CategoriesDisplayOrder = 0,
CustomersDisplayOrder = 0,
@@ -544,8 +515,7 @@ namespace Grand.Business.System.Services.Installation
CustomerGroupSizeLimit = 100,
});
- await _settingService.SaveSetting(new NewsSettings
- {
+ await _settingService.SaveSetting(new NewsSettings {
Enabled = true,
AllowNotRegisteredUsersToLeaveComments = false,
NotifyAboutNewNewsComments = false,
@@ -554,8 +524,7 @@ namespace Grand.Business.System.Services.Installation
NewsArchivePageSize = 10
});
- await _settingService.SaveSetting(new VendorSettings
- {
+ await _settingService.SaveSetting(new VendorSettings {
DefaultVendorPageSizeOptions = "6, 3, 9",
VendorsBlockItemsToDisplay = 0,
ShowVendorOnProductDetailsPage = true,
@@ -571,18 +540,15 @@ namespace Grand.Business.System.Services.Installation
var eaGeneral = _emailAccountRepository.Table.FirstOrDefault();
if (eaGeneral == null)
throw new Exception("Default email account cannot be loaded");
- await _settingService.SaveSetting(new EmailAccountSettings
- {
+ await _settingService.SaveSetting(new EmailAccountSettings {
DefaultEmailAccountId = eaGeneral.Id
});
- await _settingService.SaveSetting(new WidgetSettings
- {
+ await _settingService.SaveSetting(new WidgetSettings {
ActiveWidgetSystemNames = new List<string> { "Widgets.Slider" },
});
- await _settingService.SaveSetting(new GoogleAnalyticsSettings()
- {
+ await _settingService.SaveSetting(new GoogleAnalyticsSettings() {
gaprivateKey = "",
gaserviceAccountEmail = "",
gaviewID = ""
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs b/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
index c992e8d11..1c809d127 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
@@ -1,4 +1,3 @@
-using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Customers.Interfaces;
using Grand.Business.Customers.Utilities;
using Grand.Business.System.Interfaces.Installation;
@@ -127,7 +126,6 @@ namespace Grand.Business.System.Services.Installation
private readonly IRepository<OrderTag> _orderTagRepository;
private readonly IRepository<OrderStatus> _orderStatusRepository;
- private readonly IUserFieldService _userFieldService;
private readonly IWebHostEnvironment _hostingEnvironment;
private readonly IServiceProvider _serviceProvider;
@@ -137,88 +135,89 @@ namespace Grand.Business.System.Services.Installation
public InstallationService(IServiceProvider serviceProvider)
{
- _versionRepository = serviceProvider.GetRequiredService<IRepository<GrandNodeVersion>>();
- _adminRepository = serviceProvider.GetRequiredService<IRepository<AdminSiteMap>>();
- _bidRepository = serviceProvider.GetRequiredService<IRepository<Bid>>();
- _affiliateRepository = serviceProvider.GetRequiredService<IRepository<Affiliate>>();
- _campaignHistoryRepository = serviceProvider.GetRequiredService<IRepository<CampaignHistory>>();
- _orderRepository = serviceProvider.GetRequiredService<IRepository<Order>>();
- _orderNoteRepository = serviceProvider.GetRequiredService<IRepository<OrderNote>>();
- _storeRepository = serviceProvider.GetRequiredService<IRepository<Store>>();
- _measureDimensionRepository = serviceProvider.GetRequiredService<IRepository<MeasureDimension>>();
- _measureWeightRepository = serviceProvider.GetRequiredService<IRepository<MeasureWeight>>();
- _measureUnitRepository = serviceProvider.GetRequiredService<IRepository<MeasureUnit>>();
- _taxCategoryRepository = serviceProvider.GetRequiredService<IRepository<TaxCategory>>();
- _languageRepository = serviceProvider.GetRequiredService<IRepository<Language>>();
- _lsrRepository = serviceProvider.GetRequiredService<IRepository<TranslationResource>>();
- _logRepository = serviceProvider.GetRequiredService<IRepository<Log>>();
- _currencyRepository = serviceProvider.GetRequiredService<IRepository<Currency>>();
- _customerRepository = serviceProvider.GetRequiredService<IRepository<Customer>>();
- _customerGroupRepository = serviceProvider.GetRequiredService<IRepository<CustomerGroup>>();
- _customerProductRepository = serviceProvider.GetRequiredService<IRepository<CustomerProduct>>();
- _customerProductPriceRepository = serviceProvider.GetRequiredService<IRepository<CustomerProductPrice>>();
- _customerGroupProductRepository = serviceProvider.GetRequiredService<IRepository<CustomerGroupProduct>>();
- _customerTagProductRepository = serviceProvider.GetRequiredService<IRepository<CustomerTagProduct>>();
- _customerHistoryPasswordRepository = serviceProvider.GetRequiredService<IRepository<CustomerHistoryPassword>>();
- _customerNoteRepository = serviceProvider.GetRequiredService<IRepository<CustomerNote>>();
- _userapiRepository = serviceProvider.GetRequiredService<IRepository<UserApi>>();
- _specificationAttributeRepository = serviceProvider.GetRequiredService<IRepository<SpecificationAttribute>>();
- _checkoutAttributeRepository = serviceProvider.GetRequiredService<IRepository<CheckoutAttribute>>();
- _productAttributeRepository = serviceProvider.GetRequiredService<IRepository<ProductAttribute>>();
- _categoryRepository = serviceProvider.GetRequiredService<IRepository<Category>>();
- _brandRepository = serviceProvider.GetRequiredService<IRepository<Brand>>();
- _collectionRepository = serviceProvider.GetRequiredService<IRepository<Collection>>();
- _productRepository = serviceProvider.GetRequiredService<IRepository<Product>>();
- _productReservationRepository = serviceProvider.GetRequiredService<IRepository<ProductReservation>>();
- _productalsopurchasedRepository = serviceProvider.GetRequiredService<IRepository<ProductAlsoPurchased>>();
- _entityUrlRepository = serviceProvider.GetRequiredService<IRepository<EntityUrl>>();
- _emailAccountRepository = serviceProvider.GetRequiredService<IRepository<EmailAccount>>();
- _messageTemplateRepository = serviceProvider.GetRequiredService<IRepository<MessageTemplate>>();
- _countryRepository = serviceProvider.GetRequiredService<IRepository<Country>>();
- _discountRepository = serviceProvider.GetRequiredService<IRepository<Discount>>();
- _discountCouponRepository = serviceProvider.GetRequiredService<IRepository<DiscountCoupon>>();
- _blogPostRepository = serviceProvider.GetRequiredService<IRepository<BlogPost>>();
- _pageRepository = serviceProvider.GetRequiredService<IRepository<Page>>();
- _productReviewRepository = serviceProvider.GetRequiredService<IRepository<ProductReview>>();
- _newsItemRepository = serviceProvider.GetRequiredService<IRepository<NewsItem>>();
- _newslettersubscriptionRepository = serviceProvider.GetRequiredService<IRepository<NewsLetterSubscription>>();
- _shippingMethodRepository = serviceProvider.GetRequiredService<IRepository<ShippingMethod>>();
- _deliveryDateRepository = serviceProvider.GetRequiredService<IRepository<DeliveryDate>>();
- _activityLogTypeRepository = serviceProvider.GetRequiredService<IRepository<ActivityLogType>>();
- _productTagRepository = serviceProvider.GetRequiredService<IRepository<ProductTag>>();
- _productLayoutRepository = serviceProvider.GetRequiredService<IRepository<ProductLayout>>();
- _recentlyViewedProductRepository = serviceProvider.GetRequiredService<IRepository<RecentlyViewedProduct>>();
- _categoryLayoutRepository = serviceProvider.GetRequiredService<IRepository<CategoryLayout>>();
- _brandLayoutRepository = serviceProvider.GetRequiredService<IRepository<BrandLayout>>();
- _collectionLayoutRepository = serviceProvider.GetRequiredService<IRepository<CollectionLayout>>();
- _pageLayoutRepository = serviceProvider.GetRequiredService<IRepository<PageLayout>>();
- _scheduleTaskRepository = serviceProvider.GetRequiredService<IRepository<ScheduleTask>>();
- _merchandiseReturnRepository = serviceProvider.GetRequiredService<IRepository<MerchandiseReturn>>();
- _merchandiseReturnNoteRepository = serviceProvider.GetRequiredService<IRepository<MerchandiseReturnNote>>();
- _loyaltypointshistoryRepository = serviceProvider.GetRequiredService<IRepository<LoyaltyPointsHistory>>();
- _searchtermRepository = serviceProvider.GetRequiredService<IRepository<SearchTerm>>();
- _settingRepository = serviceProvider.GetRequiredService<IRepository<Setting>>();
- _shipmentRepository = serviceProvider.GetRequiredService<IRepository<Shipment>>();
- _warehouseRepository = serviceProvider.GetRequiredService<IRepository<Warehouse>>();
- _pickupPointsRepository = serviceProvider.GetRequiredService<IRepository<PickupPoint>>();
- _permissionRepository = serviceProvider.GetRequiredService<IRepository<Permission>>();
- _permissionAction = serviceProvider.GetRequiredService<IRepository<PermissionAction>>();
- _vendorRepository = serviceProvider.GetRequiredService<IRepository<Vendor>>();
- _externalAuthenticationRepository = serviceProvider.GetRequiredService<IRepository<ExternalAuthentication>>();
- _discountusageRepository = serviceProvider.GetRequiredService<IRepository<DiscountUsageHistory>>();
- _merchandiseReturnReasonRepository = serviceProvider.GetRequiredService<IRepository<MerchandiseReturnReason>>();
- _contactUsRepository = serviceProvider.GetRequiredService<IRepository<ContactUs>>();
- _merchandiseReturnActionRepository = serviceProvider.GetRequiredService<IRepository<MerchandiseReturnAction>>();
- _customerAction = serviceProvider.GetRequiredService<IRepository<CustomerAction>>();
- _customerActionType = serviceProvider.GetRequiredService<IRepository<CustomerActionType>>();
- _customerActionHistory = serviceProvider.GetRequiredService<IRepository<CustomerActionHistory>>();
- _customerReminderHistoryRepository = serviceProvider.GetRequiredService<IRepository<CustomerReminderHistory>>();
- _knowledgebaseArticleRepository = serviceProvider.GetRequiredService<IRepository<KnowledgebaseArticle>>();
- _knowledgebaseCategoryRepository = serviceProvider.GetRequiredService<IRepository<KnowledgebaseCategory>>();
- _popupArchive = serviceProvider.GetRequiredService<IRepository<PopupArchive>>();
- _orderTagRepository = serviceProvider.GetRequiredService<IRepository<OrderTag>>();
- _orderStatusRepository = serviceProvider.GetRequiredService<IRepository<OrderStatus>>();
- _userFieldService = serviceProvider.GetRequiredService<IUserFieldService>();
+ var dataProviderSettings = DataSettingsManager.LoadSettings(reloadSettings: true);
+
+ _versionRepository = new Repository<GrandNodeVersion>(dataProviderSettings.ConnectionString);
+ _adminRepository = new Repository<AdminSiteMap>(dataProviderSettings.ConnectionString);
+ _bidRepository = new Repository<Bid>(dataProviderSettings.ConnectionString);
+ _affiliateRepository = new Repository<Affiliate>(dataProviderSettings.ConnectionString);
+ _campaignHistoryRepository = new Repository<CampaignHistory>(dataProviderSettings.ConnectionString);
+ _orderRepository = new Repository<Order>(dataProviderSettings.ConnectionString);
+ _orderNoteRepository = new Repository<OrderNote>(dataProviderSettings.ConnectionString);
+ _storeRepository = new Repository<Store>(dataProviderSettings.ConnectionString);
+ _measureDimensionRepository = new Repository<MeasureDimension>(dataProviderSettings.ConnectionString);
+ _measureWeightRepository = new Repository<MeasureWeight>(dataProviderSettings.ConnectionString);
+ _measureUnitRepository = new Repository<MeasureUnit>(dataProviderSettings.ConnectionString);
+ _taxCategoryRepository = new Repository<TaxCategory>(dataProviderSettings.ConnectionString);
+ _languageRepository = new Repository<Language>(dataProviderSettings.ConnectionString);
+ _lsrRepository = new Repository<TranslationResource>(dataProviderSettings.ConnectionString);
+ _logRepository = new Repository<Log>(dataProviderSettings.ConnectionString);
+ _currencyRepository = new Repository<Currency>(dataProviderSettings.ConnectionString);
+ _customerRepository = new Repository<Customer>(dataProviderSettings.ConnectionString);
+ _customerGroupRepository = new Repository<CustomerGroup>(dataProviderSettings.ConnectionString);
+ _customerProductRepository = new Repository<CustomerProduct>(dataProviderSettings.ConnectionString);
+ _customerProductPriceRepository = new Repository<CustomerProductPrice>(dataProviderSettings.ConnectionString);
+ _customerGroupProductRepository = new Repository<CustomerGroupProduct>(dataProviderSettings.ConnectionString);
+ _customerTagProductRepository = new Repository<CustomerTagProduct>(dataProviderSettings.ConnectionString);
+ _customerHistoryPasswordRepository = new Repository<CustomerHistoryPassword>(dataProviderSettings.ConnectionString);
+ _customerNoteRepository = new Repository<CustomerNote>(dataProviderSettings.ConnectionString);
+ _userapiRepository = new Repository<UserApi>(dataProviderSettings.ConnectionString);
+ _specificationAttributeRepository = new Repository<SpecificationAttribute>(dataProviderSettings.ConnectionString);
+ _checkoutAttributeRepository = new Repository<CheckoutAttribute>(dataProviderSettings.ConnectionString);
+ _productAttributeRepository = new Repository<ProductAttribute>(dataProviderSettings.ConnectionString);
+ _categoryRepository = new Repository<Category>(dataProviderSettings.ConnectionString);
+ _brandRepository = new Repository<Brand>(dataProviderSettings.ConnectionString);
+ _collectionRepository = new Repository<Collection>(dataProviderSettings.ConnectionString);
+ _productRepository = new Repository<Product>(dataProviderSettings.ConnectionString);
+ _productReservationRepository = new Repository<ProductReservation>(dataProviderSettings.ConnectionString);
+ _productalsopurchasedRepository = new Repository<ProductAlsoPurchased>(dataProviderSettings.ConnectionString);
+ _entityUrlRepository = new Repository<EntityUrl>(dataProviderSettings.ConnectionString);
+ _emailAccountRepository = new Repository<EmailAccount>(dataProviderSettings.ConnectionString);
+ _messageTemplateRepository = new Repository<MessageTemplate>(dataProviderSettings.ConnectionString);
+ _countryRepository = new Repository<Country>(dataProviderSettings.ConnectionString);
+ _discountRepository = new Repository<Discount>(dataProviderSettings.ConnectionString);
+ _discountCouponRepository = new Repository<DiscountCoupon>(dataProviderSettings.ConnectionString);
+ _blogPostRepository = new Repository<BlogPost>(dataProviderSettings.ConnectionString);
+ _pageRepository = new Repository<Page>(dataProviderSettings.ConnectionString);
+ _productReviewRepository = new Repository<ProductReview>(dataProviderSettings.ConnectionString);
+ _newsItemRepository = new Repository<NewsItem>(dataProviderSettings.ConnectionString);
+ _newslettersubscriptionRepository = new Repository<NewsLetterSubscription>(dataProviderSettings.ConnectionString);
+ _shippingMethodRepository = new Repository<ShippingMethod>(dataProviderSettings.ConnectionString);
+ _deliveryDateRepository = new Repository<DeliveryDate>(dataProviderSettings.ConnectionString);
+ _activityLogTypeRepository = new Repository<ActivityLogType>(dataProviderSettings.ConnectionString);
+ _productTagRepository = new Repository<ProductTag>(dataProviderSettings.ConnectionString);
+ _productLayoutRepository = new Repository<ProductLayout>(dataProviderSettings.ConnectionString);
+ _recentlyViewedProductRepository = new Repository<RecentlyViewedProduct>(dataProviderSettings.ConnectionString);
+ _categoryLayoutRepository = new Repository<CategoryLayout>(dataProviderSettings.ConnectionString);
+ _brandLayoutRepository = new Repository<BrandLayout>(dataProviderSettings.ConnectionString);
+ _collectionLayoutRepository = new Repository<CollectionLayout>(dataProviderSettings.ConnectionString);
+ _pageLayoutRepository = new Repository<PageLayout>(dataProviderSettings.ConnectionString);
+ _scheduleTaskRepository = new Repository<ScheduleTask>(dataProviderSettings.ConnectionString);
+ _merchandiseReturnRepository = new Repository<MerchandiseReturn>(dataProviderSettings.ConnectionString);
+ _merchandiseReturnNoteRepository = new Repository<MerchandiseReturnNote>(dataProviderSettings.ConnectionString);
+ _loyaltypointshistoryRepository = new Repository<LoyaltyPointsHistory>(dataProviderSettings.ConnectionString);
+ _searchtermRepository = new Repository<SearchTerm>(dataProviderSettings.ConnectionString);
+ _settingRepository = new Repository<Setting>(dataProviderSettings.ConnectionString);
+ _shipmentRepository = new Repository<Shipment>(dataProviderSettings.ConnectionString);
+ _warehouseRepository = new Repository<Warehouse>(dataProviderSettings.ConnectionString);
+ _pickupPointsRepository = new Repository<PickupPoint>(dataProviderSettings.ConnectionString);
+ _permissionRepository = new Repository<Permission>(dataProviderSettings.ConnectionString);
+ _permissionAction = new Repository<PermissionAction>(dataProviderSettings.ConnectionString);
+ _vendorRepository = new Repository<Vendor>(dataProviderSettings.ConnectionString);
+ _externalAuthenticationRepository = new Repository<ExternalAuthentication>(dataProviderSettings.ConnectionString);
+ _discountusageRepository = new Repository<DiscountUsageHistory>(dataProviderSettings.ConnectionString);
+ _merchandiseReturnReasonRepository = new Repository<MerchandiseReturnReason>(dataProviderSettings.ConnectionString);
+ _contactUsRepository = new Repository<ContactUs>(dataProviderSettings.ConnectionString);
+ _merchandiseReturnActionRepository = new Repository<MerchandiseReturnAction>(dataProviderSettings.ConnectionString);
+ _customerAction = new Repository<CustomerAction>(dataProviderSettings.ConnectionString);
+ _customerActionType = new Repository<CustomerActionType>(dataProviderSettings.ConnectionString);
+ _customerActionHistory = new Repository<CustomerActionHistory>(dataProviderSettings.ConnectionString);
+ _customerReminderHistoryRepository = new Repository<CustomerReminderHistory>(dataProviderSettings.ConnectionString);
+ _knowledgebaseArticleRepository = new Repository<KnowledgebaseArticle>(dataProviderSettings.ConnectionString);
+ _knowledgebaseCategoryRepository = new Repository<KnowledgebaseCategory>(dataProviderSettings.ConnectionString);
+ _popupArchive = new Repository<PopupArchive>(dataProviderSettings.ConnectionString);
+ _orderTagRepository = new Repository<OrderTag>(dataProviderSettings.ConnectionString);
+ _orderStatusRepository = new Repository<OrderStatus>(dataProviderSettings.ConnectionString);
_hostingEnvironment = serviceProvider.GetRequiredService<IWebHostEnvironment>();
_serviceProvider = serviceProvider;
@@ -453,8 +452,7 @@ namespace Grand.Business.System.Services.Installation
var options = new CreateCollectionOptions();
var collation = new Collation(local);
options.Collation = collation;
- var dataSettingsManager = new DataSettingsManager();
- var connectionString = dataSettingsManager.LoadSettings().ConnectionString;
+ var connectionString = DataSettingsManager.LoadSettings().ConnectionString;
var mongourl = new MongoUrl(connectionString);
var databaseName = mongourl.DatabaseName;
@@ -481,7 +479,8 @@ namespace Grand.Business.System.Services.Installation
public virtual async Task InstallData(string defaultUserEmail,
- string defaultUserPassword, string collation, bool installSampleData = true, string companyName = "", string companyAddress = "", string companyPhoneNumber = "", string companyEmail = "")
+ string defaultUserPassword, string collation, bool installSampleData = true, string companyName = "", string companyAddress = "",
+ string companyPhoneNumber = "", string companyEmail = "")
{
defaultUserEmail = defaultUserEmail.ToLower();
diff --git a/src/Business/Grand.Business.System/Startup/StartupApplication.cs b/src/Business/Grand.Business.System/Startup/StartupApplication.cs
index b7fd364a4..d45f406c6 100644
--- a/src/Business/Grand.Business.System/Startup/StartupApplication.cs
+++ b/src/Business/Grand.Business.System/Startup/StartupApplication.cs
@@ -13,7 +13,6 @@ using Grand.Business.System.Services.Reports;
using Grand.Domain.Data;
using Grand.Infrastructure;
using Grand.Infrastructure.Configuration;
-using Grand.Infrastructure.Data;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
@@ -85,7 +84,7 @@ namespace Grand.Business.System.Startup
private void RegisterInstallService(IServiceCollection serviceCollection)
{
- var databaseInstalled = DataSettingsHelper.DatabaseIsInstalled();
+ var databaseInstalled = DataSettingsManager.DatabaseIsInstalled();
if (!databaseInstalled)
{
//installation service
diff --git a/src/Core/Grand.Domain/Data/DataSettingsHelper.cs b/src/Core/Grand.Domain/Data/DataSettingsHelper.cs
deleted file mode 100644
index bba199d8d..000000000
--- a/src/Core/Grand.Domain/Data/DataSettingsHelper.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-namespace Grand.Domain.Data
-{
- /// <summary>
- /// Data settings helper
- /// </summary>
- public static class DataSettingsHelper
- {
- private static bool? _databaseIsInstalled;
- private static string _connectionString;
- /// <summary>
- /// Returns a value indicating whether database is already installed
- /// </summary>
- /// <returns></returns>
- public static bool DatabaseIsInstalled()
- {
- if (!_databaseIsInstalled.HasValue)
- {
- var manager = new DataSettingsManager();
- var settings = manager.LoadSettings();
- _databaseIsInstalled = settings != null && !string.IsNullOrEmpty(settings.ConnectionString);
- if (!string.IsNullOrEmpty(settings.ConnectionString))
- _connectionString = settings.ConnectionString;
- }
- return _databaseIsInstalled.Value;
- }
- public static void InitConnectionString()
- {
- var manager = new DataSettingsManager();
- var settings = manager.LoadSettings();
- if (!string.IsNullOrEmpty(settings.ConnectionString))
- _connectionString = settings.ConnectionString;
- }
- public static string ConnectionString()
- {
- return _connectionString;
- }
-
- public static void ResetCache()
- {
- _databaseIsInstalled = false;
- }
-
- }
-}
diff --git a/src/Core/Grand.Domain/Data/DataSettingsManager.cs b/src/Core/Grand.Domain/Data/DataSettingsManager.cs
index 2545e96e2..4cfd4515f 100644
--- a/src/Core/Grand.Domain/Data/DataSettingsManager.cs
+++ b/src/Core/Grand.Domain/Data/DataSettingsManager.cs
@@ -9,15 +9,17 @@ namespace Grand.Domain.Data
/// <summary>
/// Manager of data settings (connection string)
/// </summary>
- public partial class DataSettingsManager
+ public static class DataSettingsManager
{
- private DataSettings _dataSettings;
+ private static DataSettings _dataSettings;
+
+ private static bool? _databaseIsInstalled;
/// <summary>
/// Load settings
/// </summary>
- public virtual DataSettings LoadSettings(bool reloadSettings = false)
+ public static DataSettings LoadSettings(bool reloadSettings = false)
{
if (!reloadSettings && _dataSettings != null)
return _dataSettings;
@@ -40,11 +42,30 @@ namespace Grand.Domain.Data
return _dataSettings;
}
+ /// <summary>
+ /// Returns a value indicating whether database is already installed
+ /// </summary>
+ /// <returns></returns>
+ public static bool DatabaseIsInstalled()
+ {
+ if (!_databaseIsInstalled.HasValue)
+ {
+ var settings = _dataSettings ?? LoadSettings();
+ _databaseIsInstalled = settings != null && !string.IsNullOrEmpty(settings.ConnectionString);
+ }
+ return _databaseIsInstalled.Value;
+ }
+
+ public static void ResetCache()
+ {
+ _databaseIsInstalled = false;
+ }
+
/// <summary>
/// Save settings to a file
/// </summary>
/// <param name="settings"></param>
- public virtual async Task SaveSettings(DataSettings settings)
+ public static async Task SaveSettings(DataSettings settings)
{
var filePath = CommonPath.SettingsPath;
if (!File.Exists(filePath))
diff --git a/src/Core/Grand.Domain/Data/IDataProvider.cs b/src/Core/Grand.Domain/Data/IDataProvider.cs
deleted file mode 100644
index 4afef8ebb..000000000
--- a/src/Core/Grand.Domain/Data/IDataProvider.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-
-namespace Grand.Domain.Data
-{
- /// <summary>
- /// Data provider interface
- /// </summary>
- public interface IDataProvider
- {
- /// <summary>
- /// Initialize database
- /// </summary>
- void InitDatabase();
-
- /// <summary>
- /// Get connetction string
- /// </summary>
- public string ConnectionString { get; }
- }
-}
diff --git a/src/Core/Grand.Domain/Data/IMongoDBContext.cs b/src/Core/Grand.Domain/Data/IMongoDBContext.cs
index 5e84b4ef5..06718d515 100644
--- a/src/Core/Grand.Domain/Data/IMongoDBContext.cs
+++ b/src/Core/Grand.Domain/Data/IMongoDBContext.cs
@@ -1,6 +1,5 @@
using MongoDB.Bson;
using MongoDB.Driver;
-using MongoDB.Driver.Linq;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
diff --git a/src/Core/Grand.Domain/Data/MongoDBContext.cs b/src/Core/Grand.Domain/Data/MongoDBContext.cs
index ef7f2fc78..a8a9e8510 100644
--- a/src/Core/Grand.Domain/Data/MongoDBContext.cs
+++ b/src/Core/Grand.Domain/Data/MongoDBContext.cs
@@ -35,8 +35,7 @@ namespace Grand.Domain.Data
protected IMongoDatabase TryReadMongoDatabase()
{
- var dataSettingsManager = new DataSettingsManager();
- var connectionString = dataSettingsManager.LoadSettings().ConnectionString;
+ var connectionString = DataSettingsManager.LoadSettings().ConnectionString;
var mongourl = new MongoUrl(connectionString);
var databaseName = mongourl.DatabaseName;
diff --git a/src/Core/Grand.Domain/Data/Repository.cs b/src/Core/Grand.Domain/Data/Repository.cs
index 8084e89d8..4ab4e2766 100644
--- a/src/Core/Grand.Domain/Data/Repository.cs
+++ b/src/Core/Grand.Domain/Data/Repository.cs
@@ -50,15 +50,18 @@ namespace Grand.Domain.Data
#endregion
#region Ctor
+
/// <summary>
/// Ctor
/// </summary>
- public Repository(IDataProvider dataProvider)
+ public Repository()
{
- if (!string.IsNullOrEmpty(dataProvider.ConnectionString))
+ var connection = DataSettingsManager.LoadSettings();
+
+ if (!string.IsNullOrEmpty(connection.ConnectionString))
{
- var client = new MongoClient(dataProvider.ConnectionString);
- var databaseName = new MongoUrl(dataProvider.ConnectionString).DatabaseName;
+ var client = new MongoClient(connection.ConnectionString);
+ var databaseName = new MongoUrl(connection.ConnectionString).DatabaseName;
_database = client.GetDatabase(databaseName);
_collection = _database.GetCollection<T>(typeof(T).Name);
}
diff --git a/src/Core/Grand.Infrastructure/Data/BaseDataProviderManager.cs b/src/Core/Grand.Infrastructure/Data/BaseDataProviderManager.cs
deleted file mode 100644
index 3c27ba490..000000000
--- a/src/Core/Grand.Infrastructure/Data/BaseDataProviderManager.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Grand.Domain.Data;
-using System;
-
-namespace Grand.Infrastructure.Data
-{
- /// <summary>
- /// Base data provider manager
- /// </summary>
- public abstract class BaseDataProviderManager
- {
- /// <summary>
- /// Ctor
- /// </summary>
- /// <param name="settings">Data settings</param>
- protected BaseDataProviderManager(DataSettings settings)
- {
- if (settings == null)
- throw new ArgumentNullException(nameof(settings));
-
- Settings = settings;
- }
-
- /// <summary>
- /// Gets or sets settings
- /// </summary>
- protected DataSettings Settings { get; private set; }
-
- /// <summary>
- /// Load data provider
- /// </summary>
- /// <returns>Data provider</returns>
- public abstract IDataProvider LoadDataProvider();
- }
-}
diff --git a/src/Core/Grand.Infrastructure/Data/MongoDBDataProvider.cs b/src/Core/Grand.Infrastructure/Data/MongoDBDataProvider.cs
deleted file mode 100644
index 5b0d9d272..000000000
--- a/src/Core/Grand.Infrastructure/Data/MongoDBDataProvider.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Grand.Domain.Data;
-
-namespace Grand.Infrastructure.Data
-{
- public class MongoDBDataProvider : IDataProvider
- {
- #region Methods
-
- /// <summary>
- /// Initialize database
- /// </summary>
- public virtual void InitDatabase()
- {
- DataSettingsHelper.InitConnectionString();
- }
-
- #endregion
-
- public string ConnectionString => DataSettingsHelper.ConnectionString();
-
- }
-}
diff --git a/src/Core/Grand.Infrastructure/Data/MongoDBDataProviderManager.cs b/src/Core/Grand.Infrastructure/Data/MongoDBDataProviderManager.cs
deleted file mode 100644
index e184e627f..000000000
--- a/src/Core/Grand.Infrastructure/Data/MongoDBDataProviderManager.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Grand.Domain.Data;
-
-namespace Grand.Infrastructure.Data
-{
- public partial class MongoDBDataProviderManager : BaseDataProviderManager
- {
- public MongoDBDataProviderManager(DataSettings settings) : base(settings)
- {
- }
-
- public override IDataProvider LoadDataProvider()
- {
- return new MongoDBDataProvider();
- }
- }
-}
diff --git a/src/Core/Grand.Infrastructure/Data/StartupApplication.cs b/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs
similarity index 73%
rename from src/Core/Grand.Infrastructure/Data/StartupApplication.cs
rename to src/Core/Grand.Infrastructure/Startup/StartupApplication.cs
index f911269f1..ad4380091 100644
--- a/src/Core/Grand.Infrastructure/Data/StartupApplication.cs
+++ b/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using MongoDB.Driver;
-namespace Grand.Infrastructure.Data
+namespace Grand.Infrastructure.Startup
{
public class StartupApplication : IStartupApplication
{
@@ -26,13 +26,10 @@ namespace Grand.Infrastructure.Data
private void RegisterDataLayer(IServiceCollection serviceCollection)
{
- var dataSettingsManager = new DataSettingsManager();
- var dataProviderSettings = dataSettingsManager.LoadSettings();
+ var dataProviderSettings = DataSettingsManager.LoadSettings();
if (string.IsNullOrEmpty(dataProviderSettings.ConnectionString))
{
- serviceCollection.AddTransient(c => dataSettingsManager.LoadSettings());
- serviceCollection.AddTransient<BaseDataProviderManager>(c => new MongoDBDataProviderManager(c.GetRequiredService<DataSettings>()));
- serviceCollection.AddTransient<IDataProvider>(x => x.GetRequiredService<BaseDataProviderManager>().LoadDataProvider());
+ serviceCollection.AddTransient(c => dataProviderSettings);
}
if (dataProviderSettings != null && dataProviderSettings.IsValid())
{
diff --git a/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs b/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs
index b2e26194c..0372578a8 100644
--- a/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs
+++ b/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs
@@ -1,7 +1,6 @@
using Grand.Business.Authentication.Interfaces;
using Grand.Domain.Configuration;
using Grand.Domain.Data;
-using Grand.Infrastructure.Data;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Facebook;
using Microsoft.AspNetCore.Authentication.OAuth;
@@ -29,10 +28,12 @@ namespace Authentication.Facebook.Infrastructure
{
builder.AddFacebook(FacebookDefaults.AuthenticationScheme, options =>
{
+ var connection = DataSettingsManager.LoadSettings();
+
var settings = new FacebookExternalAuthSettings();
try
{
- var fbSettings = new Repository<Setting>(DataSettingsHelper.ConnectionString()).Table.Where(x => x.Name.StartsWith("facebookexternalauthsettings"));
+ var fbSettings = new Repository<Setting>(connection.ConnectionString).Table.Where(x => x.Name.StartsWith("facebookexternalauthsettings"));
if (fbSettings.Any())
{
var metadata = fbSettings.FirstOrDefault().Metadata;
diff --git a/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs b/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs
index bc2ef6801..cc14161f5 100644
--- a/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs
+++ b/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs
@@ -1,7 +1,6 @@
using Grand.Business.Authentication.Interfaces;
using Grand.Domain.Configuration;
using Grand.Domain.Data;
-using Grand.Infrastructure.Data;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Google;
using Microsoft.AspNetCore.Authentication.OAuth;
@@ -29,10 +28,12 @@ namespace Authentication.Google.Infrastructure
{
builder.AddGoogle(GoogleDefaults.AuthenticationScheme, options =>
{
+ var connection = DataSettingsManager.LoadSettings();
+
var settings = new GoogleExternalAuthSettings();
try
{
- var gSettings = new Repository<Setting>(DataSettingsHelper.ConnectionString()).Table.Where(x => x.Name.StartsWith("googleexternalauthsettings"));
+ var gSettings = new Repository<Setting>(connection.ConnectionString).Table.Where(x => x.Name.StartsWith("googleexternalauthsettings"));
if (gSettings.Any())
{
var metadata = gSettings.FirstOrDefault().Metadata;
diff --git a/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs b/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs
index d4060bb90..8b6f7a200 100644
--- a/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs
@@ -95,7 +95,7 @@ namespace Grand.Web.Common.Filters
if (request?.Query == null || !request.Query.Any())
return;
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
//try to find by ID
diff --git a/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs b/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs
index a544d8acb..8fa031e5e 100644
--- a/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs
@@ -77,7 +77,7 @@ namespace Grand.Web.Common.Filters
if (actionFilter?.IgnoreFilter ?? _ignoreFilter)
return;
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
//there is AdminAuthorizeFilter, so check access
diff --git a/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs b/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs
index 1297dfd54..9536d95fc 100644
--- a/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs
@@ -74,7 +74,7 @@ namespace Grand.Web.Common.Filters
if (actionFilter?.IgnoreFilter ?? _ignoreFilter)
return;
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
//whether current customer is vendor
diff --git a/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs b/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs
index f50650936..4adecc0b8 100644
--- a/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs
@@ -91,7 +91,7 @@ namespace Grand.Web.Common.Filters
return;
}
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
{
await next();
return;
diff --git a/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs b/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs
index 42c78916b..f416f3890 100644
--- a/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs
@@ -79,7 +79,7 @@ namespace Grand.Web.Common.Filters
if (context == null || context.HttpContext == null || context.HttpContext.Request == null)
return;
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
//only in GET requests
diff --git a/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs b/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs
index 3283604bd..0000355ec 100644
--- a/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs
@@ -68,7 +68,7 @@ namespace Grand.Web.Common.Filters
return;
}
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
{
await next();
return;
diff --git a/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs b/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs
index d8a0a59ea..920dc5215 100644
--- a/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs
@@ -58,7 +58,7 @@ namespace Grand.Web.Common.Filters
if (context == null || context.HttpContext == null || context.HttpContext.Request == null)
return;
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
//get action and controller names
diff --git a/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs b/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs
index 144bcd601..796e7b959 100644
--- a/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs
@@ -77,7 +77,7 @@ namespace Grand.Web.Common.Filters
if (actionFilter?.IgnoreFilter ?? _ignoreFilter)
return;
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
//check whether current customer has access to a public store
diff --git a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs
index 656a622ec..c59d8c0cf 100644
--- a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs
+++ b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs
@@ -72,7 +72,7 @@ namespace Grand.Web.Common.Infrastructure
try
{
//check whether database is installed
- if (DataSettingsHelper.DatabaseIsInstalled())
+ if (DataSettingsManager.DatabaseIsInstalled())
{
var logger = context.RequestServices.GetRequiredService<ILogger>();
//get current customer
@@ -237,7 +237,7 @@ namespace Grand.Web.Common.Infrastructure
public static void UseProfiler(this IApplicationBuilder application)
{
//whether database is already installed
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
var appConfig = application.ApplicationServices.GetRequiredService<AppConfig>();
@@ -255,7 +255,7 @@ namespace Grand.Web.Common.Infrastructure
public static void LogApplicationStarted(this IApplicationBuilder application)
{
//whether database is already installed
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
var serviceProvider = application.ApplicationServices;
diff --git a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
index fb0b42f89..f2584da5e 100644
--- a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
+++ b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
@@ -60,7 +60,7 @@ namespace Grand.Web.Common.Infrastructure
options.Cookie = new CookieBuilder() {
Name = $"{config.CookiePrefix}Antiforgery"
};
- if (DataSettingsHelper.DatabaseIsInstalled())
+ if (DataSettingsManager.DatabaseIsInstalled())
{
//whether to allow the use of anti-forgery cookies from SSL protected page on the other store pages which are not
options.Cookie.SecurePolicy = config.CookieSecurePolicyAlways ? CookieSecurePolicy.Always : CookieSecurePolicy.SameAsRequest;
@@ -81,7 +81,7 @@ namespace Grand.Web.Common.Infrastructure
Name = $"{config.CookiePrefix}Session",
HttpOnly = true,
};
- if (DataSettingsHelper.DatabaseIsInstalled())
+ if (DataSettingsManager.DatabaseIsInstalled())
{
options.Cookie.SecurePolicy = config.CookieSecurePolicyAlways ? CookieSecurePolicy.Always : CookieSecurePolicy.SameAsRequest;
}
@@ -94,7 +94,7 @@ namespace Grand.Web.Common.Infrastructure
/// <param name="services">Collection of service descriptors</param>
public static void AddThemes(this IServiceCollection services)
{
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
//themes support
@@ -236,7 +236,7 @@ namespace Grand.Web.Common.Infrastructure
public static void AddGrandMiniProfiler(this IServiceCollection services)
{
//whether database is already installed
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
//add MiniProfiler services
@@ -286,11 +286,15 @@ namespace Grand.Web.Common.Infrastructure
public static void AddGrandHealthChecks(this IServiceCollection services)
{
- var hcBuilder = services.AddHealthChecks();
- hcBuilder.AddCheck("self", () => HealthCheckResult.Healthy());
- hcBuilder.AddMongoDb(DataSettingsHelper.ConnectionString(),
- name: "mongodb-check",
- tags: new string[] { "mongodb" });
+ var connection = DataSettingsManager.LoadSettings();
+ if (connection.DbProvider == DbProvider.MongoDB)
+ {
+ var hcBuilder = services.AddHealthChecks();
+ hcBuilder.AddCheck("self", () => HealthCheckResult.Healthy());
+ hcBuilder.AddMongoDb(connection.ConnectionString,
+ name: "mongodb-check",
+ tags: new string[] { "mongodb" });
+ }
}
public static void AddHtmlMinification(this IServiceCollection services, IConfiguration configuration)
@@ -357,7 +361,7 @@ namespace Grand.Web.Common.Infrastructure
/// <param name="services">Collection of service descriptors</param>
public static void AddWebEncoder(this IServiceCollection services)
{
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
services.Configure<WebEncoderOptions>(options =>
@@ -384,7 +388,7 @@ namespace Grand.Web.Common.Infrastructure
/// <param name="services">Collection of service descriptors</param>
public static void AddPWA(this IServiceCollection services, IConfiguration configuration)
{
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
var config = new AppConfig();
diff --git a/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs b/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs
index 2a4a6ebf0..441c0cbe6 100644
--- a/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs
+++ b/src/Web/Grand.Web.Common/Middleware/InstallUrlMiddleware.cs
@@ -34,7 +34,7 @@ namespace Grand.Web.Common.Middleware
public async Task InvokeAsync(HttpContext context)
{
//whether database is installed
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
{
var installUrl = $"/install";
if (!context.Request.GetEncodedPathAndQuery().StartsWith(installUrl, StringComparison.OrdinalIgnoreCase))
diff --git a/src/Web/Grand.Web.Common/Startup/AuthenticationStartup.cs b/src/Web/Grand.Web.Common/Startup/AuthenticationStartup.cs
index ee8b59522..d4cd15485 100644
--- a/src/Web/Grand.Web.Common/Startup/AuthenticationStartup.cs
+++ b/src/Web/Grand.Web.Common/Startup/AuthenticationStartup.cs
@@ -36,7 +36,7 @@ namespace Grand.Web.Common.Startup
public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)
{
//check whether database is installed
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
//configure authentication
diff --git a/src/Web/Grand.Web.Common/Startup/DbCheckStartup.cs b/src/Web/Grand.Web.Common/Startup/DbCheckStartup.cs
index 0ff86936e..10fdc5996 100644
--- a/src/Web/Grand.Web.Common/Startup/DbCheckStartup.cs
+++ b/src/Web/Grand.Web.Common/Startup/DbCheckStartup.cs
@@ -15,7 +15,7 @@ namespace Grand.Web.Common.Startup
public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)
{
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
application.UseMiddleware<DbVersionCheckMiddleware>();
diff --git a/src/Web/Grand.Web.Common/Startup/ForwardedHeadersStartup.cs b/src/Web/Grand.Web.Common/Startup/ForwardedHeadersStartup.cs
index fb2f7e102..785ad501e 100644
--- a/src/Web/Grand.Web.Common/Startup/ForwardedHeadersStartup.cs
+++ b/src/Web/Grand.Web.Common/Startup/ForwardedHeadersStartup.cs
@@ -29,7 +29,7 @@ namespace Grand.Web.Common.Startup
public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)
{
//check whether database is installed
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
var serviceProvider = application.ApplicationServices;
diff --git a/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.cs b/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.cs
index 58e62a7db..88cc5f008 100644
--- a/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.cs
+++ b/src/Web/Grand.Web.Common/Startup/HostFilteringStartup.cs
@@ -1,6 +1,5 @@
using Grand.Domain.Data;
using Grand.Infrastructure;
-using Grand.Infrastructure.Data;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.HostFiltering;
using Microsoft.AspNetCore.Hosting;
@@ -37,7 +36,7 @@ namespace Grand.Web.Common.Startup
public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)
{
//check whether database is installed
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
//configure authentication
diff --git a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs b/src/Web/Grand.Web.Common/Startup/StartupApplication.cs
index 392873d84..c6bf7a7f6 100644
--- a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs
+++ b/src/Web/Grand.Web.Common/Startup/StartupApplication.cs
@@ -6,7 +6,6 @@ using Grand.Infrastructure.Caching.Message;
using Grand.Infrastructure.Caching.RabbitMq;
using Grand.Infrastructure.Caching.Redis;
using Grand.Infrastructure.Configuration;
-using Grand.Infrastructure.Data;
using Grand.Infrastructure.TypeSearchers;
using Grand.Infrastructure.Validators;
using Grand.Web.Common.Localization;
@@ -122,7 +121,7 @@ namespace Grand.Web.Common.Startup
serviceCollection.AddScoped<IResourceManager, ResourceManager>();
- if (DataSettingsHelper.DatabaseIsInstalled())
+ if (DataSettingsManager.DatabaseIsInstalled())
serviceCollection.AddScoped<LocService>();
else
{
diff --git a/src/Web/Grand.Web.Common/Startup/TaskHandlerStartup.cs b/src/Web/Grand.Web.Common/Startup/TaskHandlerStartup.cs
index 54fbc1ed1..1dbe96ef7 100644
--- a/src/Web/Grand.Web.Common/Startup/TaskHandlerStartup.cs
+++ b/src/Web/Grand.Web.Common/Startup/TaskHandlerStartup.cs
@@ -36,7 +36,7 @@ namespace Grand.Web.Common.Startup
public void ConfigureServices(IServiceCollection services, IConfiguration configuration)
{
//database is already installed, so start scheduled tasks
- if (DataSettingsHelper.DatabaseIsInstalled())
+ if (DataSettingsManager.DatabaseIsInstalled())
{
var typeSearcher = new AppTypeSearcher();
var scheduleTasks = typeSearcher.ClassesOfType<IScheduleTask>();
diff --git a/src/Web/Grand.Web/Controllers/InstallController.cs b/src/Web/Grand.Web/Controllers/InstallController.cs
index 8aaad6eee..7643e8f9c 100644
--- a/src/Web/Grand.Web/Controllers/InstallController.cs
+++ b/src/Web/Grand.Web/Controllers/InstallController.cs
@@ -5,7 +5,6 @@ using Grand.Business.System.Commands.Models.Security;
using Grand.Business.System.Interfaces.Installation;
using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
-using Grand.Infrastructure.Data;
using Grand.Infrastructure.Plugins;
using Grand.SharedKernel.Extensions;
using Grand.Web.Models.Install;
@@ -52,7 +51,7 @@ namespace Grand.Web.Controllers
public virtual async Task<IActionResult> Index()
{
- if (DataSettingsHelper.DatabaseIsInstalled())
+ if (DataSettingsManager.DatabaseIsInstalled())
return RedirectToRoute("HomePage");
var locService = _serviceProvider.GetRequiredService<IInstallationLocalizedService>();
@@ -93,7 +92,7 @@ namespace Grand.Web.Controllers
[HttpPost]
public virtual async Task<IActionResult> Index(InstallModel model)
{
- if (DataSettingsHelper.DatabaseIsInstalled())
+ if (DataSettingsManager.DatabaseIsInstalled())
return RedirectToRoute("HomePage");
var locService = _serviceProvider.GetRequiredService<IInstallationLocalizedService>();
@@ -151,7 +150,6 @@ namespace Grand.Web.Controllers
if (ModelState.IsValid)
{
- var settingsManager = new DataSettingsManager();
try
{
//save settings
@@ -160,19 +158,13 @@ namespace Grand.Web.Controllers
ConnectionString = connectionString,
DbProvider = DbProvider.MongoDB
};
- await settingsManager.SaveSettings(settings);
-
- var dataProviderInstance = _serviceProvider.GetRequiredService<BaseDataProviderManager>().LoadDataProvider();
- dataProviderInstance.InitDatabase();
-
- var dataSettingsManager = new DataSettingsManager();
- var dataProviderSettings = dataSettingsManager.LoadSettings(reloadSettings: true);
+ await DataSettingsManager.SaveSettings(settings);
var installationService = _serviceProvider.GetRequiredService<IInstallationService>();
await installationService.InstallData(model.AdminEmail, model.AdminPassword, model.Collation, model.InstallSampleData, model.CompanyName, model.CompanyAddress, model.CompanyPhoneNumber, model.CompanyEmail);
//reset cache
- DataSettingsHelper.ResetCache();
+ DataSettingsManager.ResetCache();
PluginManager.ClearPlugins();
@@ -209,7 +201,7 @@ namespace Grand.Web.Controllers
catch (Exception exception)
{
//reset cache
- DataSettingsHelper.ResetCache();
+ DataSettingsManager.ResetCache();
await _cacheBase.Clear();
System.IO.File.Delete(CommonPath.SettingsPath);
@@ -245,7 +237,7 @@ namespace Grand.Web.Controllers
public virtual IActionResult ChangeLanguage(string language)
{
- if (DataSettingsHelper.DatabaseIsInstalled())
+ if (DataSettingsManager.DatabaseIsInstalled())
return RedirectToRoute("HomePage");
var locService = _serviceProvider.GetRequiredService<IInstallationLocalizedService>();
@@ -257,7 +249,7 @@ namespace Grand.Web.Controllers
public virtual IActionResult RestartInstall()
{
- if (DataSettingsHelper.DatabaseIsInstalled())
+ if (DataSettingsManager.DatabaseIsInstalled())
return RedirectToRoute("HomePage");
//stop application
diff --git a/src/Web/Grand.Web/Endpoints/EndpointProvider.cs b/src/Web/Grand.Web/Endpoints/EndpointProvider.cs
index 54f23aafe..5d9c89c46 100644
--- a/src/Web/Grand.Web/Endpoints/EndpointProvider.cs
+++ b/src/Web/Grand.Web/Endpoints/EndpointProvider.cs
@@ -12,7 +12,7 @@ namespace Grand.Web.Endpoints
public void RegisterEndpoint(IEndpointRouteBuilder endpointRouteBuilder)
{
var pattern = "";
- if (DataSettingsHelper.DatabaseIsInstalled())
+ if (DataSettingsManager.DatabaseIsInstalled())
{
var config = endpointRouteBuilder.ServiceProvider.GetRequiredService<AppConfig>();
if (config.SeoFriendlyUrlsForLanguagesEnabled)
diff --git a/src/Web/Grand.Web/Endpoints/SlugEndpointProvider.cs b/src/Web/Grand.Web/Endpoints/SlugEndpointProvider.cs
index cd0d830ca..4a97dc48d 100644
--- a/src/Web/Grand.Web/Endpoints/SlugEndpointProvider.cs
+++ b/src/Web/Grand.Web/Endpoints/SlugEndpointProvider.cs
@@ -12,7 +12,7 @@ namespace Grand.Web.Endpoints
{
public void RegisterEndpoint(IEndpointRouteBuilder endpointRouteBuilder)
{
- if (!DataSettingsHelper.DatabaseIsInstalled())
+ if (!DataSettingsManager.DatabaseIsInstalled())
return;
var pattern = "{**SeName}";