From 6ef25b139c4f18872d7deb58a21ec8665c0ca889 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Thu, 14 Nov 2024 20:23:45 -0600 Subject: [PATCH] change name --- src/Infrastructure/BotSharp.Abstraction/Users/IUserService.cs | 2 +- .../Agents/Services/AgentService.RefreshAgents.cs | 3 +-- src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs | 2 +- .../BotSharp.OpenAPI/Controllers/PluginController.cs | 2 +- .../BotSharp.OpenAPI/Controllers/RoleController.cs | 2 +- .../BotSharp.OpenAPI/Controllers/UserController.cs | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Infrastructure/BotSharp.Abstraction/Users/IUserService.cs b/src/Infrastructure/BotSharp.Abstraction/Users/IUserService.cs index abeb06d9..73605789 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Users/IUserService.cs +++ b/src/Infrastructure/BotSharp.Abstraction/Users/IUserService.cs @@ -9,7 +9,7 @@ public interface IUserService Task GetUser(string id); Task> GetUsers(UserFilter filter); Task GetUserDetails(string userId); - Task IsAuthorizedUser(string userId); + Task IsAdminUser(string userId); Task GetUserAuthorizations(IEnumerable? agentIds = null); Task UpdateUser(User user, bool isUpdateUserAgents = false); Task CreateUser(User user); diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs index 95268a17..f0838ce5 100644 --- a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs +++ b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs @@ -1,5 +1,4 @@ using BotSharp.Abstraction.Repositories.Enums; -using BotSharp.Abstraction.Users.Enums; using System.IO; namespace BotSharp.Core.Agents.Services; @@ -18,7 +17,7 @@ public partial class AgentService } var userService = _services.GetRequiredService(); - var isValid = await userService.IsAuthorizedUser(_user.Id); + var isValid = await userService.IsAdminUser(_user.Id); if (!isValid) { return "Unauthorized user."; diff --git a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs index e07d1be4..5e5572ec 100644 --- a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs +++ b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs @@ -407,7 +407,7 @@ public class UserService : IUserService return users; } - public async Task IsAuthorizedUser(string userId) + public async Task IsAdminUser(string userId) { var db = _services.GetRequiredService(); var user = db.GetUserById(userId); diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/PluginController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/PluginController.cs index b6178f54..499ebdf7 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/PluginController.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/PluginController.cs @@ -98,6 +98,6 @@ public class PluginController : ControllerBase private async Task IsValidUser() { var userService = _services.GetRequiredService(); - return await userService.IsAuthorizedUser(_user.Id); + return await userService.IsAdminUser(_user.Id); } } diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/RoleController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/RoleController.cs index 0bff6917..d270ecbe 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/RoleController.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/RoleController.cs @@ -83,6 +83,6 @@ public class RoleController : ControllerBase private async Task IsValidUser() { var userService = _services.GetRequiredService(); - return await userService.IsAuthorizedUser(_user.Id); + return await userService.IsAdminUser(_user.Id); } } diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/UserController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/UserController.cs index 5ea5f18c..6bdbd721 100644 --- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/UserController.cs +++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/UserController.cs @@ -255,7 +255,7 @@ public class UserController : ControllerBase private async Task IsValidUser() { var userService = _services.GetRequiredService(); - return await userService.IsAuthorizedUser(_user.Id); + return await userService.IsAdminUser(_user.Id); } private FileContentResult BuildFileResult(string file)