Merge pull request #494 from iceljc/bugfix/fix-agent-conv-edge-cases

Bugfix/fix agent conv edge cases

Author: Oceania2018

src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs

@@ -1,6 +1,8 @@
+using BotSharp.Abstraction.Agents;
 using BotSharp.Abstraction.Repositories.Enums;
 using BotSharp.Abstraction.Routing.Models;
 using BotSharp.Abstraction.Users.Enums;
+using Microsoft.EntityFrameworkCore.Metadata;
 using System.IO;
 
 namespace BotSharp.Core.Agents.Services;
@@ -11,7 +13,9 @@ public async Task UpdateAgent(Agent agent, AgentField updateField)
     {
         var userService = _services.GetRequiredService<IUserService>();
         var user = await userService.GetUser(_user.Id);
-        if (user?.Role != UserRole.Admin) return;
+        var userAgents = GetAgentsByUser(user?.Id);
+        var editable = userAgents?.Select(x => x.Id)?.Contains(agent.Id) ?? false;
+        if (user?.Role != UserRole.Admin && !editable) return;
 
         if (agent == null || string.IsNullOrEmpty(agent.Id)) return;
 

src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs

@@ -373,7 +373,6 @@ join u in Users on ua.UserId equals u.Id
 
             var filter = new AgentFilter
             {
-                IsPublic = true,
                 AgentIds = agentIds
             };
             var agents = GetAgents(filter);

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

@@ -59,7 +59,7 @@ public async Task<PagedItems<ConversationViewModel>> GetConversations([FromBody]
             user = await userService.GetUser(item.User.Id);
             item.User = UserViewModel.FromUser(user);
             var agent = await agentService.GetAgent(item.AgentId);
-            item.AgentName = agent?.Name;
+            item.AgentName = agent?.Name ?? "Unkown";
         }
 
         return new PagedItems<ConversationViewModel>
@@ -110,7 +110,7 @@ public async Task<IEnumerable<ChatResponseModel>> GetDialogs([FromRoute] string
                     Data = message.Data,
                     Sender = new UserViewModel
                     {
-                        FirstName = agent.Name,
+                        FirstName = agent?.Name ?? "Unkown",
                         Role = message.Role,
                     },
                     RichContent = message.SecondaryRichContent ?? message.RichContent

src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Agent.cs

@@ -308,8 +308,7 @@ join u in _dc.Users.AsQueryable() on ua.UserId equals u.Id
 
         var filter = new AgentFilter
         {
-            AgentIds = agentIds,
-            IsPublic = true
+            AgentIds = agentIds
         };
         var agents = GetAgents(filter);
         return agents;