diff --git a/Back/skydiveLogs-api.Business/Interface/IUserService.cs b/Back/skydiveLogs-api.Business/Interface/IUserService.cs index 48cbe1a..27964cf 100644 --- a/Back/skydiveLogs-api.Business/Interface/IUserService.cs +++ b/Back/skydiveLogs-api.Business/Interface/IUserService.cs @@ -6,6 +6,8 @@ namespace skydiveLogs_api.Business.Interface { User GetByLogin(string login, string password); + User GetById(int userId); + void AddNewUser(User user); } } diff --git a/Back/skydiveLogs-api.Business/UserService.cs b/Back/skydiveLogs-api.Business/UserService.cs index d3d39ca..4a2d495 100644 --- a/Back/skydiveLogs-api.Business/UserService.cs +++ b/Back/skydiveLogs-api.Business/UserService.cs @@ -1,11 +1,13 @@ -using skydiveLogs_api.Business.Interface; -using skydiveLogs_api.Model; -using skydiveLogs_api.Data.Interface; -using System.Security.Cryptography; +using System.Security.Cryptography; using System.Text; using System.IO; using System; +using skydiveLogs_api.Business.Interface; +using skydiveLogs_api.Model; +using skydiveLogs_api.Data.Interface; + + namespace skydiveLogs_api.Business { public class UserService : IUserService @@ -15,11 +17,14 @@ namespace skydiveLogs_api.Business _userRepository = userRepository; } + public User GetById(int userId) + { + return _userRepository.GetById(userId); + } + public User GetByLogin(string login, string password) { - var tmp = _userRepository.GetByLogin(login, EncryptPassword(password)); - - return tmp; + return _userRepository.GetByLogin(login, EncryptPassword(password)); } public void AddNewUser(User newUser) diff --git a/Back/skydiveLogs-api.Data/UserRepository.cs b/Back/skydiveLogs-api.Data/UserRepository.cs index 18c388c..c7a2440 100644 --- a/Back/skydiveLogs-api.Data/UserRepository.cs +++ b/Back/skydiveLogs-api.Data/UserRepository.cs @@ -46,7 +46,7 @@ namespace skydiveLogs_api.Data public User GetById(int id) { - throw new NotImplementedException(); + return _col.FindById(new BsonValue(id)); } public bool Update(User updated) diff --git a/Back/skydiveLogs-api/Controllers/AircraftController.cs b/Back/skydiveLogs-api/Controllers/AircraftController.cs index 82efbad..09b673f 100644 --- a/Back/skydiveLogs-api/Controllers/AircraftController.cs +++ b/Back/skydiveLogs-api/Controllers/AircraftController.cs @@ -11,8 +11,6 @@ using skydiveLogs_api.Model; namespace skydiveLogs_api.Controllers { - [Route("api/[controller]")] - [ApiController] public class AircraftController : Base { public AircraftController(IAircraftService aircraftService, diff --git a/Back/skydiveLogs-api/Controllers/Base.cs b/Back/skydiveLogs-api/Controllers/Base.cs index 267311a..91f0576 100644 --- a/Back/skydiveLogs-api/Controllers/Base.cs +++ b/Back/skydiveLogs-api/Controllers/Base.cs @@ -1,6 +1,8 @@ using System; using System.Linq; using System.Security.Claims; +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using skydiveLogs_api.Model; @@ -8,6 +10,9 @@ using skydiveLogs_api.Model; namespace skydiveLogs_api.Controllers { + [Route("api/[controller]")] + [ApiController] + [Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)] public class Base : ControllerBase { public User ConnectedUser diff --git a/Back/skydiveLogs-api/Controllers/DropZoneController.cs b/Back/skydiveLogs-api/Controllers/DropZoneController.cs index 20085b2..a0de808 100644 --- a/Back/skydiveLogs-api/Controllers/DropZoneController.cs +++ b/Back/skydiveLogs-api/Controllers/DropZoneController.cs @@ -11,8 +11,6 @@ using skydiveLogs_api.Model; namespace skydiveLogs_api.Controllers { - [Route("api/[controller]")] - [ApiController] public class DropZoneController : Base { public DropZoneController(IDropZoneService dropZoneService, diff --git a/Back/skydiveLogs-api/Controllers/GearController.cs b/Back/skydiveLogs-api/Controllers/GearController.cs index 4fddf33..44995a7 100644 --- a/Back/skydiveLogs-api/Controllers/GearController.cs +++ b/Back/skydiveLogs-api/Controllers/GearController.cs @@ -11,8 +11,6 @@ using skydiveLogs_api.Model; namespace skydiveLogs_api.Controllers { - [Route("api/[controller]")] - [ApiController] public class GearController : Base { public GearController(IGearService gearService, diff --git a/Back/skydiveLogs-api/Controllers/JumpController.cs b/Back/skydiveLogs-api/Controllers/JumpController.cs index 3640ce0..a033d30 100644 --- a/Back/skydiveLogs-api/Controllers/JumpController.cs +++ b/Back/skydiveLogs-api/Controllers/JumpController.cs @@ -1,8 +1,6 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Cors; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Authentication.JwtBearer; using AutoMapper; @@ -10,14 +8,9 @@ using skydiveLogs_api.Business.Interface; using skydiveLogs_api.DataContract; using skydiveLogs_api.Model; -using System.Linq; -using System.Security.Claims; namespace skydiveLogs_api.Controllers { - [Route("api/[controller]")] - [ApiController] - [Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)] public class JumpController : Base { public JumpController(IJumpService jumpService, diff --git a/Back/skydiveLogs-api/Controllers/JumpTypeController.cs b/Back/skydiveLogs-api/Controllers/JumpTypeController.cs index 0f4633c..ee0450e 100644 --- a/Back/skydiveLogs-api/Controllers/JumpTypeController.cs +++ b/Back/skydiveLogs-api/Controllers/JumpTypeController.cs @@ -11,8 +11,6 @@ using skydiveLogs_api.Model; namespace skydiveLogs_api.Controllers { - [Route("api/[controller]")] - [ApiController] public class JumpTypeController : Base { public JumpTypeController(IJumpTypeService jumpTypeService, diff --git a/Back/skydiveLogs-api/Controllers/StatsController.cs b/Back/skydiveLogs-api/Controllers/StatsController.cs index adcfbad..22a532d 100644 --- a/Back/skydiveLogs-api/Controllers/StatsController.cs +++ b/Back/skydiveLogs-api/Controllers/StatsController.cs @@ -10,8 +10,6 @@ using skydiveLogs_api.DataContract; namespace skydiveLogs_api.Controllers { - [Route("api/[controller]")] - [ApiController] public class StatsController : Base { public StatsController(IStatsService statsService, diff --git a/Back/skydiveLogs-api/Controllers/UserController.cs b/Back/skydiveLogs-api/Controllers/UserController.cs index 6276f08..3ff5622 100644 --- a/Back/skydiveLogs-api/Controllers/UserController.cs +++ b/Back/skydiveLogs-api/Controllers/UserController.cs @@ -5,6 +5,10 @@ using Microsoft.IdentityModel.Tokens; using System.IdentityModel.Tokens.Jwt; using Microsoft.Extensions.Configuration; using System.Linq; +using System; +using System.Text; +using System.Security.Claims; +using System.Collections.Generic; using AutoMapper; @@ -12,10 +16,6 @@ using skydiveLogs_api.Business.Interface; using skydiveLogs_api.DataContract; using skydiveLogs_api.Model; -using System; -using System.Text; -using System.Security.Claims; -using System.Collections.Generic; namespace skydiveLogs_api.Controllers { diff --git a/Back/skydiveLogs-api/Data/JumpsDb-log.db b/Back/skydiveLogs-api/Data/JumpsDb-log.db new file mode 100644 index 0000000..7836cc1 Binary files /dev/null and b/Back/skydiveLogs-api/Data/JumpsDb-log.db differ