fix reset hardware

This commit is contained in:
Alex Bezdieniezhnykh
2025-04-27 17:15:44 +03:00
parent 32cef21335
commit 2b6a8d1252
2 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -151,7 +151,7 @@ app.MapPost("/resources/{dataFolder?}",
async ([FromRoute]string? dataFolder, IFormFile data, IResourcesService resourceService, CancellationToken cancellationToken) async ([FromRoute]string? dataFolder, IFormFile data, IResourcesService resourceService, CancellationToken cancellationToken)
=> await resourceService.SaveResource(dataFolder, data, cancellationToken)) => await resourceService.SaveResource(dataFolder, data, cancellationToken))
.Accepts<IFormFile>("multipart/form-data") .Accepts<IFormFile>("multipart/form-data")
.RequireAuthorization() .RequireAuthorization(apiUploaderPolicy)
//.WithOpenApi(op => new(op){ Summary = "Upload resource"}); //For some reason doesn't work when this is specified. //.WithOpenApi(op => new(op){ Summary = "Upload resource"}); //For some reason doesn't work when this is specified.
.DisableAntiforgery(); .DisableAntiforgery();
@@ -173,7 +173,7 @@ app.MapPost("/resources/get/{dataFolder?}", //Need to have POST method for secur
app.MapPut("/resources/reset-hardware", app.MapPut("/resources/reset-hardware",
async (string email, IUserService userService, ICache cache, CancellationToken cancellationToken) => async (string email, IUserService userService, ICache cache, CancellationToken cancellationToken) =>
await userService.UpdateHardware(email, new HardwareInfo(), cancellationToken)) await userService.UpdateHardware(email, cancellationToken: cancellationToken))
.RequireAuthorization(apiAdminPolicy) .RequireAuthorization(apiAdminPolicy)
.WithOpenApi(op => new OpenApiOperation(op){ Summary = "Resets hardware id in case of hardware change"}); .WithOpenApi(op => new OpenApiOperation(op){ Summary = "Resets hardware id in case of hardware change"});
+3 -3
View File
@@ -13,7 +13,7 @@ public interface IUserService
Task RegisterUser(RegisterUserRequest request, CancellationToken cancellationToken = default); Task RegisterUser(RegisterUserRequest request, CancellationToken cancellationToken = default);
Task<User> ValidateUser(LoginRequest request, CancellationToken cancellationToken = default); Task<User> ValidateUser(LoginRequest request, CancellationToken cancellationToken = default);
Task<User?> GetByEmail(string? email, CancellationToken cancellationToken = default); Task<User?> GetByEmail(string? email, CancellationToken cancellationToken = default);
Task UpdateHardware(string email, HardwareInfo hardwareInfo, CancellationToken cancellationToken = default); Task UpdateHardware(string email, HardwareInfo? hardwareInfo = null, CancellationToken cancellationToken = default);
Task UpdateQueueOffsets(string email, UserQueueOffsets queueOffsets, CancellationToken cancellationToken = default); Task UpdateQueueOffsets(string email, UserQueueOffsets queueOffsets, CancellationToken cancellationToken = default);
Task<IEnumerable<User>> GetUsers(string? searchEmail, RoleEnum? searchRole, CancellationToken cancellationToken); Task<IEnumerable<User>> GetUsers(string? searchEmail, RoleEnum? searchRole, CancellationToken cancellationToken);
Task<string> CheckHardwareHash(User user, GetResourceRequest request); Task<string> CheckHardwareHash(User user, GetResourceRequest request);
@@ -58,11 +58,11 @@ public class UserService(IDbFactory dbFactory, ICache cache) : IUserService
}); });
public async Task UpdateHardware(string email, HardwareInfo hardware, CancellationToken cancellationToken = default) public async Task UpdateHardware(string email, HardwareInfo? hardware = null, CancellationToken cancellationToken = default)
{ {
await dbFactory.RunAdmin(async db => await dbFactory.RunAdmin(async db =>
{ {
var hardwareStr = JsonConvert.SerializeObject(hardware); var hardwareStr = hardware == null ? "" : JsonConvert.SerializeObject(hardware);
await db.Users.UpdateAsync(x => x.Email == email, await db.Users.UpdateAsync(x => x.Email == email,
u => new User u => new User