From c85b036b7ebf13d51eaabef3515f7ec9df9adf11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= Date: Sat, 21 Mar 2020 16:43:56 +0100 Subject: [PATCH] Little update around the controllers --- .../Interface/IUserService.cs | 2 ++ Back/skydiveLogs-api.Business/UserService.cs | 19 +++++++++++------- Back/skydiveLogs-api.Data/UserRepository.cs | 2 +- .../Controllers/AircraftController.cs | 2 -- Back/skydiveLogs-api/Controllers/Base.cs | 5 +++++ .../Controllers/DropZoneController.cs | 2 -- .../Controllers/GearController.cs | 2 -- .../Controllers/JumpController.cs | 7 ------- .../Controllers/JumpTypeController.cs | 2 -- .../Controllers/StatsController.cs | 2 -- .../Controllers/UserController.cs | 8 ++++---- Back/skydiveLogs-api/Data/JumpsDb-log.db | Bin 0 -> 122880 bytes 12 files changed, 24 insertions(+), 29 deletions(-) create mode 100644 Back/skydiveLogs-api/Data/JumpsDb-log.db 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 0000000000000000000000000000000000000000..7836cc1051b74b8dd826bc24fcdfe73b5926d9bf GIT binary patch literal 122880 zcmeI*yKfxV702;AcVFaEq?US8TvA-pWFZ$J6a)d>MGyrc0p!Mx9XJT=g|)H?%OQlv=XDro{FT>uvWQVH%-7^wmm0o)kO`JEx}a32&%IiVEqcK{Br z=H9(C{BUL{;LJJG2qBbqc9(G8{uO5JYw>T@5Wc7`gwWdS-2L9L-stUvT8-3uI<@9@ zKRwpp`Y@%pFxDJj?}wiWrISV&d=_B_txBU>F;lk>&(iRyk!7t0TQR2L#fk0{SJEzu zRyCG1JnCTb3n@)pEn2ah<}9Z}@JVVKRJ8nvYO#`rSJH5wZbHKcS~Jlu*4;y>rr|#E zq=tK|9%~wu={Rd?kWW{S6YBCGVIp<;N2m08A2byw)1b*TsILAKT6t?G)-}j?Qcr_? zlIb{=x~5W>e{?3EP?!ILPNc4B&3aNR|9nF&|4ABg+M4-Jrql2l^*7>-y2| zGOKoi)T{Tne?f%+SB=XHg%m%UFXy_ z7tg7y>U&IG=hbyVE8pw2hW4y_i7 zR=l9$K2vdh`Ee}7d3E_r#Z~2#WcvJkI=Z|Sn;Oo700IagfB*srAb*E8ue!DWRay&wEv<)N+t+PtU$^gb_Vv%W9{w0_WbbA- zvQ|(OCXbz1uq0E^CR5a^vSty;YZZ%HdJJX9HZ@+~yy*`JlzwpU-R+kjYB?sJ&2IZvuNbOWY%w(ThtfuOYx}jW_x8=Iz-lox^@q~+PP-cx zt=D&6%&4fT_l3r_`=6`y93O<2K7W7Tna(}pd=~2An_XnGi1px#Q zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_KdV-}drzEiGb>!nKee5_<^StT2c|9fVp z;{Vm}TA=Nfs>R6rL*IHpU_`8s`2W~F1VQ}Ye&xjf4T1Q7ev?cOL|E07Q8&r{ryRbK z4@7+W$yeJv5MjT576cGL009ILKmY**5I_I{1Q0*~0R#|0009ILK;VBaFq>VgjEeuO zPI6KIU-5s>|G!wbYT?h9#F{#oxssQ!> zbq4vH0I2_O64d|K`EcCz|NSneRdK7&ABK3!_5T-jO#YI9eXYFye_17OinnU`n+E)K z0r}fl^ueN)|J{muqJsqi1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#{@n!pR;3##Z1R#&g+9vA%?;%kC-?F~R|0n;S`v1H2|NSOO{{Q8a|KAUy zSGA0&8bd(@b74UM0R#|0009ILKmY**5I_I{1Q0*~0R#|0009J^Kwvg|rFyvhf5rbj z|9@%C;{Vrb7yDAyJ*cDn$WdAU#WwQ)^JgZ8)_s_Ayf`$34TlvV|6gYi`Tsg!Btiba z6v+P%O*!n#`qw}6N&pAv|6kOgBJ00s?a%+uR5+mO_ouXrEb7??76cGL009ILKmY** z5I_I{1Q0*~0R#|0009ILKwvgm8bt9s`(e8CZc{uLTrvlN*mHGbddb}R=*w-thnN5h0tg_000IagfB*srAb5D1rL3pa$0FB%REzxo{F#ZNbswfuNSB6&u;H)* zb3|9ky^|3$RI&Tjhu&W>syYlNi^ zA8D~%zt=5ydG%XbX9|u4tuhZ>9%&{9BY*$`2q1s}0tg_000IagfB*srAbi_4@Obo62Fy+`98p4Ld3Q+%FXAt%Ob-qY~`u|d({{J&m|G$;j|Myn|O!!?* zzn~?pvZ#1B3jzorfB*srAbokZAoBlp zzDR=ne<_gv|26Xe{g$lNg5QMHn)6oF6CJ@b`KzgGQTe$@2dd|M&d==l){(|Np41^rft)OvO=I|HU@)|MO=ihSq(U%JW