mjasin/Nexus.Reader
1
0
Fork 0
Code Issues 9 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Refactor: Web Consolidation and Identity Stabilization (#40)

Browse Source 
## Overview
This PR completes the architectural consolidation of the web project and stabilizes the Identity-based authentication flow for the NexusReader application. It also refines the UI aesthetic for the Book Ingestion Modal as requested in #33.

## Key Changes
- **Project Consolidation**: Fully merged `NexusReader.Web.New` into `NexusReader.Web`. This includes updating all namespace references, VS Code launch/task configurations, and CI/CD (`Dockerfile`).
- **Identity Stabilization**:
  - Implemented `IIdentityService` on the server using `SignInManager<NexusUser>` and `UserManager<NexusUser>`.
  - Fixed registration logic to include mandatory fields (`SubscriptionPlanId`, `TenantId`).
  - Updated `Login.razor` to force a page reload on successful login, ensuring proper synchronization of authentication cookies between SignalR and the browser.
- **UI/UX Refinement**:
  - Updated `BookIngestionModal` styling to follow the **Nexus Neon** design system.
  - Added premium button styles with hover effects and glows.
  - Improved modal layout and interaction feedback (shimmer effects, spinner colors).
- **Cleanup**: Removed obsolete interfaces and constants that were superseded by newer Application layer implementations.

## Verification
- Successfully built the solution: `dotnet build NexusReader.slnx --no-restore`
- Verified project structure and file moves.
- Validated server-side authentication logic.

Fixes #33

---------

Co-authored-by: Marek Jasiński <jasins.marek@gmail.com>
Reviewed-on: #40
Co-authored-by: Antigravity <antigravity@google.com>
Co-committed-by: Antigravity <antigravity@google.com>
This commit was merged in pull request #40.
This commit is contained in:
Antigravity
2026-05-11 19:16:30 +00:00
committed by Marek Jaisński
parent f433e3c74a
commit fe5ff81c98
61 changed files with 1092 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NexusReader.Infrastructure/DependencyInjection.cs
+2 -1
View File
@@ -73,7 +73,8 @@ public static class DependencyInjection
}));
services.AddScoped<IKnowledgeService, KnowledgeService>();
services.AddTransient<IEpubService, EpubService>();
services.AddTransient<IEpubReader, EpubReaderService>();
services.AddTransient<IEpubMetadataExtractor, EpubMetadataExtractor>();
services.AddAuthorizationCore(options =>
{
src/NexusReader.Infrastructure/NexusReader.Infrastructure.csproj
-1
View File
@@ -11,7 +11,6 @@
<ItemGroup>
<PackageReference Include="GeminiDotnet.Extensions.AI" Version="0.23.0" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="10.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
src/NexusReader.Infrastructure/Services/BillingService.cs
+76 -59
View File
@@ -6,6 +6,7 @@ using NexusReader.Application.Abstractions.Services;
using NexusReader.Domain.Entities;
using NexusReader.Infrastructure.Configuration;
using NexusReader.Data.Persistence;
using FluentResults;
namespace NexusReader.Infrastructure.Services;
@@ -28,77 +29,93 @@ public class BillingService : IBillingService
_logger = logger;
}
public async Task<bool> HandleSubscriptionUpdatedAsync(string customerEmail, string stripeProductId)
public async Task<Result> HandleSubscriptionUpdatedAsync(string customerEmail, string stripeProductId)
{
var user = await _userManager.FindByEmailAsync(customerEmail);
if (user == null)
try
{
_logger.LogWarning("Attempted to update subscription for non-existent user: {Email}", customerEmail);
return false;
}
var user = await _userManager.FindByEmailAsync(customerEmail);
if (user == null)
{
_logger.LogWarning("Attempted to update subscription for non-existent user: {Email}", customerEmail);
return Result.Fail($"User {customerEmail} not found.");
}
string targetPlanName = SubscriptionPlan.FreeName;
int tokenLimit = 1000;
string targetPlanName = SubscriptionPlan.FreeName;
int tokenLimit = 1000;
if (stripeProductId == _stripeSettings.ProProductId)
{
targetPlanName = SubscriptionPlan.ProName;
tokenLimit = 50000;
}
else if (stripeProductId == _stripeSettings.BasicProductId)
{
targetPlanName = SubscriptionPlan.BasicName;
tokenLimit = 10000;
}
else if (!string.IsNullOrEmpty(stripeProductId) && stripeProductId != _stripeSettings.FreeProductId)
{
_logger.LogWarning("Unrecognized Stripe Product ID: {ProductId} for user {Email}. Falling back to Free tier.", stripeProductId, customerEmail);
}
if (stripeProductId == _stripeSettings.ProProductId)
{
targetPlanName = SubscriptionPlan.ProName;
tokenLimit = 50000;
}
else if (stripeProductId == _stripeSettings.BasicProductId)
{
targetPlanName = SubscriptionPlan.BasicName;
tokenLimit = 10000;
}
else if (!string.IsNullOrEmpty(stripeProductId) && stripeProductId != _stripeSettings.FreeProductId)
{
_logger.LogWarning("Unrecognized Stripe Product ID: {ProductId} for user {Email}. Falling back to Free tier.", stripeProductId, customerEmail);
}
using var dbContext = await _dbContextFactory.CreateDbContextAsync();
var plan = await dbContext.SubscriptionPlans.FirstOrDefaultAsync(p => p.PlanName == targetPlanName);
if (plan != null)
{
user.SubscriptionPlanId = plan.Id;
user.AITokenLimit = tokenLimit;
}
using var dbContext = await _dbContextFactory.CreateDbContextAsync();
var plan = await dbContext.SubscriptionPlans.FirstOrDefaultAsync(p => p.PlanName == targetPlanName);
if (plan != null)
{
user.SubscriptionPlanId = plan.Id;
user.AITokenLimit = tokenLimit;
}
var result = await _userManager.UpdateAsync(user);
if (!result.Succeeded)
{
_logger.LogError("Failed to update user {Email} after subscription change: {Errors}",
customerEmail, string.Join(", ", result.Errors.Select(e => e.Description)));
return false;
}
var result = await _userManager.UpdateAsync(user);
if (!result.Succeeded)
{
_logger.LogError("Failed to update user {Email} after subscription change: {Errors}",
customerEmail, string.Join(", ", result.Errors.Select(e => e.Description)));
return Result.Fail(result.Errors.Select(e => e.Description).FirstOrDefault() ?? "Failed to update user profile.");
}
return true;
return Result.Ok();
}
catch (Exception ex)
{
_logger.LogError(ex, "Unexpected error during subscription update for {Email}", customerEmail);
return Result.Fail(new Error("Unexpected error during subscription update.").CausedBy(ex));
}
}
public async Task<bool> HandleSubscriptionDeletedAsync(string customerEmail)
public async Task<Result> HandleSubscriptionDeletedAsync(string customerEmail)
{
var user = await _userManager.FindByEmailAsync(customerEmail);
if (user == null)
try
{
_logger.LogWarning("Attempted to delete subscription for non-existent user: {Email}", customerEmail);
return false;
}
var user = await _userManager.FindByEmailAsync(customerEmail);
if (user == null)
{
_logger.LogWarning("Attempted to delete subscription for non-existent user: {Email}", customerEmail);
return Result.Fail($"User {customerEmail} not found.");
}
using var dbContext = await _dbContextFactory.CreateDbContextAsync();
var freePlan = await dbContext.SubscriptionPlans.FirstOrDefaultAsync(p => p.PlanName == SubscriptionPlan.FreeName);
if (freePlan != null)
{
user.SubscriptionPlanId = freePlan.Id;
user.AITokenLimit = freePlan.AITokenLimit;
}
var result = await _userManager.UpdateAsync(user);
if (!result.Succeeded)
{
_logger.LogError("Failed to reset user {Email} to Free tier after subscription deletion: {Errors}",
customerEmail, string.Join(", ", result.Errors.Select(e => e.Description)));
return false;
}
using var dbContext = await _dbContextFactory.CreateDbContextAsync();
var freePlan = await dbContext.SubscriptionPlans.FirstOrDefaultAsync(p => p.PlanName == SubscriptionPlan.FreeName);
if (freePlan != null)
{
user.SubscriptionPlanId = freePlan.Id;
user.AITokenLimit = freePlan.AITokenLimit;
}
var result = await _userManager.UpdateAsync(user);
if (!result.Succeeded)
{
_logger.LogError("Failed to reset user {Email} to Free tier after subscription deletion: {Errors}",
customerEmail, string.Join(", ", result.Errors.Select(e => e.Description)));
return Result.Fail(result.Errors.Select(e => e.Description).FirstOrDefault() ?? "Failed to reset user to free tier.");
}
return true;
return Result.Ok();
}
catch (Exception ex)
{
_logger.LogError(ex, "Unexpected error during subscription deletion for {Email}", customerEmail);
return Result.Fail(new Error("Unexpected error during subscription deletion.").CausedBy(ex));
}
}
}
src/NexusReader.Infrastructure/Services/EpubService.cs
+23 -3
View File
@@ -10,13 +10,13 @@ using NexusReader.Domain.Entities;
namespace NexusReader.Infrastructure.Services;
public class EpubService : IEpubService
public class EpubReaderService : IEpubReader
{
private readonly IDbContextFactory<AppDbContext> _dbContextFactory;
private const string EpubPath = "wwwroot/assets/book.epub";
private const int WordThreshold = 1000;
public EpubService(IDbContextFactory<AppDbContext> dbContextFactory)
public EpubReaderService(IDbContextFactory<AppDbContext> dbContextFactory)
{
_dbContextFactory = dbContextFactory;
}
@@ -34,7 +34,7 @@ public class EpubService : IEpubService
while (currentDir != null)
{
var checkPath1 = Path.Combine(currentDir.FullName, relativePath);
var checkPath2 = Path.Combine(currentDir.FullName, "src", "NexusReader.Web.New", relativePath);
var checkPath2 = Path.Combine(currentDir.FullName, "src", "NexusReader.Web", relativePath);
searchPaths.Add(checkPath1);
if (File.Exists(checkPath1)) { fullPath = checkPath1; break; }
@@ -215,4 +215,24 @@ public class EpubService : IEpubService
}
return null;
}
// Metadata extraction moved to EpubMetadataExtractor
}
public class EpubMetadataExtractor : IEpubMetadataExtractor
{
public async Task<Result<LocalEpubMetadata>> ExtractMetadataAsync(Stream epubStream)
{
try
{
using var bookRef = await EpubReader.OpenBookAsync(epubStream);
var title = bookRef.Title ?? "Unknown Title";
var author = bookRef.Author ?? "Unknown Author";
byte[]? cover = await bookRef.ReadCoverAsync();
return Result.Ok(new LocalEpubMetadata(title, author, cover));
}
catch (Exception ex)
{
return Result.Fail(new Error($"Failed to extract EPUB metadata locally: {ex.Message}").CausedBy(ex));
}
}
}