Union/ProjectLighthouse
2
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-04-19 19:14:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Use UtcNow instead of Now for internal time keeping (#965)

Browse source
This commit is contained in:
Josh 2024-01-20 15:24:28 -06:00 • committed by GitHub
parent c529dada35
commit 092f8bc5a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ProjectLighthouse.Servers.API/Controllers/UserEndpoints.cs
View file

@ -109,7 +109,7 @@ public class UserEndpoints : ApiEndpointController
RegistrationTokenEntity token = new()
{
Created = DateTime.Now,
Created = DateTime.UtcNow,
Token = CryptoHelper.GenerateAuthToken(),
Username = username,
};

2
ProjectLighthouse.Servers.Website/Controllers/Moderator/ModerationCaseController.cs
View file

@ -26,7 +26,7 @@ public class ModerationCaseController : ControllerBase
ModerationCaseEntity? @case = await this.database.Cases.FirstOrDefaultAsync(c => c.CaseId == id);
if (@case == null) return this.NotFound();
@case.DismissedAt = DateTime.Now;
@case.DismissedAt = DateTime.UtcNow;
@case.DismisserId = user.UserId;
@case.DismisserUsername = user.Username;

4
ProjectLighthouse.Servers.Website/Pages/Email/CompleteEmailVerificationPage.cshtml.cs
View file

@ -30,7 +30,7 @@ public class CompleteEmailVerificationPage : BaseLayout
UserEntity user = await this.Database.Users.FirstAsync(u => u.UserId == emailVerifyToken.UserId);
if (DateTime.Now > emailVerifyToken.ExpiresAt)
if (DateTime.UtcNow > emailVerifyToken.ExpiresAt)
{
this.Error = "This token has expired";
return this.Page();
@ -52,7 +52,7 @@ public class CompleteEmailVerificationPage : BaseLayout
// if user's account was created automatically
WebTokenEntity webToken = new()
{
ExpiresAt = DateTime.Now.AddDays(7),
ExpiresAt = DateTime.UtcNow.AddDays(7),
Verified = true,
UserId = user.UserId,
UserToken = CryptoHelper.GenerateAuthToken(),

2
ProjectLighthouse.Servers.Website/Pages/Login/LoginForm.cshtml.cs
View file

@ -87,7 +87,7 @@ public class LoginForm : BaseLayout
{
UserId = user.UserId,
UserToken = CryptoHelper.GenerateAuthToken(),
ExpiresAt = DateTime.Now + TimeSpan.FromDays(7),
ExpiresAt = DateTime.UtcNow + TimeSpan.FromDays(7),
Verified = !ServerConfiguration.Instance.TwoFactorConfiguration.TwoFactorEnabled || !user.IsTwoFactorSetup,
};

2
ProjectLighthouse.Servers.Website/Pages/Login/RegisterForm.cshtml.cs
View file

@ -89,7 +89,7 @@ public class RegisterForm : BaseLayout
{
UserId = user.UserId,
UserToken = CryptoHelper.GenerateAuthToken(),
ExpiresAt = DateTime.Now + TimeSpan.FromDays(7),
ExpiresAt = DateTime.UtcNow + TimeSpan.FromDays(7),
};
this.Database.WebTokens.Add(webToken);

2
ProjectLighthouse.Servers.Website/Pages/Moderation/NewCasePage.cshtml.cs
View file

@ -98,7 +98,7 @@ public class NewCasePage : BaseLayout
Reason = reason,
ModeratorNotes = modNotes,
ExpiresAt = expires,
CreatedAt = DateTime.Now,
CreatedAt = DateTime.UtcNow,
CreatorId = user.UserId,
CreatorUsername = user.Username,
AffectedId = affectedId.Value,

4
ProjectLighthouse.Tests.WebsiteTests/Integration/AdminTests.cs
View file

@ -28,7 +28,7 @@ public class AdminTests : LighthouseWebTest
{
UserId = user.UserId,
UserToken = CryptoHelper.GenerateAuthToken(),
ExpiresAt = DateTime.Now + TimeSpan.FromHours(1),
ExpiresAt = DateTime.UtcNow + TimeSpan.FromHours(1),
Verified = true,
};
@ -55,7 +55,7 @@ public class AdminTests : LighthouseWebTest
{
UserId = user.UserId,
UserToken = CryptoHelper.GenerateAuthToken(),
ExpiresAt = DateTime.Now + TimeSpan.FromHours(1),
ExpiresAt = DateTime.UtcNow + TimeSpan.FromHours(1),
Verified = true,
};

2
ProjectLighthouse.Tests.WebsiteTests/Integration/AuthenticationTests.cs
View file

@ -89,7 +89,7 @@ public class AuthenticationTests : LighthouseWebTest
{
UserId = user.UserId,
UserToken = CryptoHelper.GenerateAuthToken(),
ExpiresAt = DateTime.Now + TimeSpan.FromHours(1),
ExpiresAt = DateTime.UtcNow + TimeSpan.FromHours(1),
Verified = true,
};

2
ProjectLighthouse/Administration/Maintenance/Commands/CreateAPIKeyCommand.cs
View file

@ -29,7 +29,7 @@ public class CreateApiKeyCommand : ICommand
key.Description = "<no description specified>";
}
key.Key = CryptoHelper.GenerateAuthToken();
key.Created = DateTime.Now;
key.Created = DateTime.UtcNow;
DatabaseContext database = provider.GetRequiredService<DatabaseContext>();
await database.APIKeys.AddAsync(key);
await database.SaveChangesAsync();

2
ProjectLighthouse/Administration/Maintenance/MaintenanceHelper.cs
View file

@ -117,7 +117,7 @@ public static class MaintenanceHelper
CompletedMigrationEntity completedMigration = new()
{
MigrationName = migrationTask.GetType().Name,
RanAt = DateTime.Now,
RanAt = DateTime.UtcNow,
};
database.CompletedMigrations.Add(completedMigration);

2
ProjectLighthouse/Database/DatabaseContext.GameTokens.cs
View file

@ -33,7 +33,7 @@ public partial class DatabaseContext
if (token == null) return null;
if (DateTime.Now <= token.ExpiresAt) return token;
if (DateTime.UtcNow <= token.ExpiresAt) return token;
this.Remove(token);
await this.SaveChangesAsync();

2
ProjectLighthouse/Database/DatabaseContext.Utils.cs
View file

@ -72,7 +72,7 @@ public partial class DatabaseContext
Platform = npTicket.Platform,
TicketHash = npTicket.TicketHash,
// we can get away with a low expiry here since LBP will just get a new token everytime it gets 403'd
ExpiresAt = DateTime.Now + TimeSpan.FromHours(1),
ExpiresAt = DateTime.UtcNow + TimeSpan.FromHours(1),
};
this.GameTokens.Add(gameToken);

18
ProjectLighthouse/Database/DatabaseContext.WebTokens.cs
View file

@ -26,7 +26,7 @@ public partial class DatabaseContext
WebTokenEntity? token = this.WebTokens.FirstOrDefault(t => t.UserToken == lighthouseToken);
if (token == null) return null;
if (DateTime.Now <= token.ExpiresAt) return this.Users.FirstOrDefault(u => u.UserId == token.UserId);
if (DateTime.UtcNow <= token.ExpiresAt) return this.Users.FirstOrDefault(u => u.UserId == token.UserId);
this.Remove(token);
this.SaveChanges();
@ -48,7 +48,7 @@ public partial class DatabaseContext
WebTokenEntity? token = this.WebTokens.FirstOrDefault(t => t.UserToken == lighthouseToken);
if (token == null) return null;
if (DateTime.Now <= token.ExpiresAt) return token;
if (DateTime.UtcNow <= token.ExpiresAt) return token;
this.Remove(token);
this.SaveChanges();
@ -65,7 +65,7 @@ public partial class DatabaseContext
await this.PasswordResetTokens.FirstOrDefaultAsync(token => token.ResetToken == resetToken);
if (token == null) return null;
if (token.Created >= DateTime.Now.AddHours(-1))
if (token.Created >= DateTime.UtcNow.AddHours(-1))
return await this.Users.FirstOrDefaultAsync(user => user.UserId == token.UserId);
this.PasswordResetTokens.Remove(token);
@ -81,7 +81,7 @@ public partial class DatabaseContext
RegistrationTokenEntity? token = this.RegistrationTokens.FirstOrDefault(t => t.Token == tokenString);
if (token == null) return false;
if (token.Created >= DateTime.Now.AddDays(-7)) return true;
if (token.Created >= DateTime.UtcNow.AddDays(-7)) return true;
this.RegistrationTokens.Remove(token);
this.SaveChanges();
@ -92,7 +92,7 @@ public partial class DatabaseContext
public async Task RemoveExpiredTokens()
{
List<GameTokenEntity> expiredTokens = await this.GameTokens.Where(t => DateTime.Now > t.ExpiresAt).ToListAsync();
List<GameTokenEntity> expiredTokens = await this.GameTokens.Where(t => DateTime.UtcNow > t.ExpiresAt).ToListAsync();
foreach (GameTokenEntity token in expiredTokens)
{
UserEntity? user = await this.Users.FirstOrDefaultAsync(u => u.UserId == token.UserId);
@ -100,10 +100,10 @@ public partial class DatabaseContext
}
await this.SaveChangesAsync();
await this.GameTokens.RemoveWhere(t => DateTime.Now > t.ExpiresAt);
await this.WebTokens.RemoveWhere(t => DateTime.Now > t.ExpiresAt);
await this.EmailVerificationTokens.RemoveWhere(t => DateTime.Now > t.ExpiresAt);
await this.EmailSetTokens.RemoveWhere(t => DateTime.Now > t.ExpiresAt);
await this.GameTokens.RemoveWhere(t => DateTime.UtcNow > t.ExpiresAt);
await this.WebTokens.RemoveWhere(t => DateTime.UtcNow > t.ExpiresAt);
await this.EmailVerificationTokens.RemoveWhere(t => DateTime.UtcNow > t.ExpiresAt);
await this.EmailSetTokens.RemoveWhere(t => DateTime.UtcNow > t.ExpiresAt);
}
public async Task RemoveRegistrationToken(string? tokenString)

4
ProjectLighthouse/Helpers/EmailHelper.cs
View file

@ -48,7 +48,7 @@ public static class SMTPHelper
PasswordResetTokenEntity token = new()
{
Created = DateTime.Now,
Created = DateTime.UtcNow,
UserId = user.UserId,
ResetToken = CryptoHelper.GenerateAuthToken(),
};
@ -90,7 +90,7 @@ public static class SMTPHelper
UserId = user.UserId,
User = user,
EmailToken = CryptoHelper.GenerateAuthToken(),
ExpiresAt = DateTime.Now.AddHours(6),
ExpiresAt = DateTime.UtcNow.AddHours(6),
};
database.EmailVerificationTokens.Add(verifyToken);

2
ProjectLighthouse/Types/Entities/Moderation/ModerationCaseEntity.cs
View file

@ -28,7 +28,7 @@ public class ModerationCaseEntity
public DateTime CreatedAt { get; set; }
public DateTime? ExpiresAt { get; set; }
public bool Expired => this.ExpiresAt != null && this.ExpiresAt < DateTime.Now;
public bool Expired => this.ExpiresAt != null && this.ExpiresAt < DateTime.UtcNow;
public DateTime? DismissedAt { get; set; }
public bool Dismissed => this.DismissedAt != null;