Skip to content

Lida dev #64

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 3 commits into from
Jan 8, 2025
Merged

Lida dev #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9d1246
feat: Add verification code expiration time
AnonymousDotNet Jan 6, 2025
e70a168
feat: Add verification code expiration prompt
AnonymousDotNet Jan 6, 2025
eb3d00b
fix: null pointer exception
AnonymousDotNet Jan 7, 2025
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
1 change: 1 addition & 0 deletions src/Infrastructure/BotSharp.Abstraction/Users/Models/User.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -482,7 +482,7 @@ record = db.GetUserByPhone(id, regionCode: (string.IsNullOrWhiteSpace(model.Regi
return default;
}

if (record.VerificationCode != model.VerificationCode)
if (record.VerificationCode != model.VerificationCode || (record.VerificationCodeExpireAt != null && DateTime.UtcNow > record.VerificationCodeExpireAt))
{
return default;
}
Expand Down Expand Up @@ -669,7 +669,7 @@ record = db.GetUserByPhone(user.Phone, regionCode: (string.IsNullOrWhiteSpace(us
return false;
}

if (user.VerificationCode != record.VerificationCode)
if (user.VerificationCode != record.VerificationCode || (record.VerificationCodeExpireAt != null && DateTime.UtcNow > record.VerificationCodeExpireAt))
{
return false;
}
Expand Down
2 changes: 2 additions & 0 deletions src/Plugins/BotSharp.Plugin.MongoStorage/Collections/UserDocument.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down Expand Up @@ -48,6 +49,7 @@ public User ToUser()
EmployeeId = EmployeeId,
IsDisabled = IsDisabled,
VerificationCode = VerificationCode,
VerificationCodeExpireAt = VerificationCodeExpireAt,
Verified = Verified,
RegionCode = RegionCode,
Permissions = Permissions,
Expand Down
1 change: 1 addition & 0 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 @@ -132,6 +132,7 @@ public void UpdateUserVerificationCode(string userId, string verficationCode)
{
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);
}
Expand Down