Skip to content
Snippets Groups Projects

tenant in login

Merged Lucca Santangelo Dodera requested to merge feature/tenant-login into develop
6 files
+ 35
17
Compare changes
  • Side-by-side
  • Inline
Files
6
@@ -52,14 +52,14 @@ namespace Tsi1.Api.Controllers
var userName = resultSplit[0];
var tenantName = resultSplit[1];
var tenantId = await _tenantService.GetByName(tenantName);
var tenant = await _tenantService.GetByName(tenantName);
if (tenantId.HasError)
if (tenant.HasError)
{
return BadRequest(tenantId.Message);
return BadRequest(tenant.Message);
}
var result = await _userService.Authenticate(userName, request.Password, tenantId.Data);
var result = await _userService.Authenticate(userName, request.Password, tenant.Data.Id);
if (result.HasError)
{
return BadRequest(result.Message);
@@ -83,7 +83,8 @@ namespace Tsi1.Api.Controllers
UserName = user.Username,
Role = user.UserType.Name,
AccessToken = jwtResult.AccessToken,
RefreshToken = jwtResult.RefreshToken.TokenString
RefreshToken = jwtResult.RefreshToken.TokenString,
Tenant = tenant.Data
});
}
@@ -392,14 +393,14 @@ namespace Tsi1.Api.Controllers
username = resultSplit[0];
var tenantName = resultSplit[1];
var tenantId = await _tenantService.GetByName(tenantName);
var tenant = await _tenantService.GetByName(tenantName);
if (tenantId.HasError)
if (tenant.HasError)
{
return BadRequest(tenantId.Message);
return BadRequest(tenant.Message);
}
var userResult = await _userService.GetByUsername(username, tenantId.Data);
var userResult = await _userService.GetByUsername(username, tenant.Data.Id);
if (userResult.HasError)
{
@@ -430,11 +431,11 @@ namespace Tsi1.Api.Controllers
username = resultSplit[0];
var tenantName = resultSplit[1];
var tenantId = await _tenantService.GetByName(tenantName);
var tenant = await _tenantService.GetByName(tenantName);
if (tenantId.HasError)
if (tenant.HasError)
{
return BadRequest(tenantId.Message);
return BadRequest(tenant.Message);
}
if (!_jwtAuthManager.ValidateVerificationCode(username, code))
@@ -442,7 +443,7 @@ namespace Tsi1.Api.Controllers
return BadRequest("Código de verificación incorrecto");
}
var userResult = await _userService.GetByUsername(username, tenantId.Data);
var userResult = await _userService.GetByUsername(username, tenant.Data.Id);
if (userResult.HasError)
{
return BadRequest(userResult.Message);
Loading