From 2b6a8d1252f300ebb978a6387364eac4f00fd23f Mon Sep 17 00:00:00 2001 From: Alex Bezdieniezhnykh Date: Sun, 27 Apr 2025 17:15:44 +0300 Subject: [PATCH] fix reset hardware --- Azaion.Api/Program.cs | 4 ++-- Azaion.Services/UserService.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Azaion.Api/Program.cs b/Azaion.Api/Program.cs index f45b954..142f11f 100644 --- a/Azaion.Api/Program.cs +++ b/Azaion.Api/Program.cs @@ -151,7 +151,7 @@ app.MapPost("/resources/{dataFolder?}", async ([FromRoute]string? dataFolder, IFormFile data, IResourcesService resourceService, CancellationToken cancellationToken) => await resourceService.SaveResource(dataFolder, data, cancellationToken)) .Accepts("multipart/form-data") - .RequireAuthorization() + .RequireAuthorization(apiUploaderPolicy) //.WithOpenApi(op => new(op){ Summary = "Upload resource"}); //For some reason doesn't work when this is specified. .DisableAntiforgery(); @@ -173,7 +173,7 @@ app.MapPost("/resources/get/{dataFolder?}", //Need to have POST method for secur app.MapPut("/resources/reset-hardware", async (string email, IUserService userService, ICache cache, CancellationToken cancellationToken) => - await userService.UpdateHardware(email, new HardwareInfo(), cancellationToken)) + await userService.UpdateHardware(email, cancellationToken: cancellationToken)) .RequireAuthorization(apiAdminPolicy) .WithOpenApi(op => new OpenApiOperation(op){ Summary = "Resets hardware id in case of hardware change"}); diff --git a/Azaion.Services/UserService.cs b/Azaion.Services/UserService.cs index 3c82826..0e16c20 100644 --- a/Azaion.Services/UserService.cs +++ b/Azaion.Services/UserService.cs @@ -13,7 +13,7 @@ public interface IUserService Task RegisterUser(RegisterUserRequest request, CancellationToken cancellationToken = default); Task ValidateUser(LoginRequest request, CancellationToken cancellationToken = default); Task 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> GetUsers(string? searchEmail, RoleEnum? searchRole, CancellationToken cancellationToken); Task 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 => { - var hardwareStr = JsonConvert.SerializeObject(hardware); + var hardwareStr = hardware == null ? "" : JsonConvert.SerializeObject(hardware); await db.Users.UpdateAsync(x => x.Email == email, u => new User