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

Merge pull request #64 from AnonymousDotNet/lida_Dev

Browse source 
Lida dev
This commit is contained in:
Haiping 2025-01-08 01:53:17 +00:00 committed by GitHub
parent b0d2568d50 eb3d00b0e3
commit 076284ad91
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Infrastructure/BotSharp.Abstraction/Users/Models/User.cs
View file

@ -20,6 +20,7 @@ public class User
public string Type { get; set; } = UserType.Client;
public string Role { get; set; } = UserRole.User;
public string? VerificationCode { get; set; }
public DateTime? VerificationCodeExpireAt { get; set; }
public bool Verified { get; set; }
public string RegionCode { get; set; } = "CN";
public string? AffiliateId { get; set; }

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

@ -482,7 +482,7 @@ public class UserService : IUserService
return default;
}
if (record.VerificationCode != model.VerificationCode)
if (record.VerificationCode != model.VerificationCode || (record.VerificationCodeExpireAt != null && DateTime.UtcNow > record.VerificationCodeExpireAt))
{
return default;
}
@ -669,7 +669,7 @@ public class UserService : IUserService
return false;
}
if (user.VerificationCode != record.VerificationCode)
if (user.VerificationCode != record.VerificationCode || (record.VerificationCodeExpireAt != null && DateTime.UtcNow > record.VerificationCodeExpireAt))
{
return false;
}

2
src/Plugins/BotSharp.Plugin.MongoStorage/Collections/UserDocument.cs
View file

@ -17,6 +17,7 @@ public class UserDocument : MongoBase
public string Type { get; set; } = UserType.Client;
public string Role { get; set; } = null!;
public string? VerificationCode { get; set; }
public DateTime? VerificationCodeExpireAt { get; set; }
public bool Verified { get; set; }
public string? RegionCode { get; set; }
public string? AffiliateId { get; set; }
@ -48,6 +49,7 @@ public class UserDocument : MongoBase
EmployeeId = EmployeeId,
IsDisabled = IsDisabled,
VerificationCode = VerificationCode,
VerificationCodeExpireAt = VerificationCodeExpireAt,
Verified = Verified,
RegionCode = RegionCode,
Permissions = Permissions,

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

@ -132,6 +132,7 @@ public partial class MongoRepository
{
var filter = Builders<UserDocument>.Filter.Eq(x => x.Id, userId);
var update = Builders<UserDocument>.Update.Set(x => x.VerificationCode, verficationCode)
.Set(x => x.VerificationCodeExpireAt, DateTime.UtcNow.AddMinutes(5))
.Set(x => x.UpdatedTime, DateTime.UtcNow);
_dc.Users.UpdateOne(filter, update);
}