Skip to content

Use the factory clock in token expiry checks #8793

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
quexten merged 1 commit into from
Nov 2, 2026
Merged

Use the factory clock in token expiry checks #8793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/Core/Auth/Models/Business/Tokenables/TwoFactorRememberTokenableFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ public TwoFactorRememberTokenable CreateToken(User user, Device device, string s
{
ExpirationDate = timeProvider.GetUtcNow().UtcDateTime
.AddDays(globalSettings.TwoFactorRememberTokenLifetimeInDays),
TimeProvider = timeProvider,
};
}
8 changes: 7 additions & 1 deletion src/Core/Tokens/ExpiringTokenable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@ public abstract class ExpiringTokenable : Tokenable
/// </summary>
public override bool Valid => !IsExpired && TokenIsValid();

public bool IsExpired => ExpirationDate < DateTime.UtcNow;
/// <summary>
/// Clock used for the expiration check. Can be overwritten for tests.
/// </summary>
[JsonIgnore]
internal TimeProvider TimeProvider { get; set; } = TimeProvider.System;

public bool IsExpired => ExpirationDate < TimeProvider.GetUtcNow().UtcDateTime;

/// <summary>
/// Validates that the token data properties are correct.
Expand Down
Loading