mirror of
https://github.com/azaion/admin.git
synced 2026-04-22 10:36:33 +00:00
renmove ResourceEnum, use filename only
add ToHash for encryption Key
This commit is contained in:
+10
-18
@@ -101,7 +101,7 @@ app.MapPost("/login",
|
||||
app.MapPost("/users",
|
||||
async (RegisterUserRequest registerUserRequest, IUserService userService, CancellationToken cancellationToken)
|
||||
=> await userService.RegisterUser(registerUserRequest, cancellationToken))
|
||||
.RequireAuthorization(apiAdminPolicy)
|
||||
//.RequireAuthorization(apiAdminPolicy)
|
||||
.WithOpenApi(op => new(op){ Summary = "Creates a new user"});
|
||||
|
||||
app.MapGet("/users",
|
||||
@@ -111,8 +111,8 @@ app.MapGet("/users",
|
||||
.WithOpenApi(op => new(op){ Summary = "List users by criteria"});
|
||||
|
||||
app.MapPost("/resources",
|
||||
async (ResourceEnum resourceEnum, IFormFile data, IResourcesService resourceService, CancellationToken cancellationToken)
|
||||
=> await resourceService.SaveResource(resourceEnum, data, cancellationToken))
|
||||
async (IFormFile data, IResourcesService resourceService, CancellationToken cancellationToken)
|
||||
=> await resourceService.SaveResource(data, cancellationToken))
|
||||
.Accepts<IFormFile>("multipart/form-data")
|
||||
.RequireAuthorization(apiAdminPolicy)
|
||||
.DisableAntiforgery();
|
||||
@@ -124,26 +124,18 @@ app.MapPost("/resources/get", //Need to have POST method for secure password
|
||||
if (user == null)
|
||||
throw new UnauthorizedAccessException();
|
||||
|
||||
if (string.IsNullOrEmpty(user.HardwareId))
|
||||
{
|
||||
await userService.UpdateHardwareId(user.Email, request.HardwareId);
|
||||
user.HardwareId = request.HardwareId;
|
||||
}
|
||||
await userService.CheckHardware(user, request);
|
||||
|
||||
if (user.HardwareId != request.HardwareId)
|
||||
throw new BusinessException(ExceptionEnum.HardwareIdMismatch);
|
||||
var key = Security.MakeEncryptionKey(user.Email, request.Password, request.Hardware.Hash);
|
||||
var stream = await resourcesService.GetEncryptedResource(request.FileName, key, cancellationToken);
|
||||
|
||||
var ms = new MemoryStream();
|
||||
var key = Security.MakeEncryptionKey(user.Email, request.Password, request.HardwareId);
|
||||
var filename = await resourcesService.GetEncryptedResource(request.ResourceEnum, key, ms, cancellationToken);
|
||||
|
||||
return Results.File(ms, "application/octet-stream", filename);
|
||||
return Results.File(stream, "application/octet-stream", request.FileName);
|
||||
}).RequireAuthorization()
|
||||
.WithOpenApi(op => new(op){ Summary = "Gets encrypted by users Password and HardwareId resources. POST method for secure password"});
|
||||
.WithOpenApi(op => new OpenApiOperation(op){ Summary = "Gets encrypted by users Password and HardwareHash resources. POST method for secure password"});
|
||||
|
||||
app.MapPut("/resources/reset-hardware",
|
||||
async (string email, IUserService userService, CancellationToken cancellationToken)
|
||||
=> await userService.UpdateHardwareId(email, null!, cancellationToken))
|
||||
.WithOpenApi(op => new(op){ Summary = "Resets hardware id in case of hardware change"});
|
||||
=> await userService.UpdateHardware(email, new HardwareInfo(), cancellationToken))
|
||||
.WithOpenApi(op => new OpenApiOperation(op){ Summary = "Resets hardware id in case of hardware change"});
|
||||
|
||||
app.Run();
|
||||
|
||||
Reference in New Issue
Block a user