Merge pull request #126 from IzyPro/v1.4.10

- Security Optimization
IzyPro · May 19, 2023 · 4b42d1a · 4b42d1a
2 parents af2d70b + 69c9a84
commit 4b42d1a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -43,12 +43,12 @@ It leverages `SignalR` for real-time monitoring and `LiteDb` a Serverless MongoD
 Install via .NET CLI
 
 ```bash
-dotnet add package WatchDog.NET --version 1.4.9
+dotnet add package WatchDog.NET --version 1.4.10
 ```
 Install via Package Manager
 
 ```bash
-Install-Package WatchDog.NET --version 1.4.9
+Install-Package WatchDog.NET --version 1.4.10
 ```
 
 

diff --git a/WatchDog/WatchDog.csproj b/WatchDog/WatchDog.csproj
@@ -12,7 +12,7 @@
 		<Authors>Israel Ulelu, Kelechi Onyekwere</Authors>
 		<PackageId>WatchDog.NET</PackageId>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<Version>1.4.9</Version>
+		<Version>1.4.10</Version>
 		<PackageReleaseNotes>- Security Optimization
 - Query Filters Fixes and Optimizations
 - Package Assembly as DB Name Fix(MongoDB)</PackageReleaseNotes>

diff --git a/WatchDog/WatchDogExtension.cs b/WatchDog/WatchDogExtension.cs
@@ -26,7 +26,6 @@ public static class WatchDogExtension
 
         public static IServiceCollection AddWatchDogServices(this IServiceCollection services, [Optional] Action<WatchDogSettings> configureOptions)
         {
-            string mongoDbName = Assembly.GetCallingAssembly().GetName().Name.Replace('.', '_') + "_WatchDogDB";
             var options = new WatchDogSettings();
             if (configureOptions != null)
                 configureOptions(options);
@@ -35,7 +34,7 @@ public static IServiceCollection AddWatchDogServices(this IServiceCollection ser
             AutoClearModel.ClearTimeSchedule = options.ClearTimeSchedule;
             WatchDogExternalDbConfig.ConnectionString = options.SetExternalDbConnString;
             WatchDogDatabaseDriverOption.DatabaseDriverOption = options.DbDriverOption;
-            WatchDogExternalDbConfig.MongoDbName = mongoDbName;
+            WatchDogExternalDbConfig.MongoDbName = Assembly.GetCallingAssembly().GetName().Name?.Replace('.', '_') + "_WatchDogDB";
 
             if (!string.IsNullOrEmpty(WatchDogExternalDbConfig.ConnectionString) && WatchDogDatabaseDriverOption.DatabaseDriverOption == 0)
                 throw new WatchDogDBDriverException("Missing DB Driver Option: DbDriverOption is required at .AddWatchDogServices()");
@@ -64,7 +63,7 @@ public static IServiceCollection AddWatchDogServices(this IServiceCollection ser
             {
                 if (WatchDogDatabaseDriverOption.DatabaseDriverOption == src.Enums.WatchDogDbDriverEnum.Mongo)
                 {
-                    ExternalDbContext.MigrateNoSql(mongoDbName);
+                    ExternalDbContext.MigrateNoSql();
                 }
                 else
                 {

diff --git a/WatchDog/src/Data/ExternalDbContext.cs b/WatchDog/src/Data/ExternalDbContext.cs
@@ -54,12 +54,12 @@ public static void BootstrapTables()
 
         }
 
-        public static void MigrateNoSql(string databaseName)
+        public static void MigrateNoSql()
         {
             try
             {
                 var mongoClient = CreateMongoDBConnection();
-                var database = mongoClient.GetDatabase(databaseName);
+                var database = mongoClient.GetDatabase(WatchDogExternalDbConfig.MongoDbName);
                 _ = database.GetCollection<WatchLog>(Constants.WatchLogTableName);
                 _ = database.GetCollection<WatchExceptionLog>(Constants.WatchLogExceptionTableName);
                 _ = database.GetCollection<WatchLoggerModel>(Constants.LogsTableName);

diff --git a/WatchDog/src/Models/WatchDogConfigModel.cs b/WatchDog/src/Models/WatchDogConfigModel.cs
@@ -20,7 +20,7 @@ public class WatchDogSettings
     public static class WatchDogExternalDbConfig
     {
         public static string ConnectionString { get; set; } = string.Empty;
-        public static string MongoDbName { get; set; } = string.Empty;
+        public static string MongoDbName { get; set; } = "WatchDogDb";
     }
 
     public static class WatchDogDatabaseDriverOption