Skip to content

hdong: split some phone number from client and admin. #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2024
Merged

hdong: split some phone number from client and admin. #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93a4bd9
hdong: split some phone number from client and admin.
YouWeiDH Nov 21, 2024
0078b97
hdong:clean up for client,user and admin split logic.
YouWeiDH Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public interface IBotSharpRepository : IHaveServiceProvider

#region User
User? GetUserByEmail(string email) => throw new NotImplementedException();
User? GetUserByPhone(string phone, string role = null, string regionCode = "CN") => throw new NotImplementedException();
User? GetUserByPhone(string phone, string type = "client", 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();
Expand Down
6 changes: 3 additions & 3 deletions src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ public partial class FileRepository
return Users.FirstOrDefault(x => x.Email == email.ToLower());
}

public User? GetUserByPhone(string phone, string? role = null, string regionCode = "CN")
public User? GetUserByPhone(string phone, string? type = "client", string regionCode = "CN")
{
var query = Users.Where(x => x.Phone == phone);

if (!string.IsNullOrEmpty(role))
if (!string.IsNullOrEmpty(type))
{
query = query.Where(x => x.Role == role);
query = query.Where(x => x.Type == type);
}

if (!string.IsNullOrEmpty(regionCode))
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public async Task<bool> UpdatePassword(string password, string verificationCode)
var base64 = Encoding.UTF8.GetString(Convert.FromBase64String(authorization));
var (id, password) = base64.SplitAsTuple(":");
var db = _services.GetRequiredService<IBotSharpRepository>();
var record = db.GetUserByPhone(id,"admin");
var record = db.GetUserByPhone(id, type: "internal");
var isCanLogin = record != null && !record.IsDisabled
&& record.Type == UserType.Internal && new List<string>
{
Expand Down
10 changes: 5 additions & 5 deletions src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.User.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public partial class MongoRepository
return user != null ? user.ToUser() : null;
}

public User? GetUserByPhone(string phone, string role = null, string regionCode = "CN")
public User? GetUserByPhone(string phone, string type = "client", string regionCode = "CN")
{
string phoneSecond = string.Empty;
// if phone number length is less than 4, return null
Expand All @@ -24,9 +24,9 @@ public partial class MongoRepository

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))
&& (role == "admin" ? x.Role == "admin" || x.Role == "root" : true));
var user = _dc.Users.AsQueryable().FirstOrDefault(x => (x.Phone == phone || x.Phone == phoneSecond)
&& (x.RegionCode == regionCode || string.IsNullOrWhiteSpace(x.RegionCode))
&& (x.Type == type));
return user != null ? user.ToUser() : null;
}

Expand Down Expand Up @@ -245,7 +245,7 @@ public PagedItems<User> GetUsers(UserFilter filter)
user.AgentActions = agentActions;
return user;
}

var agentIds = userAgents.Select(x => x.AgentId)?.Distinct().ToList();
if (!agentIds.IsNullOrEmpty())
{
Expand Down