Merge branch 'master' of https://github.com/SciSharp/BotSharp into features/add-message-queue-2

Author: Jicheng Lu

src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs

@@ -11,8 +11,8 @@ public interface IConversationService
     Task SetConversationId(string conversationId, List<MessageState> states, bool isReadOnly = false);
     Task<Conversation> GetConversation(string id, bool isLoadStates = false);
     Task<PagedItems<Conversation>> GetConversations(ConversationFilter filter);
-    Task<Conversation> UpdateConversationTitle(string id, string title);
-    Task<Conversation> UpdateConversationTitleAlias(string id, string titleAlias);
+    Task<bool> UpdateConversationTitle(string id, string title);
+    Task<bool> UpdateConversationTitleAlias(string id, string titleAlias);
     Task<bool> UpdateConversationTags(string conversationId, List<string> toAddTags, List<string> toDeleteTags);
     Task<bool> UpdateConversationMessage(string conversationId, UpdateMessageRequest request);
     Task<List<Conversation>> GetLastConversations();

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs

@@ -153,7 +153,7 @@ response.RichContent is RichContent<IRichMessage> template &&
         if (response.Instruction != null)
         {
             var conversation = _services.GetRequiredService<IConversationService>();
-            var updatedConversation = await conversation.UpdateConversationTitle(_conversationId, response.Instruction.NextActionReason);
+            await conversation.UpdateConversationTitle(_conversationId, response.Instruction.NextActionReason);
 
             // Emit conversation ending hook
             if (response.Instruction.ConversationEnd)

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs

@@ -43,20 +43,26 @@ public async Task<bool> DeleteConversations(IEnumerable<string> ids)
         return isDeleted;
     }
 
-    public async Task<Conversation> UpdateConversationTitle(string id, string title)
+    public async Task<bool> UpdateConversationTitle(string id, string title)
     {
-        var db = _services.GetRequiredService<IBotSharpRepository>();
-        await db.UpdateConversationTitle(id, title);
-        var conversation = await db.GetConversation(id);
-        return conversation;
+        if (!string.IsNullOrEmpty(title))
+        {
+            var db = _services.GetRequiredService<IBotSharpRepository>();
+            await db.UpdateConversationTitle(id, title);
+        }
+
+        return true;
     }
 
-    public async Task<Conversation> UpdateConversationTitleAlias(string id, string titleAlias)
+    public async Task<bool> UpdateConversationTitleAlias(string id, string titleAlias)
     {
-        var db = _services.GetRequiredService<IBotSharpRepository>();
-        await db.UpdateConversationTitleAlias(id, titleAlias);
-        var conversation = await db.GetConversation(id);
-        return conversation;
+        if (!string.IsNullOrEmpty(titleAlias))
+        {
+            var db = _services.GetRequiredService<IBotSharpRepository>();
+            await db.UpdateConversationTitleAlias(id, titleAlias);
+        }
+
+        return true;
     }
 
     public async Task<bool> UpdateConversationTags(string conversationId, List<string> toAddTags, List<string> toDeleteTags)

src/Infrastructure/BotSharp.OpenAPI/Controllers/Conversation/ConversationController.cs

@@ -213,8 +213,8 @@ public async Task<bool> UpdateConversationTitle([FromRoute] string conversationI
             return false;
         }
 
-        var response = await conv.UpdateConversationTitle(conversationId, newTile.NewTitle);
-        return response != null;
+        await conv.UpdateConversationTitle(conversationId, newTile.NewTitle);
+        return true;
     }
 
     [HttpPut("/conversation/{conversationId}/update-title-alias")]

src/Plugins/BotSharp.Plugin.MongoStorage/MongoDbContext.cs

@@ -1,54 +1,39 @@
 using BotSharp.Abstraction.Repositories.Settings;
+using BotSharp.Abstraction.Utilities;
 using System.Threading;
 
 namespace BotSharp.Plugin.MongoStorage;
 
 public class MongoDbContext
 {
+    private const string DefaultTablePrefix = "BotSharp";
     private readonly MongoClient _mongoClient;
     private readonly string _mongoDbDatabaseName;
     private readonly string _collectionPrefix;
     private static int _indexesInitialized = 0;
 
-    private const string DB_NAME_INDEX = "authSource";
-
     public MongoDbContext(BotSharpDatabaseSettings dbSettings)
     {
-        var mongoDbConnectionString = dbSettings.BotSharpMongoDb;
+        var mongoDbConnectionString = dbSettings?.BotSharpMongoDb;
+        if (string.IsNullOrWhiteSpace(mongoDbConnectionString))
+            throw new InvalidOperationException("MongoDB is enabled but BotSharpMongoDb is not configured.");
+
         _mongoClient = new MongoClient(mongoDbConnectionString);
         _mongoDbDatabaseName = GetDatabaseName(mongoDbConnectionString);
-        _collectionPrefix = dbSettings.TablePrefix.IfNullOrEmptyAs("BotSharp")!;
+        _collectionPrefix = dbSettings?.TablePrefix.IfNullOrEmptyAs(DefaultTablePrefix)!;
         CreateIndexes();
     }
 
     private string GetDatabaseName(string mongoDbConnectionString)
     {
-        var databaseName = mongoDbConnectionString.Substring(mongoDbConnectionString.LastIndexOf("/", StringComparison.InvariantCultureIgnoreCase) + 1);
-
-        var symbol = "?";
-        if (databaseName.Contains(symbol))
+        var mongoUrl = new MongoUrl(mongoDbConnectionString);
+        var databaseName = mongoUrl.DatabaseName.IfNullOrEmptyAs(mongoUrl.AuthenticationSource);
+        if (string.IsNullOrWhiteSpace(databaseName))
         {
-            var markIdx = databaseName.IndexOf(symbol, StringComparison.InvariantCultureIgnoreCase);
-            var db = databaseName.Substring(0, markIdx);
-            if (!string.IsNullOrWhiteSpace(db))
-            {
-                return db;
-            }
-
-            var queryStr = databaseName.Substring(markIdx + 1);
-            var queries = queryStr.Split("&", StringSplitOptions.RemoveEmptyEntries).Select(x => new
-            {
-                Key = x.Split("=")[0],
-                Value = x.Split("=")[1]
-            }).ToList();
-
-            var source = queries.FirstOrDefault(x => x.Key.IsEqualTo(DB_NAME_INDEX));
-            if (source != null)
-            {
-                databaseName = source.Value;
-            }
+            throw new InvalidOperationException(
+                "MongoDB connection string must specify a database: set the database in the path (e.g. mongodb://host/dbname) or set authSource in the query string (e.g. ?authSource=dbname). ");
         }
-        return databaseName;
+        return databaseName!;
     }
 
     private IMongoDatabase Database => _mongoClient.GetDatabase(_mongoDbDatabaseName);