Finished adding user support and ability to update specific novels or set your last read chapter

WebNovelPortalAPI/Controllers/AuthorizedController.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Treestar.Shared.Models.DBDomain;
+using WebNovelPortalAPI.Middleware;
+
+namespace WebNovelPortalAPI.Controllers
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    [Authorize]
+    public class AuthorizedController : ControllerBase
+    {
+        protected int UserId
+        {
+            get
+            {
+                return (int) (HttpContext.Items[EnsureUserCreatedMiddleware.UserIdItemName] ?? 0);
+            }
+        }
+
+        public AuthorizedController()
+        {
+        }
+        
+    }
+}

WebNovelPortalAPI/Controllers/NovelController.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using DBConnection;
 using DBConnection.Repositories;
 using DBConnection.Repositories.Interfaces;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Treestar.Shared.Models.DBDomain;
@@ -18,15 +19,18 @@ namespace WebNovelPortalAPI.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
-    public class NovelController : ControllerBase
+    [Authorize]
+    public class NovelController : AuthorizedController
     {
         private readonly INovelRepository _novelRepository;
+        private readonly IUserRepository _userRepository;
         private readonly IEnumerable<IScraper> _scrapers;
 
-        public NovelController(IEnumerable<IScraper> scrapers, INovelRepository novelRepository)
+        public NovelController(IEnumerable<IScraper> scrapers, INovelRepository novelRepository, IUserRepository userRepository)
         {
             _scrapers = scrapers;
             _novelRepository = novelRepository;
+            _userRepository = userRepository;
         }
 
         private async Task<Novel?> ScrapeNovel(string url)
@@ -45,17 +49,27 @@ namespace WebNovelPortalAPI.Controllers
             return _scrapers.FirstOrDefault(i => i.MatchesUrl(novelUrl));
         }
 
-        [HttpGet]
-        [Route("{guid:guid}")]
-        public async Task<Novel?> GetNovel(Guid guid)
+        private async Task<User> GetUser()
         {
-            return await _novelRepository.GetNovel(guid);
+            return await _userRepository.GetIncluded(u => u.Id == UserId);
         }
 
         [HttpGet]
-        public async Task<List<Novel>> GetNovels()
+        [Route("{guid:guid}")]
+        public async Task<UserNovel?> GetNovel(Guid guid)
         {
-            return (await _novelRepository.GetAllIncluded()).ToList();
+            var user = await GetUser();
+            var novel = await _novelRepository.GetNovel(guid);
+            return user.WatchedNovels.FirstOrDefault(un => un.NovelUrl == novel.Url);
+        }
+
+        [HttpGet]
+        public async Task<List<UserNovel>> GetNovels()
+        {
+            var user = await GetUser();
+            var novels = user.WatchedNovels.Select(i => i.Novel);
+            (await _novelRepository.GetWhereIncluded(novels)).ToList();
+            return user.WatchedNovels.ToList();
         }
 
         [HttpPost]
@@ -75,11 +89,12 @@ namespace WebNovelPortalAPI.Controllers
                     failures[novelUrl] = e;
                 }
             }
-
-            IEnumerable<Novel> successfulUploads;
+            List<Novel> successfulUploads;
             try
             {
-                successfulUploads = await _novelRepository.UpsertMany(successfulScrapes);
+                successfulUploads = (await _novelRepository.UpsertMany(successfulScrapes, true)).ToList();
+                var user = await GetUser();
+                await _userRepository.AssignNovelsToUser(user, successfulUploads);
             }
             catch (Exception e)
             {
@@ -99,7 +114,9 @@ namespace WebNovelPortalAPI.Controllers
             try
             {
                 var novel = await ScrapeNovel(request.NovelUrl);
-                var dbNovel = await _novelRepository.Upsert(novel);
+                var dbNovel = await _novelRepository.Upsert(novel, false);
+                var user = await GetUser();
+                await _userRepository.AssignNovelsToUser(user, new List<Novel> {novel});
                 return Ok(dbNovel);
             }
             catch (NoMatchingScraperException e)
@@ -111,5 +128,15 @@ namespace WebNovelPortalAPI.Controllers
                 return StatusCode(500, e);
             }
         }
+
+        [HttpPatch]
+        [Route("updateLastChapterRead")]
+        public async Task<IActionResult> UpdateLastChapterRead(Guid novelGuid, int chapter)
+        {
+            var user = await GetUser();
+            var novel = await _novelRepository.GetNovel(novelGuid);
+            await _userRepository.UpdateLastChapterRead(user, novel, chapter);
+            return Ok();
+        }
     }
 }

WebNovelPortalAPI/Middleware/EnsureUserCreatedMiddleware.cs

@@ -0,0 +1,32 @@
+using System.Security.Claims;
+using DBConnection.Repositories.Interfaces;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Treestar.Shared.Models.DBDomain;
+
+namespace WebNovelPortalAPI.Middleware;
+
+public class EnsureUserCreatedMiddleware : IMiddleware
+{
+    private readonly IUserRepository _userRepository;
+    public const string UserIdItemName = "userId";
+    public EnsureUserCreatedMiddleware(IUserRepository userRepository)
+    {
+        _userRepository = userRepository;
+    }
+
+    public async Task InvokeAsync(HttpContext context, RequestDelegate next)
+    {
+        if (!context.User.Identity.IsAuthenticated)
+        {
+            await next(context);
+            return;
+        }
+        var userEmail = context.User.Claims.FirstOrDefault(i => i.Type == ClaimTypes.Email)?.Value;
+        var dbUser = await _userRepository.GetIncluded(u => u.Email == userEmail) ?? await _userRepository.Upsert(new User
+        {
+            Email = userEmail
+        });
+        context.Items[UserIdItemName] = dbUser.Id;
+        await next(context);
+    }
+}

WebNovelPortalAPI/Program.cs

@@ -2,8 +2,11 @@ using DBConnection;
 using DBConnection.Contexts;
 using DBConnection.Extensions;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.OpenApi.Models;
 using Newtonsoft.Json;
+using Treestar.Shared.Authentication.JwtBearer;
 using WebNovelPortalAPI.Extensions;
+using WebNovelPortalAPI.Middleware;
 using WebNovelPortalAPI.Scrapers;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -11,13 +14,40 @@ var builder = WebApplication.CreateBuilder(args);
 // Add services to the container.
 builder.Services.AddDbServices(builder.Configuration);
 builder.Services.AddScrapers();
+builder.Services.AddJwtBearerAuth(builder.Configuration);
+builder.Services.AddScoped<EnsureUserCreatedMiddleware>();
 builder.Services.AddControllers().AddNewtonsoftJson(opt =>
 {
     opt.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
 });
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+builder.Services.AddSwaggerGen(opt =>
+{
+    opt.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
+    {
+        In = ParameterLocation.Header,
+        Description = "Bearer token",
+        Name = "Authorization",
+        Type = SecuritySchemeType.Http,
+        BearerFormat = "JWT",
+        Scheme = "bearer"
+    });
+    opt.AddSecurityRequirement(new OpenApiSecurityRequirement
+    {
+        {
+            new OpenApiSecurityScheme
+            {
+                Reference = new OpenApiReference
+                {
+                    Type=ReferenceType.SecurityScheme,
+                    Id="Bearer"
+                }
+            },
+            new string[]{}
+        }
+    });
+});
 
 var app = builder.Build();
 app.UpdateDatabase<AppDbContext>();
@@ -30,8 +60,9 @@ if (app.Environment.IsDevelopment())
 
 app.UseHttpsRedirection();
 
+app.UseAuthentication();
 app.UseAuthorization();
-
+app.UseMiddleware<EnsureUserCreatedMiddleware>();
 app.MapControllers();
 
 app.Run();

WebNovelPortalAPI/WebNovelPortalAPI.csproj

@@ -5,10 +5,12 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+        <UserSecretsId>dd5e7c53-e576-4442-ae30-c496ec2070a5</UserSecretsId>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="HtmlAgilityPack" Version="1.11.43" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.7" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.7" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.7" />

WebNovelPortalAPI/appsettings.json

@@ -9,6 +9,10 @@
     "Sqlite": "Data Source=test_db",
     "PostgresSql": "placeholder"
   },
+  "JwtBearerAuthOptions": {
+    "Authority": "placeholder",
+    "Audience": ""
+  },
   "DatabaseProvider": "Sqlite",
   "AllowedHosts": "*"
 }