Skip to content

Commit a1d7d2a

Browse files
author
StickFun
committed
Changed UtcNow implementation
1 parent af27c8a commit a1d7d2a

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

src/Identity/Extensions.Core/src/UserManager.cs

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2067,12 +2067,7 @@ public virtual async Task<bool> IsLockedOutAsync(TUser user)
20672067
return false;
20682068
}
20692069
var lockoutTime = await store.GetLockoutEndDateAsync(user, CancellationToken).ConfigureAwait(false);
2070-
#if NET8_0_OR_GREATER
2071-
var utcNow = UtcNow();
2072-
#else
2073-
var utcNow = DateTimeOffset.UtcNow;
2074-
#endif
2075-
return lockoutTime >= utcNow;
2070+
return lockoutTime >= UtcNow();
20762071
}
20772072

20782073
/// <summary>
@@ -2191,12 +2186,7 @@ public virtual async Task<IdentityResult> AccessFailedAsync(TUser user)
21912186
return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.AccessFailed).ConfigureAwait(false);
21922187
}
21932188
Logger.LogDebug(LoggerEventIds.UserLockedOut, "User is locked out.");
2194-
#if NET8_0_OR_GREATER
2195-
var utcNow = UtcNow();
2196-
#else
2197-
var utcNow = DateTimeOffset.UtcNow;
2198-
#endif
2199-
await store.SetLockoutEndDateAsync(user, utcNow.Add(Options.Lockout.DefaultLockoutTimeSpan),
2189+
await store.SetLockoutEndDateAsync(user, UtcNow().Add(Options.Lockout.DefaultLockoutTimeSpan),
22002190
CancellationToken).ConfigureAwait(false);
22012191
await store.ResetAccessFailedCountAsync(user, CancellationToken).ConfigureAwait(false);
22022192
return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.AccessFailed).ConfigureAwait(false);
@@ -2695,6 +2685,11 @@ private DateTimeOffset UtcNow()
26952685
var timeProvider = ServiceProvider.GetService<TimeProvider>();
26962686
return timeProvider?.GetUtcNow() ?? DateTimeOffset.UtcNow;
26972687
}
2688+
#else
2689+
private static DateTimeOffset UtcNow()
2690+
{
2691+
return DateTimeOffset.UtcNow;
2692+
}
26982693
#endif
26992694

27002695
private IUserTwoFactorStore<TUser> GetUserTwoFactorStore()

0 commit comments

Comments
 (0)