Merge pull request #7 from KYJKY/master

JWT, Refresh Token 추가
EveryPin · Jan 31, 2024 · 5ee2a8e · 5ee2a8e
2 parents 5f281bb + e86b1cb
commit 5ee2a8e
Show file tree

Hide file tree

Showing 27 changed files with 1,633 additions and 77 deletions.
diff --git a/EveryPinApi.Entites/Models/Post.cs b/EveryPinApi.Entites/Models/Post.cs
@@ -14,6 +14,9 @@ public class Post
         public string? PostContent { get; set; }
         [ForeignKey("User")]
         public required string UserId { get; set; }
+        public string? Address { get; set; }
+        public double? latitude { get; set; }
+        public double? longitude { get; set; }
         public ICollection<PostPhoto> PostPhotos { get; } = new List<PostPhoto>();
         public ICollection<Like> Likes { get; } = new List<Like>();    
         public ICollection<Comment> Comments { get; } = new List<Comment>();

diff --git a/EveryPinApi.Entites/Models/User.cs b/EveryPinApi.Entites/Models/User.cs
@@ -17,6 +17,8 @@ public class User : IdentityUser
         public ICollection<Like> Like { get; set; } = new List<Like>();
         public string? Name { get; set; }
         //public string? Email { get; set; }
+        public string? RefreshToken { get; set; }
+        public DateTime RefreshTokenExpiryTime { get; set; }
         public DateTime CreatedDate { get; set; }
         public DateTime LastLoginDate { get; set; }
         public bool DeleteCheck { get; set; }

diff --git a/EveryPinApi.Presentation/Controllers/AuthenticationController.cs b/EveryPinApi.Presentation/Controllers/AuthenticationController.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Logging;
 using Service.Contracts;
 using Shared.DataTransferObject;
+using Shared.DataTransferObject.Auth;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -24,12 +25,11 @@ public AuthenticationController(ILogger<AuthenticationController> logger, IServi
             _service = service;
         }
 
-        [HttpPost]
+        [HttpPost("regist")]
         //[ServiceFilter(typeof(ValidationFilterAttribute))]
         public async Task<IActionResult> RegisterUser([FromBody] RegistUserDto registUserDto)
         {
-            var result = await
-            _service.AuthenticationService.RegisterUser(registUserDto);
+            var result = await _service.AuthenticationService.RegisterUser(registUserDto);
 
             if (!result.Succeeded)
             {
@@ -42,6 +42,18 @@ public async Task<IActionResult> RegisterUser([FromBody] RegistUserDto registUse
 
             return StatusCode(201);
         }
+
+        [HttpPost("login")]
+        public async Task<IActionResult> Authenticate([FromBody] UserAutenticationDto user)
+        {
+            if (!await _service.AuthenticationService.ValidateUser(user))
+                return Unauthorized();
+
+            var tokenDto = await _service.AuthenticationService.CreateToken(populateExp: true);
+
+            return Ok(tokenDto);
+
+        }
     }
 
 }
diff --git a/EveryPinApi.Presentation/Controllers/CommentController.cs b/EveryPinApi.Presentation/Controllers/CommentController.cs
@@ -8,6 +8,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using Microsoft.AspNetCore.Authorization;
 
 namespace EveryPinApi.Presentation.Controllers
 {
@@ -24,7 +25,8 @@ public CommentController(ILogger<CommentController> logger, IServiceManager serv
             _service = service;
         }
 
-        [HttpGet]
+        [HttpGet(Name = "GetComment")]
+        [Authorize(Roles ="NormalUser")]
         public IActionResult GetAllComment()
         {
             var companies = _service.CommentService.GetAllComment(trackChanges: false);

diff --git a/EveryPinApi.Presentation/Controllers/LikeController.cs b/EveryPinApi.Presentation/Controllers/LikeController.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Service.Contracts;
 using System;
@@ -23,6 +24,7 @@ public LikeController(ILogger<LikeController> logger, IServiceManager service)
         }
 
         [HttpGet]
+        [Authorize(Roles = "NormalUser")]
         public IActionResult GetAllLike()
         {
             var likes = _service.LikeService.GetAllLike(trackChanges: false);

diff --git a/EveryPinApi.Presentation/Controllers/PostController.cs b/EveryPinApi.Presentation/Controllers/PostController.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Service.Contracts;
 using System;
@@ -23,6 +24,7 @@ public PostController(ILogger<PostController> logger, IServiceManager service)
         }
 
         [HttpGet]
+        [Authorize(Roles = "NormalUser")]
         public IActionResult GetAllPost()
         {
             var posts = _service.PostService.GetAllPost(trackChanges: false);

diff --git a/EveryPinApi.Presentation/Controllers/PostPhotoController.cs b/EveryPinApi.Presentation/Controllers/PostPhotoController.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Service.Contracts;
 using System;
@@ -23,6 +24,7 @@ public PostPhotoController(ILogger<PostPhotoController> logger, IServiceManager
         }
 
         [HttpGet]
+        [Authorize(Roles = "NormalUser")]
         public IActionResult GetAllPostPhoto()
         {
             var postPhotos = _service.PostPhotoService.GetAllPostPhoto(trackChanges: false);

diff --git a/EveryPinApi.Presentation/Controllers/ProfileController.cs b/EveryPinApi.Presentation/Controllers/ProfileController.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Service.Contracts;
 using System;
@@ -23,6 +24,7 @@ public ProfileController(ILogger<ProfileController> logger, IServiceManager serv
         }
 
         [HttpGet]
+        [Authorize(Roles = "NormalUser")]
         public IActionResult GetAllProfile()
         {
             var profiles = _service.ProfileService.GetAllProfile(trackChanges: false);

diff --git a/EveryPinApi.Presentation/Controllers/TokenController.cs b/EveryPinApi.Presentation/Controllers/TokenController.cs
@@ -0,0 +1,27 @@
+using Microsoft.AspNetCore.Mvc;
+using Service.Contracts;
+using Shared.DataTransferObject.Auth;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EveryPinApi.Presentation.Controllers
+{
+    [Route("api/token")]
+    [ApiController]
+    public class TokenController : ControllerBase
+    {
+        private readonly IServiceManager _service;
+
+        public TokenController(IServiceManager service) => _service = service;
+
+        [HttpPost("refresh")]
+        public async Task<IActionResult> Refresh([FromBody] TokenDto tokenDto)
+        {
+            var tokenDtoToReturn = await _service.AuthenticationService.RefreshToken(tokenDto);
+            return Ok(tokenDtoToReturn);
+        }
+    }
+}
diff --git a/EveryPinApi/EveryPinApi.csproj b/EveryPinApi/EveryPinApi.csproj
@@ -16,6 +16,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.22.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.14" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />