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.

Setting - change type for metadata

KrzysztofPajak4ab2f4e8e88d
diff --git a/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs b/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
index 2cb81c169..00155f544 100644
--- a/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
+++ b/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
@@ -3,10 +3,10 @@ using Grand.Domain.Configuration;
using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
-using MongoDB.Bson;
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Text.Json;
using System.Threading.Tasks;
namespace Grand.Business.Common.Services.Configuration
@@ -148,7 +148,7 @@ namespace Grand.Business.Common.Services.Configuration
setting = settings.FirstOrDefault(x => x.StoreId == "");
if (setting != null)
- return MongoDB.Bson.Serialization.BsonSerializer.Deserialize<T>(setting.Metadata);
+ return JsonSerializer.Deserialize<T>(setting.Metadata);
}
return defaultValue;
@@ -175,15 +175,14 @@ namespace Grand.Business.Common.Services.Configuration
if (setting != null)
{
//update
- setting.Metadata = value.ToBsonDocument();
+ setting.Metadata = JsonSerializer.Serialize(value);
await UpdateSetting(setting, clearCache);
}
else
{
//insert
- var metadata = value.ToBsonDocument();
- setting = new Setting
- {
+ var metadata = JsonSerializer.Serialize(value);
+ setting = new Setting {
Name = key.ToLowerInvariant(),
Metadata = metadata,
StoreId = storeId
@@ -229,7 +228,7 @@ namespace Grand.Business.Common.Services.Configuration
if (setting == null && !String.IsNullOrEmpty(storeId))
setting = settings.FirstOrDefault(x => x.StoreId == "");
- return MongoDB.Bson.Serialization.BsonSerializer.Deserialize(setting.Metadata, type) as ISettings;
+ return JsonSerializer.Deserialize(setting.Metadata, type) as ISettings;
}
return Activator.CreateInstance(type) as ISettings;
});
@@ -248,16 +247,15 @@ namespace Grand.Business.Common.Services.Configuration
if (setting != null)
{
//update
- setting.Metadata = settings.ToBsonDocument();
+ setting.Metadata = JsonSerializer.Serialize(settings);
await UpdateSetting(setting);
}
else
{
//insert
- setting = new Setting
- {
+ setting = new Setting {
Name = typeof(T).Name.ToLowerInvariant(),
- Metadata = settings.ToBsonDocument(),
+ Metadata = JsonSerializer.Serialize(settings),
StoreId = storeId
};
await InsertSetting(setting);
diff --git a/src/Core/Grand.Domain/Configuration/Setting.cs b/src/Core/Grand.Domain/Configuration/Setting.cs
index 3c7b7af29..421da34c2 100644
--- a/src/Core/Grand.Domain/Configuration/Setting.cs
+++ b/src/Core/Grand.Domain/Configuration/Setting.cs
@@ -1,4 +1,3 @@
-using MongoDB.Bson;
namespace Grand.Domain.Configuration
{
@@ -25,7 +24,7 @@ namespace Grand.Domain.Configuration
/// <summary>
/// Gets or sets the metadata settings
/// </summary>
- public BsonDocument Metadata { get; set; }
+ public string Metadata { get; set; }
}
}
diff --git a/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs b/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs
index a88762fdc..b2e26194c 100644
--- a/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs
+++ b/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs
@@ -35,7 +35,7 @@ namespace Authentication.Facebook.Infrastructure
var fbSettings = new Repository<Setting>(DataSettingsHelper.ConnectionString()).Table.Where(x => x.Name.StartsWith("facebookexternalauthsettings"));
if (fbSettings.Any())
{
- var metadata = fbSettings.FirstOrDefault().Metadata.ToString();
+ var metadata = fbSettings.FirstOrDefault().Metadata;
settings = JsonSerializer.Deserialize<FacebookExternalAuthSettings>(metadata);
}
}
diff --git a/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs b/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs
index 21c4b63ee..bc2ef6801 100644
--- a/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs
+++ b/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs
@@ -35,7 +35,7 @@ namespace Authentication.Google.Infrastructure
var gSettings = new Repository<Setting>(DataSettingsHelper.ConnectionString()).Table.Where(x => x.Name.StartsWith("googleexternalauthsettings"));
if (gSettings.Any())
{
- var metadata = gSettings.FirstOrDefault().Metadata.ToString();
+ var metadata = gSettings.FirstOrDefault().Metadata;
settings = JsonSerializer.Deserialize<GoogleExternalAuthSettings>(metadata);
}
}