ArticleController interface implementation

gdsc-upt · Dec 10, 2023 · dc077e9 · dc077e9
1 parent 0401703
commit dc077e9
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 37 deletions.
diff --git a/GdscBackend/Common/Extensions/ClaimsPrincipalExtensions.cs b/GdscBackend/Common/Extensions/ClaimsPrincipalExtensions.cs
@@ -6,13 +6,6 @@ public static class ClaimsPrincipalExtensions
 {
     public static string? GetUserId(this ClaimsPrincipal user)
     {
-        var userIdClaim = user.Claims.FirstOrDefault(c => c.Type == "sub");
-
-        if (userIdClaim is not null && !string.IsNullOrEmpty(userIdClaim.Value))
-        {
-            return userIdClaim.Value;
-        }
-
-        return null;
+        return user.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value;
     }
-}
+}
diff --git a/GdscBackend/Database/Repository.cs b/GdscBackend/Database/Repository.cs
@@ -60,7 +60,7 @@ public async Task<T> AddOrUpdateAsync([NotNull] T entity)
         return _dbSet.First(e => e.Id == id);
     }
 
-    public async Task<T>? DeleteAsync([NotNull] string id)
+    public async Task<T?> DeleteAsync([NotNull] string id)
     {
         var entity = await DbSet.FirstOrDefaultAsync(item => item.Id == id);
 

diff --git a/GdscBackend/Features/Articles/ArticleController.cs b/GdscBackend/Features/Articles/ArticleController.cs
@@ -1,4 +1,5 @@
-using System.Xml.Linq;
+using System.Security.Claims;
+using System.Xml.Linq;
 using GdscBackend.Common.Extensions;
 using GdscBackend.Database;
 using GdscBackend.Utils;
@@ -14,15 +15,12 @@ namespace GdscBackend.Features.Articles;
 [Route("v1/Articles")]
 public class ArticleController : ControllerBase
 {
-    private readonly AppDbContext _dbContext;
     private readonly IRepository<ArticleModel> _repo;
 
-    public ArticleController(AppDbContext appDbContext,IRepository<ArticleModel> repo)
+    public ArticleController( IRepository<ArticleModel> repo )
     {
-        _dbContext = appDbContext;
         _repo = repo;
     }
-
 
     [HttpPost]
     [ProducesResponseType(StatusCodes.Status201Created)]
@@ -31,16 +29,11 @@ public ArticleController(AppDbContext appDbContext,IRepository<ArticleModel> rep
     public async Task<ActionResult<ArticleModel>> Post(ArticleRequest request)
     {
 
-        var author = User.GetUserId();
-
-        return Ok(User.Claims.ToString());
-
-        if (author is null)
-        {
+        var authorid = User.GetUserId();
+        if (authorid is null)
+        { 
             return NotFound("User not found!");
         }
-
-        return Ok(author);
 
         var article = new ArticleModel
         {
@@ -49,13 +42,12 @@ public async Task<ActionResult<ArticleModel>> Post(ArticleRequest request)
             Updated = DateTime.UtcNow,
             Title = request.Title,
             Content = request.Content,
-            //Author = author --> author from keycloak
+            AuthorId = authorid
         };
+
+        var result = await _repo.AddAsync(article);
 
-        var result = await _dbContext.Articles.AddAsync(article);
-        await _dbContext.SaveChangesAsync();
-
-        return Created("v1/Articles", result.Entity);
+        return Created("v1/Articles", result);
     }
 
 
@@ -101,26 +93,24 @@ public async Task<ActionResult<ArticleModel>> Delete([FromRoute] string id)
     [ProducesResponseType(StatusCodes.Status401Unauthorized)]
     public async Task<ActionResult<ArticleResponse>> ChangeAuthor([FromRoute] string id)
     {
-       var article = await _repo.GetAsync(id);
+        var article = await _repo.GetAsync(id);
         if (article is null) return NotFound("Article not found!");
 
         var authorid = User.GetUserId();
-
-        if (authorid is null)
-        {
-            return NotFound("Author not found!");
-        }
+        if (authorid is null) return NotFound("Author not found!");
 
         article.AuthorId = authorid;
         article.Updated = DateTime.UtcNow;
+
+        await _repo.UpdateAsync(article.Id,article);
 
         return Ok(new ArticleResponse
         {
             Id = article.Id,
             Created = article.Created,
             Title = article.Title,
             Content = article.Content,
-            AuthorId = article.AuthorId
+            AuthorId = article.AuthorId // from keycloak
         });
     }
 
@@ -136,6 +126,8 @@ public async Task<ActionResult<ArticleResponse>> ChangeContent([FromRoute] strin
 
         article.Content = content;
         article.Updated = DateTime.UtcNow;
+
+        await _repo.UpdateAsync(article.Id, article);
 
         return Ok(new ArticleResponse
         {
@@ -159,6 +151,9 @@ public async Task<ActionResult<ArticleResponse>> ChangeTitle([FromRoute] string
 
         article.Title = title;
         article.Updated = DateTime.UtcNow;
+
+        await _repo.UpdateAsync(article.Id, article);
+
 
         return Ok(new ArticleResponse
         {

diff --git a/GdscBackend/Features/Articles/ArticleRequest.cs b/GdscBackend/Features/Articles/ArticleRequest.cs
@@ -7,6 +7,4 @@ public class ArticleRequest
     [Required]public string Title { get; set; }
 
     public string Content { get; set; }
-
-    [Required]public string AuthorId { get; set; }
 }
diff --git a/GdscBackend/GdscBackend.csproj b/GdscBackend/GdscBackend.csproj
@@ -27,4 +27,20 @@
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Compile Remove="Features\Users\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <EmbeddedResource Remove="Features\Users\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Content Remove="Features\Users\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Remove="Features\Users\**" />
+    </ItemGroup>
+
 </Project>