Merge pull request #286 from SciSharp/master

merge latest code

Author: geffzhang

src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs

@@ -18,6 +18,7 @@ public interface IBotSharpRepository
     #region User
     User? GetUserByEmail(string email);
     User? GetUserById(string id);
+    User? GetUserByUserName(string userName);
     void CreateUser(User user);
     #endregion
 

src/Infrastructure/BotSharp.Abstraction/Users/IAuthenticationHook.cs

@@ -0,0 +1,10 @@
+using BotSharp.Abstraction.Users.Models;
+using System.Security.Claims;
+
+namespace BotSharp.Abstraction.Users;
+
+public interface IAuthenticationHook
+{
+    Task<User> Authenticate(string id, string password);
+    void AddClaims(List<Claim> claims);
+}

src/Infrastructure/BotSharp.Abstraction/Users/IUserIdentity.cs

@@ -7,4 +7,5 @@ public interface IUserIdentity
     string UserName { get; }
     string FirstName { get; }
     string LastName { get; }
+    string FullName { get; }
 }

src/Infrastructure/BotSharp.Abstraction/Users/Models/User.cs

@@ -11,6 +11,7 @@ public class User
     public string Email { get; set; } = string.Empty;
     public string Salt { get; set; } = string.Empty;
     public string Password { get; set; } = string.Empty;
+    public string Source { get; set; } = "internal";
     public string? ExternalId { get; set; }
     public string Role { get; set; } = UserRole.Client;
     public DateTime UpdatedTime { get; set; } = DateTime.UtcNow;

src/Infrastructure/BotSharp.Core/Agents/AgentPlugin.cs

@@ -36,9 +36,9 @@ public bool AttachMenu(List<PluginMenuDef> menu)
         {
             SubMenu = new List<PluginMenuDef>
             {
-                new PluginMenuDef("Router", link: "/page/agent/router"), // icon: "bx bx-map-pin"
-                new PluginMenuDef("Evaluator", link: "/page/agent/evaluator"), // icon: "bx bx-task"
-                new PluginMenuDef("Agents", link: "/page/agent"), // icon: "bx bx-bot"
+                new PluginMenuDef("Router", link: "page/agent/router"), // icon: "bx bx-map-pin"
+                new PluginMenuDef("Evaluator", link: "page/agent/evaluator"), // icon: "bx bx-task"
+                new PluginMenuDef("Agents", link: "page/agent"), // icon: "bx bx-bot"
             }
         });
 

src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj

@@ -119,6 +119,7 @@
     <PackageReference Include="Colorful.Console" Version="1.2.15" />
     <PackageReference Include="EntityFrameworkCore.BootKit" Version="6.2.1" />
     <PackageReference Include="Fluid.Core" Version="2.5.0" />
+    <PackageReference Include="Nanoid" Version="3.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Infrastructure/BotSharp.Core/Conversations/ConversationPlugin.cs

@@ -51,7 +51,7 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
     public bool AttachMenu(List<PluginMenuDef> menu)
     {
         var section = menu.First(x => x.Label == "Apps");
-        menu.Add(new PluginMenuDef("Conversation", link: "/page/conversation", icon: "bx bx-conversation", weight: section.Weight + 5));
+        menu.Add(new PluginMenuDef("Conversation", link: "page/conversation", icon: "bx bx-conversation", weight: section.Weight + 5));
         return true;
     }
 }

src/Infrastructure/BotSharp.Core/Repository/BotSharpDbContext.cs

@@ -192,20 +192,17 @@ public void IncrementConversationCount()
     #endregion
 
     #region User
-    public User? GetUserByEmail(string email)
-    {
-        throw new NotImplementedException();
-    }
+    public User? GetUserByEmail(string email) 
+        => throw new NotImplementedException();
 
-    public User? GetUserById(string id)
-    {
-        throw new NotImplementedException();
-    }
+    public User? GetUserById(string id) 
+        => throw new NotImplementedException();
 
-    public void CreateUser(User user)
-    {
-        throw new NotImplementedException();
-    }
+    public User? GetUserByUserName(string userName) 
+        => throw new NotImplementedException();
+
+    public void CreateUser(User user) 
+        => throw new NotImplementedException();
     #endregion
 
 

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

@@ -1,31 +1,35 @@
 using BotSharp.Abstraction.Users.Models;
 using System.IO;
 
-namespace BotSharp.Core.Repository
+namespace BotSharp.Core.Repository;
+
+public partial class FileRepository
 {
-    public partial class FileRepository
+    public User? GetUserByEmail(string email)
     {
-        public User? GetUserByEmail(string email)
-        {
-            return Users.FirstOrDefault(x => x.Email == email);
-        }
+        return Users.FirstOrDefault(x => x.Email == email.ToLower());
+    }
 
-        public User? GetUserById(string id = null)
-        {
-            return Users.FirstOrDefault(x => x.ExternalId == id || x.Id == id);
-        }
+    public User? GetUserById(string id = null)
+    {
+        return Users.FirstOrDefault(x => x.Id == id || (x.ExternalId != null && x.ExternalId == id));
+    }
+
+    public User? GetUserByUserName(string userName = null)
+    {
+        return Users.FirstOrDefault(x => x.UserName == userName.ToLower());
+    }
 
-        public void CreateUser(User user)
+    public void CreateUser(User user)
+    {
+        var userId = Guid.NewGuid().ToString();
+        user.Id = userId;
+        var dir = Path.Combine(_dbSettings.FileRepository, "users", userId);
+        if (!Directory.Exists(dir))
         {
-            var userId = Guid.NewGuid().ToString();
-            user.Id = userId;
-            var dir = Path.Combine(_dbSettings.FileRepository, "users", userId);
-            if (!Directory.Exists(dir))
-            {
-                Directory.CreateDirectory(dir);
-            }
-            var path = Path.Combine(dir, "user.json");
-            File.WriteAllText(path, JsonSerializer.Serialize(user, _options));
+            Directory.CreateDirectory(dir);
         }
+        var path = Path.Combine(dir, "user.json");
+        File.WriteAllText(path, JsonSerializer.Serialize(user, _options));
     }
 }

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

@@ -4,11 +4,6 @@
 using BotSharp.Abstraction.Users.Models;
 using BotSharp.Abstraction.Agents.Models;
 using MongoDB.Driver;
-using BotSharp.Abstraction.Routing.Models;
-using BotSharp.Abstraction.Repositories.Filters;
-using BotSharp.Abstraction.Repositories.Models;
-using BotSharp.Abstraction.Routing.Settings;
-using BotSharp.Abstraction.Evaluations.Settings;
 using System.Text.Encodings.Web;
 using BotSharp.Abstraction.Plugins.Models;
 using BotSharp.Abstraction.Statistics.Settings;