Change the location DbConnectionString settings in appsettings for in…

…stalled database (settings only for advanced administrators)
grandnode · Jul 24, 2023 · de93e99 · de93e99
1 parent 5d865f6
commit de93e99
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/src/Core/Grand.Infrastructure/Configuration/AdvancedConfig.cs b/src/Core/Grand.Infrastructure/Configuration/AdvancedConfig.cs
@@ -2,9 +2,6 @@
 {
     public class AdvancedConfig
     {
-        public string DbConnectionString { get; set; }
-        public int DbProvider { get; set; }
         public string InstalledPlugins { get; set; }
-
     }
 }
diff --git a/src/Core/Grand.Infrastructure/Configuration/DatabaseConfig.cs b/src/Core/Grand.Infrastructure/Configuration/DatabaseConfig.cs
@@ -16,5 +16,12 @@ public class DatabaseConfig
         /// Gets or sets a value indicating whether use LiteDB database (only for installation process)
         /// </summary>
         public string LiteDbConnectionString { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether use connection string for database (only for installed databases)
+        /// </summary>
+        public string DbConnectionString { get; set; }
+        public int DbProvider { get; set; }
+
     }
 }
diff --git a/src/Core/Grand.Infrastructure/StartupBase.cs b/src/Core/Grand.Infrastructure/StartupBase.cs
@@ -35,12 +35,12 @@ public static class StartupBase
         /// </summary>
         private static void InitDatabase(IServiceCollection services, IConfiguration configuration)
         {
-            var advancedConfig = services.StartupConfig<AdvancedConfig>(configuration.GetSection("Advanced"));
-            if (!string.IsNullOrEmpty(advancedConfig.DbConnectionString))
+            var dbConfig = services.StartupConfig<DatabaseConfig>(configuration.GetSection("Database"));
+            if (!string.IsNullOrEmpty(dbConfig.DbConnectionString))
             {
                 DataSettingsManager.LoadDataSettings(new DataSettings {
-                    ConnectionString = advancedConfig.DbConnectionString,
-                    DbProvider = (DbProvider)advancedConfig.DbProvider
+                    ConnectionString = dbConfig.DbConnectionString,
+                    DbProvider = (DbProvider)dbConfig.DbProvider
                 });
             }
         }

diff --git a/src/Web/Grand.Web/App_Data/appsettings.json b/src/Web/Grand.Web/App_Data/appsettings.json
@@ -39,7 +39,10 @@
     //LiteDB database as a singleton service in the application
     "Singleton": true,
     //Init connection string - it's required only for the installation process!
-    "LiteDbConnectionString": "Filename=App_Data/database.db"
+    "LiteDbConnectionString": "Filename=App_Data/database.db",
+    //only for advanced users, allow to set ConnectionString for MongoDb  
+    "DbConnectionString": "",
+    "DbProvider": 0
   },
 
   "Security": {
@@ -242,8 +245,6 @@
   "UseSwagger": false,
   //Settings only for advanced users
   "Advanced": {
-    "DbConnectionString": "",
-    "DbProvider": 0,
     //separator comma
     "InstalledPlugins": ""
   },