Govor-team/Govor
2
2
Fork 0
mirror of https://github.com/Govor-team/Govor.git synced 2026-07-21 19:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor user context handling with CurrentUserService

Browse Source 
Introduced ICurrentUserService and its implementation to centralize retrieval of the current user's ID from claims. Updated FriendsController to use this service instead of direct claim access. Registered the service and IHttpContextAccessor in DI. Added integration tests for FriendsController. Moved UsernameValidator to Infrastructure/Validators.
This commit is contained in:
Artemy
2025-06-30 17:37:02 +07:00
parent a659c73357
commit f53ee6644b
7 changed files with 167 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Govor.API/Controllers/FriendsController.cs
+12 -17
View File
@@ -1,5 +1,6 @@
using Govor.Application.Exceptions.FriendsService;
using Govor.Application.Interfaces;
using Govor.Application.Interfaces.Infrastructure.Extensions;
using Govor.Contracts.DTOs;
using Govor.Core.Models;
using Microsoft.AspNetCore.Authorization;
@@ -14,11 +15,15 @@ public class FriendsController : Controller
{
private readonly ILogger<FriendsController> _logger;
private readonly IFriendsService _friendsService;
public FriendsController(ILogger<FriendsController> logger, IFriendsService friendsService)
private readonly ICurrentUserService _currentUserService;
public FriendsController(ILogger<FriendsController> logger,
IFriendsService friendsService,
ICurrentUserService currentUserService)
{
_logger = logger;
_friendsService = friendsService;
_currentUserService = currentUserService;
}
[HttpGet("search")]
@@ -29,7 +34,7 @@ public class FriendsController : Controller
try
{
var result = await _friendsService.SearchUsersAsync(query, GetCurrentUserId());
var result = await _friendsService.SearchUsersAsync(query, _currentUserService.GetCurrentUserId());
return Ok(BuildUserDtos(result));
}
catch (SearchUsersException ex)
@@ -52,7 +57,7 @@ public class FriendsController : Controller
try
{
await _friendsService.SendFriendRequestAsync(targetUserId, GetCurrentUserId());
await _friendsService.SendFriendRequestAsync(targetUserId, _currentUserService.GetCurrentUserId());
return Ok(new { message = "Friend request sent successfully." });
}
catch (InvalidOperationException ex)
@@ -77,7 +82,7 @@ public class FriendsController : Controller
{
try
{
var result = await _friendsService.GetIncomingRequestsAsync(GetCurrentUserId());
var result = await _friendsService.GetIncomingRequestsAsync(_currentUserService.GetCurrentUserId());
return Ok(BuildFriendshipDtos(result));
}
catch (InvalidOperationException ex)
@@ -100,7 +105,7 @@ public class FriendsController : Controller
try
{
await _friendsService.AcceptFriendRequestAsync(requesterId, GetCurrentUserId());
await _friendsService.AcceptFriendRequestAsync(requesterId, _currentUserService.GetCurrentUserId());
return Ok(new { message = "Friend request accepted." });
}
catch (InvalidOperationException ex)
@@ -125,7 +130,7 @@ public class FriendsController : Controller
{
try
{
var result = await _friendsService.GetFriendsAsync(GetCurrentUserId());
var result = await _friendsService.GetFriendsAsync(_currentUserService.GetCurrentUserId());
return Ok(BuildUserDtos(result));
}
catch (InvalidOperationException ex)
@@ -140,16 +145,6 @@ public class FriendsController : Controller
}
}
private Guid GetCurrentUserId()
{
var userIdClaim = HttpContext.User?.FindFirst("userID")?.Value;
if (string.IsNullOrEmpty(userIdClaim) || !Guid.TryParse(userIdClaim, out var userId))
{
throw new UnauthorizedAccessException("userID claim is missing or invalid");
}
return userId;
}
private List<UserDto> BuildUserDtos(IEnumerable<User> users) => users.Select(user => new UserDto
{
Id = user.Id,