Merge branch 'feature/pawel' into backend-dev

Author: Paul Frank

TableBookingAPI/TableBooking/Controllers/BookingController.cs

@@ -1,33 +1,49 @@
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using TableBooking.Api.Interfaces;
+using TableBooking.Api.Services;
 using TableBooking.Model.Dtos.BookingDtos;
+using TableBooking.Model.Models;
 
-namespace TableBooking.Controllers
+
+namespace TableBooking.Api.Controllers
 {
-    [Authorize]
     [Route("[controller]")]
     [ApiController]
+    [Authorize]
     public class BookingController : ControllerBase
     {
-        private IBookingService _bookingService;
-        public BookingController(IBookingService bookingService)
+        private readonly IBookingService _bookingService;
+        private readonly UserManager<AppUser> _userManager;
+
+        public BookingController(IBookingService bookingService, UserManager<AppUser> userManager)
         {
             _bookingService = bookingService;
+            _userManager = userManager;
         }
 
+        // private async Task<AppUser> GetCurrentUserAsync()
+        // {
+        //     //_userService.GetUserAsync(HttpContext.User);
+        //     //_userService.
+        // }
+
+
         [HttpGet("GetAllUserBookings")]
         public async Task<IActionResult> GetUserBookings()
         {
             var userId = Guid.Parse(User.FindFirstValue(ClaimTypes.NameIdentifier));
+            
             return await _bookingService.GetAllBookings(userId);
         }
 
         [HttpGet("GetById/{id}")]
         public async Task<IActionResult> GetUserBookingById(Guid id)
         {
             var userId = Guid.Parse(User.FindFirstValue(ClaimTypes.NameIdentifier));
+            
             return await _bookingService.GetBookingByIdAsync(id, userId);
         }
 

TableBookingAPI/TableBooking/Controllers/UserController.cs

@@ -1,11 +1,14 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using TableBooking.Api.Interfaces;
 using TableBooking.Model.Dtos.UserDtos;
 
 namespace TableBooking.Controllers
 {
     [Route("[controller]")]
     [ApiController]
+    [Authorize]
     public class UserController : ControllerBase
     {
         private IUserService _userService;
@@ -17,16 +20,25 @@ public UserController(IUserService userService)
 
         [HttpPost]
         [Route("register")]
+        [AllowAnonymous]
         public async Task<IActionResult> Register([FromBody] UserRegisterDto userRegisterDTO)
         {
             return await _userService.Register(userRegisterDTO);
         }
 
         [HttpPost]
+        [AllowAnonymous]
         [Route("login")]
         public async Task<IActionResult> Login([FromBody] UserLoginDto userLoginDTO)
         {
             return await _userService.Login(userLoginDTO);
         }
+        
+        [HttpPost]
+        [Route("logout")]
+        public async Task<IActionResult> Logout()
+        {
+            throw new NotImplementedException();
+        }
     }
 }

TableBookingAPI/TableBooking/Program.cs

@@ -17,6 +17,7 @@
 using TableBooking.Logic.Converters.TableConverters;
 using TableBooking.Logic.Converters.RatingConverters;
 using TableBooking.Logic.Converters.UserConverters;
+using System.Security.Claims;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -116,13 +117,15 @@
     };
 });
 
-builder.Services.AddAuthorization();
-
 builder.Services.Configure<IdentityOptions>(options =>
 {
     options.User.RequireUniqueEmail = true;
+    options.ClaimsIdentity.UserIdClaimType = ClaimTypes.NameIdentifier;
 });
 
+//builder.Services.AddHttpContextAccessor();
+builder.Services.AddAuthorization();
+
 builder.Services.AddScoped<IUnitOfWork, UnitOfWork>();
 
 builder.Services.AddTransient<ITableConverter, TableConverter>(); // doczytaj debilu

TableBookingAPI/TableBooking/Services/UserService.cs

@@ -59,7 +59,8 @@ public async Task<IActionResult> Login(UserLoginDto dto)
             var authClaims = new List<Claim>
             {
                 new Claim(ClaimTypes.Name, user.UserName),
-                new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
+                new Claim(ClaimTypes.NameIdentifier, user.Id.ToString()),
+                new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString())
             };
 
             var token = GetToken(authClaims);
@@ -82,7 +83,7 @@ private JwtSecurityToken GetToken(List<Claim> authClaims)
                 claims: authClaims,
                 signingCredentials: new SigningCredentials(authSigningKey, SecurityAlgorithms.HmacSha256)
                 );
-
+            
             return token;
         }