diff --git a/Soccer.Api/Controllers/AuthController.cs b/Soccer.Api/Controllers/AuthController.cs index 1835b33..a3adea2 100644 --- a/Soccer.Api/Controllers/AuthController.cs +++ b/Soccer.Api/Controllers/AuthController.cs @@ -12,7 +12,7 @@ namespace Soccer.Api.Controllers; [ApiController] [Route("[controller]/[action]")] -[Authorize(AuthenticationSchemes = "Bearer")] +// [Authorize(AuthenticationSchemes = "Bearer")] public class AuthController : ControllerBase { private readonly IAuthentication _auth; @@ -64,7 +64,7 @@ public async Task ResetPassword(string username, string token, st return BadRequest(results); return Ok(results); } - [Authorize(Roles = Roles.User)] + [Authorize(Roles = Roles.Admin)] [HttpPost] public async Task AddUserToRole([FromQuery] string username, string role) { @@ -83,7 +83,7 @@ public async Task RemoveUserFromRole([FromQuery] string username, return BadRequest(results); return Ok(results); } - // [Authorize(Roles = Roles.Admin)] + [Authorize(Roles = Roles.Admin)] [HttpGet] public IActionResult GetUsers() { @@ -92,7 +92,7 @@ public IActionResult GetUsers() return BadRequest(results); return Ok(results.Select(u => _mapper.Map(u))); } - // [Authorize(Roles = Roles.Admin)] + [Authorize(Roles = Roles.Admin)] [HttpGet] public async Task GetUsersInRoles([FromQuery] string role) { diff --git a/SoccerProject.code-workspace b/SoccerProject.code-workspace index 4e1e7ff..b171330 100644 --- a/SoccerProject.code-workspace +++ b/SoccerProject.code-workspace @@ -43,5 +43,7 @@ "path": "Soccer.Shared/AutoMapperProfiles" } ], - "settings": {} + "settings": { + "liveServer.settings.multiRootWorkspaceName": "SoccerProject" + } } \ No newline at end of file diff --git a/Src/AuthenticationServices/Authentication/AuthenticationUserQueries.cs b/Src/AuthenticationServices/Authentication/AuthenticationUserQueries.cs index 28db289..07eaa9b 100644 --- a/Src/AuthenticationServices/Authentication/AuthenticationUserQueries.cs +++ b/Src/AuthenticationServices/Authentication/AuthenticationUserQueries.cs @@ -6,7 +6,7 @@ public partial class Authentication where TUser : IdentityUser { public List GetAllUsers() { - return _userManager.Users.ToList(); + return _userManager.Users.AsParallel().ToList(); } public virtual async Task> GetUsersInRoleAsync(string role) { @@ -15,6 +15,6 @@ public virtual async Task> GetUsersInRoleAsync(string role) var users = await _userManager.GetUsersInRoleAsync(role); - return users.ToList(); + return users.AsParallel().ToList(); } } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index d16e3bd..328ec37 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ version: '3.8' services: server: - # image: soccerapi:dev + image: soccerapi:dev build: context: . dockerfile: Soccer.Api/Dockerfile @@ -12,15 +12,18 @@ services: - 5000:5000 depends_on: - seq - - db + # - db environment: - SimpleProperty="Hello from docker compose" - ConnectionStrings__DefaultConnection=Server=db;Database=SoccerDb;Username=root;Password=2510203121; + - Debug:ShowHost=true # - Seq="http://seq:5341" networks: - server-database volumes: - .:/src + deploy: + replicas: 6 entrypoint: dotnet run seq: @@ -28,9 +31,9 @@ services: environment: - ACCEPT_EULA=Y ports: - - 5343:80 - networks: - - server-database + - 5344:80 + # networks: + # - server-database db: image: mysql/mysql-server:latest @@ -39,17 +42,17 @@ services: - MYSQL_DATABASE=SoccerDb - MYSQL_USER=root - MYSQL_PASSWORD=2510203121 - volumes: - - dbvolume4:/var/lib/mysql - - ./_MySQL_Init_Script:/docker-entrypoint-initdb.d + # volumes: + # - dbvolume4:/var/lib/mysql + # - ./_MySQL_Init_Script:/docker-entrypoint-initdb.d - networks: - - server-database + # networks: + # - server-database # ports: # - 3306:3306 -volumes: - dbvolume4: +# volumes: +# dbvolume4: networks: server-database: driver: bridge \ No newline at end of file