Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Data/Enums/DocumentTypeEnum.cs

This file was deleted.

20 changes: 10 additions & 10 deletions Data/Repositories/UserRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,26 @@ await _context.Users.FirstOrDefaultAsync(x => x.PublicId == publicId
public async Task<bool> IsRegistered(string email) =>
await _context.Users.AnyAsync(x => x.Email.ToLower() == email.ToLower() && x.IsActive);

public async Task<User> CreateUserAsync(User tutor)
public async Task<User> CreateUserAsync(User user)
{
var newTutor = await _context.Users.AddAsync(tutor);
var newUser = await _context.Users.AddAsync(user);
await _context.SaveChangesAsync();

return newTutor.Entity;
return newUser.Entity;
}

public async Task<User> UpdateUserAsync(User tutor)
public async Task<User> UpdateUserAsync(User user)
{
tutor.UpdatedAt = DateTime.UtcNow;
var newTutor = _context.Users.Update(tutor);
user.UpdatedAt = DateTime.UtcNow;
var newUser = _context.Users.Update(user);
await _context.SaveChangesAsync();

return newTutor.Entity;
return newUser.Entity;
}

public async Task DeleteUserAsync(User tutor)
public async Task DeleteUserAsync(User user)
{
tutor.IsActive = false;
await UpdateUserAsync(tutor);
user.IsActive = false;
await UpdateUserAsync(user);
}
}
2 changes: 1 addition & 1 deletion Services/ApplicationServices/Interfaces/ITokenService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ namespace HelloPets.Services.ApplicationServices.Interfaces;

public interface ITokenService
{
public string Generate(User tutor, TimeSpan periodo);
public string Generate(User user, TimeSpan timeSpan);
public int GetUserIdFromToken();
}
8 changes: 4 additions & 4 deletions Services/ApplicationServices/TokenService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ public string Generate(User user, TimeSpan timeSpan)
}
}

private static IEnumerable<Claim> GetClaims(User tutor)
private static IEnumerable<Claim> GetClaims(User user)
{
return
[
new Claim("id", tutor.Id.ToString()),
new Claim(JwtRegisteredClaimNames.Name, tutor.Name),
new Claim(JwtRegisteredClaimNames.Email, tutor.Email),
new Claim("id", user.Id.ToString()),
new Claim(JwtRegisteredClaimNames.Name, user.Name),
new Claim(JwtRegisteredClaimNames.Email, user.Email),

//Insere a data de criacao do token ao token
new Claim(JwtRegisteredClaimNames.Iat,
Expand Down
18 changes: 9 additions & 9 deletions WebApi/Controllers/UsersController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ namespace HelloPets.WebApi.Controllers;
public class UsersController : BaseController
{
private readonly IPasswordService _passwordService;
private readonly IUserRepository _tutorRepository;
private readonly IUserRepository _userRepository;

public UsersController(ITokenService tokenService,
IPasswordService passwordService,
IUserRepository tutorRepository) : base(tokenService)
IUserRepository userRepository) : base(tokenService)
{
_passwordService = passwordService;
_tutorRepository = tutorRepository;
_userRepository = userRepository;
}

[HttpPost]
[AllowAnonymous]
public async Task<IActionResult> RegisterUser([FromBody] CreateUserViewModel userVM)
{
if (await _tutorRepository.IsRegistered(userVM.Email))
if (await _userRepository.IsRegistered(userVM.Email))
return BadRequest("Email já cadastrado");

if (userVM.Password.Trim() != userVM.PasswordVerification.Trim())
Expand All @@ -52,7 +52,7 @@ userVM.Document is not null &&
Salt = userVM.Salt,
};

await _tutorRepository.CreateUserAsync(user);
await _userRepository.CreateUserAsync(user);

return Ok(new ReturnUserViewModel
{
Expand All @@ -68,7 +68,7 @@ userVM.Document is not null &&
[AllowAnonymous]
public async Task<IActionResult> UpdateUser([FromRoute] Guid publicId, [FromBody] PatchUserViewModel user)
{
var existingUser = await _tutorRepository.GetUserByPublicIdAsync(publicId);
var existingUser = await _userRepository.GetUserByPublicIdAsync(publicId);

if (existingUser == null)
return BadRequest("Usuário não existe com Id informado.");
Expand All @@ -85,7 +85,7 @@ public async Task<IActionResult> UpdateUser([FromRoute] Guid publicId, [FromBody
if (existingUser.FileId != user.ProfileImageId)
existingUser.FileId = user.ProfileImageId;

await _tutorRepository.UpdateUserAsync(existingUser);
await _userRepository.UpdateUserAsync(existingUser);

return NoContent();
}
Expand All @@ -94,15 +94,15 @@ public async Task<IActionResult> UpdateUser([FromRoute] Guid publicId, [FromBody
[HttpDelete("{publicId}")]
public async Task<IActionResult> DeleteUser([FromRoute] Guid publicId, [FromBody] DeleteUserViewModel userVM)
{
var user = await _tutorRepository.GetUserByPublicIdAsync(publicId);
var user = await _userRepository.GetUserByPublicIdAsync(publicId);

if (user is null)
return BadRequest("Usuário não existente.");

if (user.Id != userVM.Id)
return BadRequest("ID do usuário diferente do fornecido.");

await _tutorRepository.DeleteUserAsync(user);
await _userRepository.DeleteUserAsync(user);

return NoContent();
}
Expand Down