AppStd/DigitalData.Auth
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(ConsumerApi): umbenannt in Consumer mit LoginDto.

Browse Source 
- ConsumerApi.Name umbenannt in Id
 - Eigenschaft audience hinzugefügt.
This commit is contained in:
Developer 02
2025-01-21 17:13:53 +01:00
parent 47aeb49a40
commit 0a61586e39
13 changed files with 73 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/DigitalData.Auth.API/Controllers/AuthController.cs
View File

@@ -19,7 +19,7 @@ namespace DigitalData.Auth.API.Controllers
{
private readonly IJwtSignatureHandler<UserReadDto> _userSignatureHandler;
private readonly IJwtSignatureHandler<ConsumerApi> _apiSignatureHandler;
private readonly IJwtSignatureHandler<Consumer> _consumerSignatureHandler;
private readonly AuthApiParams _apiParams;
@@ -31,9 +31,9 @@ namespace DigitalData.Auth.API.Controllers
private readonly IDirectorySearchService _dirSearchService;
private readonly IConsumerApiService _consumerApiService;
private readonly IConsumerService _consumerService;
public AuthController(IJwtSignatureHandler<UserReadDto> userSignatureHandler, IOptions<AuthApiParams> cookieParamsOptions, ICryptoFactory cryptoFactory, ILogger<AuthController> logger, IUserService userService, IDirectorySearchService dirSearchService, IConsumerApiService consumerApiService, IJwtSignatureHandler<ConsumerApi> apiSignatureHandler)
public AuthController(IJwtSignatureHandler<UserReadDto> userSignatureHandler, IOptions<AuthApiParams> cookieParamsOptions, ICryptoFactory cryptoFactory, ILogger<AuthController> logger, IUserService userService, IDirectorySearchService dirSearchService, IConsumerService consumerService, IJwtSignatureHandler<Consumer> apiSignatureHandler)
{
_apiParams = cookieParamsOptions.Value;
_userSignatureHandler = userSignatureHandler;
@@ -41,8 +41,8 @@ namespace DigitalData.Auth.API.Controllers
_logger = logger;
_userService = userService;
_dirSearchService = dirSearchService;
_consumerApiService = consumerApiService;
_apiSignatureHandler = apiSignatureHandler;
_consumerService = consumerService;
_consumerSignatureHandler = apiSignatureHandler;
}
private async Task<IActionResult> CreateTokenAsync(LogInDto login, string consumerRoute, bool cookie = true)
@@ -72,9 +72,9 @@ namespace DigitalData.Auth.API.Controllers
return Ok(token);
}
private async Task<IActionResult> CreateTokenAsync(ConsumerApiLogin login, bool cookie = true)
private async Task<IActionResult> CreateTokenAsync(ConsumerLogin login, bool cookie = true)
{
var api = await _consumerApiService.ReadByNameAsync(login.Name);
var api = await _consumerService.ReadByIdAsync(login.Id);
if (api is null || api.Password != login.Password)
return Unauthorized();
@@ -82,7 +82,7 @@ namespace DigitalData.Auth.API.Controllers
if (!_cryptoFactory.TokenDescriptors.TryGet(_apiParams.Issuer, _apiParams.DefaultConsumer.Audience, out var descriptor))
return StatusCode(StatusCodes.Status500InternalServerError);
var token = _apiSignatureHandler.WriteToken(api, descriptor);
var token = _consumerSignatureHandler.WriteToken(api, descriptor);
//set cookie
if (cookie)
@@ -112,7 +112,7 @@ namespace DigitalData.Auth.API.Controllers
[HttpPost("login")]
[AllowAnonymous]
public async Task<IActionResult> Login([FromForm] ConsumerApiLogin login)
public async Task<IActionResult> Login([FromForm] ConsumerLogin login)
{
try
{
@@ -155,7 +155,7 @@ namespace DigitalData.Auth.API.Controllers
}
[HttpPost]
public async Task<IActionResult> CreateTokenViaBody([FromBody] ConsumerApiLogin login, [FromQuery] bool cookie = false)
public async Task<IActionResult> CreateTokenViaBody([FromBody] ConsumerLogin login, [FromQuery] bool cookie = false)
{
try
{