diff options
Diffstat (limited to 'Controllers')
-rw-r--r-- | Controllers/AdministratorsController.cs | 11 | ||||
-rw-r--r-- | Controllers/UserAccountSessionsController.cs (renamed from Controllers/AdministratorSessionsController.cs) | 7 | ||||
-rw-r--r-- | Controllers/UserAccountsController.cs | 39 |
3 files changed, 49 insertions, 8 deletions
diff --git a/Controllers/AdministratorsController.cs b/Controllers/AdministratorsController.cs index 66f805c..e76581f 100644 --- a/Controllers/AdministratorsController.cs +++ b/Controllers/AdministratorsController.cs @@ -1,10 +1,10 @@ using AutoMapper; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using BackendPIA.Forms; using BackendPIA.Models; using BackendPIA.Services; -using BackendPIA.Errors; using BackendPIA.Logics; namespace BackendPIA.Controllers { @@ -16,16 +16,19 @@ namespace BackendPIA.Controllers { private readonly ITokenGenerator _token_generator; private readonly UserManager<UserAccount> _manager; - public AdministratorsController(UserManager<UserAccount> manager, IUserAccountService user_account_service, ITokenGenerator token_generator, IMapper mapper) { + public AdministratorsController(UserManager<UserAccount> manager, IUserAccountService user_account_service, + ITokenGenerator token_generator, IMapper mapper) + { _user_account_service = user_account_service; _mapper = mapper; - _manager = manager; _token_generator = token_generator; + _manager = manager; } + [Authorize(Roles = "Administrator")] [HttpPost("signup")] public async Task<ActionResult<AuthenticationToken>> Create(UserAccountForm form) { - CreateAdministratorLogic logic = new CreateAdministratorLogic(_token_generator, _manager, form, _mapper, _user_account_service); + CreateUserAccountLogic logic = new CreateUserAccountLogic(_token_generator, _manager, form, _mapper, _user_account_service, "Administrator"); var result = await logic.Call(); if(result) diff --git a/Controllers/AdministratorSessionsController.cs b/Controllers/UserAccountSessionsController.cs index 87f3034..1309c8e 100644 --- a/Controllers/AdministratorSessionsController.cs +++ b/Controllers/UserAccountSessionsController.cs @@ -1,6 +1,5 @@ +using AutoMapper; using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Authentication.JwtBearer; -using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using BackendPIA.Forms; using BackendPIA.Models; @@ -9,7 +8,7 @@ using BackendPIA.Errors; using BackendPIA.Logics; namespace BackendPIA.Controllers { - [Route("api/admin")] + [Route("api/")] [ApiController] public class AdministratorSessionsController : ControllerBase { private readonly ITokenGenerator _token_generator; @@ -22,7 +21,7 @@ namespace BackendPIA.Controllers { [HttpPost("login")] public async Task<ActionResult<AuthenticationToken>> Create(UserAccountLoginForm form) { - CreateAdministratorSessionLogic logic = new CreateAdministratorSessionLogic(_token_generator, _manager, form); + CreateUserAccountSessionLogic logic = new CreateUserAccountSessionLogic(_token_generator, _manager, form); var result = await logic.Call(); if(result) diff --git a/Controllers/UserAccountsController.cs b/Controllers/UserAccountsController.cs new file mode 100644 index 0000000..51c2481 --- /dev/null +++ b/Controllers/UserAccountsController.cs @@ -0,0 +1,39 @@ +using AutoMapper; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; +using BackendPIA.Forms; +using BackendPIA.Models; +using BackendPIA.Services; +using BackendPIA.Errors; +using BackendPIA.Logics; + +namespace BackendPIA.Controllers { + [Route("api/")] + [ApiController] + public class UserAccountsController : ControllerBase { + private readonly IUserAccountService _user_account_service; + private readonly IMapper _mapper; + private readonly ITokenGenerator _token_generator; + private readonly UserManager<UserAccount> _manager; + + public UserAccountsController(UserManager<UserAccount> manager, IUserAccountService user_account_service, + ITokenGenerator token_generator, IMapper mapper) + { + _user_account_service = user_account_service; + _mapper = mapper; + _manager = manager; + _token_generator = token_generator; + } + + [HttpPost("signup")] + public async Task<ActionResult<AuthenticationToken>> Create(UserAccountForm form) { + CreateUserAccountLogic logic = new CreateUserAccountLogic(_token_generator, _manager, form, _mapper, _user_account_service, "Regular"); + var result = await logic.Call(); + + if(result) + return Ok(logic.Token); + + return StatusCode(422, logic.Errors); + } + } +}
\ No newline at end of file |