Merge branch 'RSN-60' of https://github.com/wzarek/Reasn into RSN-60

Server/ReasnAPI/ReasnAPI/Controllers/UsersController.cs

@@ -15,7 +15,7 @@ public class UsersController(UserService userService, InterestService interestSe
     private readonly InterestService _interestService = interestService;
 
     [HttpGet]
-    [Authorize(Roles = "User")]
+    [Authorize(Roles = "Admin")]
     [ProducesResponseType<IEnumerable<UserDto>>(StatusCodes.Status200OK)]
     public IActionResult GetUsers()
     {
@@ -84,7 +84,7 @@ public IActionResult GetUsersInterests()
     [Route("interests/{interestId:int}")]
     [ProducesResponseType(StatusCodes.Status204NoContent)]
     public IActionResult DeleteUserInterest([FromRoute] int interestId)
-    {
+    {
         _interestService.DeleteInterest(interestId);
         return NoContent();
     }

Server/ReasnAPI/ReasnAPI/Services/UserService.cs

@@ -1,55 +1,55 @@
 using Microsoft.EntityFrameworkCore;
 using ReasnAPI.Exceptions;
 using ReasnAPI.Mappers;
-using ReasnAPI.Models.Database;
+using ReasnAPI.Models.Database;
 using ReasnAPI.Models.DTOs;
 using Serilog;
 using System.Linq.Expressions;
 using System.Security.Claims;
 using System.Transactions;
-
-namespace ReasnAPI.Services;
-
-public class UserService
-{
-    private readonly ReasnContext _context;
-    private readonly IHttpContextAccessor _httpContextAccessor;
-
+
+namespace ReasnAPI.Services;
+
+public class UserService
+{
+    private readonly ReasnContext _context;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
     public UserService(ReasnContext context)
     {
         _context = context;
     }
 
-    public UserService(ReasnContext context, IHttpContextAccessor httpContextAccessor)
-    {
-        _context = context;
-        _httpContextAccessor = httpContextAccessor;
-    }
-
-    public User GetCurrentUser()
-    {
+    public UserService(ReasnContext context, IHttpContextAccessor httpContextAccessor)
+    {
+        _context = context;
+        _httpContextAccessor = httpContextAccessor;
+    }
+
+    public User GetCurrentUser()
+    {
         var httpContext = _httpContextAccessor.HttpContext;
 
         if (httpContext is null)
-        {
-            throw new InvalidOperationException("No HTTP context available");
-        }
-
+        {
+            throw new InvalidOperationException("No HTTP context available");
+        }
+
         var email = httpContext.User.FindFirstValue(ClaimTypes.Email);
-        if (string.IsNullOrEmpty(email))
-        {
-            throw new UnauthorizedAccessException("No email claim found in token");
-        }
-
-        var user = _context.Users.FirstOrDefault(u => u.Email == email);
-
-        if (user is null)
-        {
-            throw new NotFoundException("User associated with email not found");
-        }
-
-        return user;
-    }
+        if (string.IsNullOrEmpty(email))
+        {
+            throw new UnauthorizedAccessException("No email claim found in token");
+        }
+
+        var user = _context.Users.FirstOrDefault(u => u.Email == email);
+
+        if (user is null)
+        {
+            throw new NotFoundException("User associated with email not found");
+        }
+
+        return user;
+    }
 
     public UserDto UpdateUser(string username, UserDto userDto)
     {