diff --git a/Azaion.Api/Program.cs b/Azaion.Api/Program.cs index 715de4a..9930eaf 100644 --- a/Azaion.Api/Program.cs +++ b/Azaion.Api/Program.cs @@ -105,18 +105,17 @@ app.MapPost("/users", .WithOpenApi(op => new(op){ Summary = "Creates a new user"}); app.MapGet("/users", - async (string searchEmail, RoleEnum? searchRole, IUserService userService, CancellationToken cancellationToken) + async (string? searchEmail, RoleEnum? searchRole, IUserService userService, CancellationToken cancellationToken) => await userService.GetUsers(searchEmail, searchRole, cancellationToken)) .RequireAuthorization(apiAdminPolicy) - .WithOpenApi(op => new(op){ Summary = "Lists all 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)) .Accepts("multipart/form-data") .RequireAuthorization(apiAdminPolicy) - .DisableAntiforgery() - .WithOpenApi(op => new(op){ Summary = "Uploads / Replace existing resource by type"}); + .DisableAntiforgery(); app.MapPost("/resources/get", //Need to have POST method for secure password async ([FromBody]GetResourceRequest request, IAuthService authService, IUserService userService, IResourcesService resourcesService, CancellationToken cancellationToken) => diff --git a/Azaion.Api/Properties/launchSettings.json b/Azaion.Api/Properties/launchSettings.json index 7532d32..9e0658c 100644 --- a/Azaion.Api/Properties/launchSettings.json +++ b/Azaion.Api/Properties/launchSettings.json @@ -18,24 +18,6 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } - }, - "https": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "launchUrl": "swagger", - "applicationUrl": "https://localhost:7139;http://localhost:5219", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "launchUrl": "swagger", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } } } } diff --git a/Azaion.Services/UserService.cs b/Azaion.Services/UserService.cs index 8e3350d..9dd6651 100644 --- a/Azaion.Services/UserService.cs +++ b/Azaion.Services/UserService.cs @@ -12,7 +12,7 @@ public interface IUserService Task RegisterUser(RegisterUserRequest request, CancellationToken cancellationToken = default); Task ValidateUser(LoginRequest request, string? hardwareId = null, CancellationToken cancellationToken = default); Task UpdateHardwareId(string email, string hardwareId, CancellationToken cancellationToken = default); - Task> GetUsers(string searchEmail, RoleEnum? searchRole, CancellationToken cancellationToken); + Task> GetUsers(string? searchEmail, RoleEnum? searchRole, CancellationToken cancellationToken); } public class UserService(IDbFactory dbFactory) : IUserService @@ -58,11 +58,11 @@ public class UserService(IDbFactory dbFactory) : IUserService await dbFactory.RunAdmin(async db => await db.Users.UpdateAsync(x => x.Email == email, u => new User { HardwareId = hardwareId}, token: cancellationToken)); - public async Task> GetUsers(string searchEmail, RoleEnum? searchRole, CancellationToken cancellationToken) => + public async Task> GetUsers(string? searchEmail, RoleEnum? searchRole, CancellationToken cancellationToken) => await dbFactory.Run(async db => await db.Users .WhereIf(!string.IsNullOrEmpty(searchEmail), - u => u.Email.ToLower().Contains(searchEmail.ToLower())) + u => u.Email.ToLower().Contains(searchEmail!.ToLower())) .WhereIf(searchRole != null, u => u.Role == searchRole) .ToListAsync(token: cancellationToken));