add ClearFolder, ListResources, GetInstaller

endpoints

Azaion.Api/Program.cs

@@ -125,7 +125,7 @@ app.UseRewriter(new RewriteOptions().AddRedirect("^$", "/swagger"));
 app.MapPost("/login",
     async (LoginRequest request, IUserService userService, IAuthService authService, CancellationToken cancellationToken) =>
     {
-        var user = await userService.ValidateUser(request, cancellationToken: cancellationToken);
+        var user = await userService.ValidateUser(request, ct: cancellationToken);
         return Results.Ok(new { Token = authService.CreateToken(user)});
     })
     .WithOpenApi(op => new(op){ Summary = "Login"});;
@@ -142,33 +142,45 @@ app.MapGet("/currentuser",
     .WithOpenApi(op => new(op){ Summary = "Get Current User"});
 
 app.MapGet("/users",
-    async (string? searchEmail, RoleEnum? searchRole, IUserService userService, CancellationToken cancellationToken)
-        => await userService.GetUsers(searchEmail, searchRole, cancellationToken))
+    async (string? searchEmail, RoleEnum? searchRole, IUserService userService, CancellationToken ct)
+        => await userService.GetUsers(searchEmail, searchRole, ct))
     .RequireAuthorization(apiAdminPolicy)
     .WithOpenApi(op => new(op){ Summary = "List users by criteria"});
 
 app.MapPut("/users/hardware/set",
-        async ([FromBody]SetHWRequest request, IUserService userService, ICache cache, CancellationToken cancellationToken) =>
-        await userService.UpdateHardware(request.Email, request.Hardware, cancellationToken: cancellationToken))
+        async ([FromBody]SetHWRequest request, IUserService userService, ICache cache, CancellationToken ct) =>
+        await userService.UpdateHardware(request.Email, request.Hardware, ct: ct))
     .RequireAuthorization(apiAdminPolicy)
     .WithOpenApi(op => new OpenApiOperation(op){ Summary = "Sets user's hardware"});
 
 app.MapPut("/users/queue-offsets/set",
-        async ([FromBody]SetUserQueueOffsetsRequest request, IUserService userService, CancellationToken cancellationToken)
-            => await userService.UpdateQueueOffsets(request.Email, request.Offsets, cancellationToken))
+        async ([FromBody]SetUserQueueOffsetsRequest request, IUserService userService, CancellationToken ct)
+            => await userService.UpdateQueueOffsets(request.Email, request.Offsets, ct))
     .RequireAuthorization()
     .WithOpenApi(op => new OpenApiOperation(op) { Summary = "Sets user's queue offsets" });
 
 app.MapPost("/resources/{dataFolder?}",
-        async ([FromRoute]string? dataFolder, IFormFile data, IResourcesService resourceService, CancellationToken cancellationToken)
-            => await resourceService.SaveResource(dataFolder, data, cancellationToken))
+        async ([FromRoute]string? dataFolder, IFormFile data, IResourcesService resourceService, CancellationToken ct)
+            => await resourceService.SaveResource(dataFolder, data, ct))
     .Accepts<IFormFile>("multipart/form-data")
     .RequireAuthorization()
     //.WithOpenApi(op => new(op){ Summary = "Upload resource"}); //For some reason doesn't work when this is specified.
     .DisableAntiforgery();
 
+app.MapGet("/resources/list/{dataFolder?}",
+    async ([FromRoute]string? dataFolder, string? search, IResourcesService resourcesService, CancellationToken ct)
+        => await resourcesService.ListResources(dataFolder, search, ct))
+    .RequireAuthorization()
+    .WithOpenApi(op => new OpenApiOperation(op) { Summary = "Lists resources in folder" });
+
+app.MapPost("/resources/clear/{dataFolder?}",
+        ([FromRoute]string? dataFolder, IResourcesService resourcesService) => resourcesService.ClearFolder(dataFolder))
+    .RequireAuthorization()
+    .WithOpenApi(op => new OpenApiOperation(op) { Summary = "Clear folder" });
+
 app.MapPost("/resources/get/{dataFolder?}", //Need to have POST method for secure password
-    async ([FromBody]GetResourceRequest request, [FromRoute]string? dataFolder, IAuthService authService, IUserService userService, IResourcesService resourcesService, CancellationToken cancellationToken) =>
+    async ([FromBody]GetResourceRequest request, [FromRoute]string? dataFolder, IAuthService authService,
+        IUserService userService, IResourcesService resourcesService, CancellationToken ct) =>
     {
         var user = await authService.GetCurrentUser();
         if (user == null)
@@ -177,12 +189,25 @@ app.MapPost("/resources/get/{dataFolder?}", //Need to have POST method for secur
         var hwHash = await userService.CheckHardwareHash(user, request);
 
         var key = Security.GetApiEncryptionKey(user.Email, request.Password, hwHash);
-        var stream = await resourcesService.GetEncryptedResource(dataFolder, request.FileName, key, cancellationToken);
+        var stream = await resourcesService.GetEncryptedResource(dataFolder, request.FileName, key, ct);
 
         return Results.File(stream, "application/octet-stream", request.FileName);
     }).RequireAuthorization()
     .WithOpenApi(op => new OpenApiOperation(op){ Summary = "Gets encrypted by users Password and HardwareHash resources. POST method for secure password"});
 
+app.MapGet("/resources/get-installer/{dataFolder?}",
+        async ([FromRoute]string? dataFolder, IAuthService authService, IResourcesService resourcesService, CancellationToken ct) =>
+        {
+            var user = await authService.GetCurrentUser();
+            if (user == null)
+                throw new UnauthorizedAccessException();
+            var (name, stream) = resourcesService.GetInstaller(dataFolder);
+            if (stream == null)
+                throw new FileNotFoundException("Installer file was not found!");
+            return Results.File(stream, "application/octet-stream", name);
+        }).RequireAuthorization()
+    .WithOpenApi(op => new OpenApiOperation(op){ Summary = "Gets latest installer"});
+
 app.UseExceptionHandler(_ => {});
 
 app.Run();

Azaion.Api/appsettings.json

@@ -7,7 +7,8 @@
   },
   "AllowedHosts": "*",
   "ResourcesConfig": {
-    "ResourcesFolder": "Content"
+    "ResourcesFolder": "Content",
+    "SuiteInstallerFolder": "suite"
   },
   "JwtConfig": {
     "Issuer": "AzaionApi",