SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #44 from Qtoss-AI/hdongDev

Browse source 
hdong: fix admin account conflict with common account.
This commit is contained in:
Haiping 2024-11-15 04:41:52 +00:00 committed by GitHub
parent b9d7ff1023 7ff43b4fa3
commit 96d16d22ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs
View file

@ -18,8 +18,7 @@ public interface IBotSharpRepository : IHaveServiceProvider
#region User
User? GetUserByEmail(string email) => throw new NotImplementedException();
User? GetUserByPhone(string phone, string regionCode = "CN") => throw new NotImplementedException();
User? GetAdminUserByPhone(string phone, string regionCode = "CN") => throw new NotImplementedException();
User? GetUserByPhone(string phone, string role = null, string regionCode = "CN") => throw new NotImplementedException();
User? GetAffiliateUserByPhone(string phone) => throw new NotImplementedException();
User? GetUserById(string id) => throw new NotImplementedException();
List<User> GetUserByIds(List<string> ids) => throw new NotImplementedException();

6
src/Infrastructure/BotSharp.Abstraction/Utilities/Pagination.cs
View file

@ -8,9 +8,9 @@ public class Pagination : ICacheKey
private int _size;
public int Page
{
{
get { return _page > 0 ? _page : 1; }
set { _page = value; }
set { _page = value; }
}
public int Size
@ -43,7 +43,7 @@ public class Pagination : ICacheKey
public bool ReturnTotal { get; set; } = true;
public string GetCacheKey()
=> $"{nameof(Pagination)}_{_page}_{_size}_{Sort}_{Order}";
=> $"{nameof(Pagination)}_{_page}_{_size}_{Sort}_{Order}_{Offset}_{ReturnTotal}";
}
public class PagedItems<T>

2
src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
View file

@ -172,7 +172,7 @@ public class UserService : IUserService
var base64 = Encoding.UTF8.GetString(Convert.FromBase64String(authorization));
var (id, password) = base64.SplitAsTuple(":");
var db = _services.GetRequiredService<IBotSharpRepository>();
var record = db.GetAdminUserByPhone(id);
var record = db.GetUserByPhone(id,"admin");
var isCanLogin = record != null && !record.IsDisabled
&& record.Type == UserType.Internal && new List<string>
{

19
src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.User.cs
View file

@ -13,7 +13,7 @@ public partial class MongoRepository
return user != null ? user.ToUser() : null;
}
public User? GetUserByPhone(string phone, string regionCode = "CN")
public User? GetUserByPhone(string phone, string role = null, string regionCode = "CN")
{
if (string.IsNullOrWhiteSpace(phone))
{
@ -23,21 +23,8 @@ public partial class MongoRepository
string phoneSecond = phone.StartsWith("+86") ? phone.Replace("+86", "") : $"+86{phone}";
var user = _dc.Users.AsQueryable().FirstOrDefault(x => (x.Phone == phone || x.Phone == phoneSecond) && x.Type != UserType.Affiliate
&& (x.RegionCode == regionCode || string.IsNullOrWhiteSpace(x.RegionCode)));
return user != null ? user.ToUser() : null;
}
public User? GetAdminUserByPhone(string phone, string regionCode = "CN")
{
if (string.IsNullOrWhiteSpace(phone))
{
return null;
}
string phoneSecond = phone.StartsWith("+86") ? phone.Replace("+86", "") : $"+86{phone}";
var user = _dc.Users.AsQueryable().FirstOrDefault(x => (x.Phone == phone || x.Phone == phoneSecond) && x.Type != UserType.Affiliate
&& (x.RegionCode == regionCode || string.IsNullOrWhiteSpace(x.RegionCode)) && (x.Role == "admin" || x.Role == "root"));
&& (x.RegionCode == regionCode || string.IsNullOrWhiteSpace(x.RegionCode))
&& (role == "admin" ? x.Role == "admin" || x.Role == "root" : true));
return user != null ? user.ToUser() : null;
}