mirror of
https://github.com/Sea-Haven-Industries/proposal-system.git
synced 2026-09-30 21:43:14 +00:00
* Fix NuGet versions and add InitialCreate EF Core migration - Update AWSSDK.SQS and AWSSDK.SecretsManager to 3.7.500.0 (actual available versions) - Update AWSSDK.Extensions.NETCore.Setup to 3.7.400 - Generate InitialCreate migration for PostgreSQL (all 8 entities) - Build verified: 0 errors, 0 warnings * Implement Dispatcher Frontend (Phase 2) React 19 + MUI v7 + TypeScript + Vite SPA matching SHOC patterns: Redux Toolkit (auth/ui slices), TanStack React Query, axios interceptors, react-toastify, Cognito OAuth PKCE login flow, paginated proposal list, new proposal form with customer autocomplete and vendor PDF upload, read-only proposal detail with status stepper timeline. * Add AuthController for Cognito code exchange and .env.example Backend endpoint POST /api/auth/callback exchanges the OAuth authorization code with Cognito's token endpoint, auto-provisions the user in the DB, and returns the access token to the frontend. * Implement Admin Frontend Experience (Phase 3) Three-panel admin workspace: left reference panel (submission details, vendor data), center editor (refined scope, inline line item table with reorder/add/remove/pricing), right similar proposals panel (KB results with pull-to-editor). Admin dashboard with stats cards and proposal queue table. Approval flow with confirmation dialog, mark-as-sent, and create-revision actions. Role-based sidebar navigation. * Implement backend dev mode, internal API auth, and service layer enhancements - Add dev-login endpoint with local JWT signing for local development - Add InternalApiKeyMiddleware with timing-safe comparison for Lambda-to-API auth - Add DevS3Service and NoOpJobPublisher for running without AWS services - Implement CurrentUserService cascading user resolution (ID → sub → email → create) - Add async ResolveAsync() to avoid synchronous DB calls in request pipeline - Add /proposals/stats endpoint for efficient server-side status counts - Guard status transitions: only allow Draft → InReview via update endpoint - Add vendor proposals, generated PDFs, and similar proposals controllers - Add ISimilarProposalService and SimilarProposalService - Add [Authorize] to AddSimilarReference endpoint * Implement Lambda functions for PDF processing, suggestions, and library ingest - pdf-extract: Parse vendor PDFs with pdfplumber, fallback to Claude multimodal - pdf-generate: Generate branded proposal PDFs with reportlab Platypus - library-ingest: Format approved proposals as markdown and sync to Bedrock KB - suggestions: Query KB for similar proposals, generate line items via Claude - All Lambdas use internal API key auth and cold-start secret caching - Fix pdf_path unbound variable in pdf-extract error handling * Add Bedrock Knowledge Base, OpenSearch Serverless, and SQS message filtering - Provision OpenSearch Serverless collection for vector search - Create Bedrock Knowledge Base with Titan embedding model - Configure S3 data source with fixed-size chunking (512 tokens, 20% overlap) - Add suggestions Lambda with SQS event source filtering - Scope bedrock:InvokeModel IAM to specific model ARN patterns - Add internal API key secret in Secrets Manager - Add log retention (2 months) to all Lambda functions - Add docker-compose.yml for local PostgreSQL * Apply SHOC design system styling across frontend - Rewrite theme with SHOC palette (#0c4f6f primary, Nunito font, 4px radius) - Add global CSS with Google Fonts import for Nunito - Redesign Topbar with avatar initials, role subtitle, gradient header - Redesign Sidebar with 220px width, section headers, active state border - Restyle LoginPage with SHOC branded card and dev-mode role selector - Update AdminDashboard KPI cards to centered SHOC style - Add devLogin API method for local development auth flow * Fix frontend navigation bugs, differentiate Dashboard from Proposals list - Fix double nav selection by adding isNavActive() with ALL_NAV_PATHS set - Fix /admin/users routing to placeholder instead of redirect to / - Fix ProposalDetailPage Back button navigating to / instead of /proposals - Differentiate Dashboard (KPI cards + recent 5) from ProposalListPage (full paginated table) - Dashboard now uses dedicated /proposals/stats endpoint for accurate counts - Fix adminApi.getPdf dead code (axios rejects before status check) - Wire up PDF generation button in AdminWorkspace - Adjust layout: 220px drawer, 10px content padding, 64px toolbar height * Add appsettings.Development.json to gitignore Prevent dev-only signing keys and connection strings from being committed. * Fix CI failures: unused Python imports and CDK synth asset path CDK synth job needs the .NET API published first so the Lambda asset path exists. Python lint had 3 unused imports in pdf-generate. * Apply ruff formatting to all Lambda Python files
153 lines
4.8 KiB
C#
153 lines
4.8 KiB
C#
using System.Security.Claims;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using ProposalSystem.Application.Interfaces;
|
|
using ProposalSystem.Domain.Entities;
|
|
using ProposalSystem.Infrastructure.Data;
|
|
|
|
namespace ProposalSystem.Api.Services;
|
|
|
|
public class CurrentUserService : ICurrentUserService
|
|
{
|
|
private readonly IHttpContextAccessor _httpContext;
|
|
private readonly ProposalDbContext _db;
|
|
private User? _cachedUser;
|
|
|
|
public CurrentUserService(IHttpContextAccessor httpContext, ProposalDbContext db)
|
|
{
|
|
_httpContext = httpContext;
|
|
_db = db;
|
|
}
|
|
|
|
public Guid UserId => GetUser().Id;
|
|
public string Email => GetUser().Email;
|
|
public UserRole Role => GetUser().Role;
|
|
|
|
public string? IpAddress =>
|
|
_httpContext.HttpContext?.Connection.RemoteIpAddress?.ToString();
|
|
|
|
public async Task ResolveAsync()
|
|
{
|
|
if (_cachedUser != null) return;
|
|
|
|
var principal = _httpContext.HttpContext?.User
|
|
?? throw new UnauthorizedAccessException("No authenticated user");
|
|
|
|
var userId = principal.FindFirstValue(ClaimTypes.NameIdentifier);
|
|
var sub = principal.FindFirstValue("sub");
|
|
|
|
if (userId != null && Guid.TryParse(userId, out var parsedId))
|
|
{
|
|
_cachedUser = await _db.Users.FirstOrDefaultAsync(u => u.Id == parsedId);
|
|
}
|
|
|
|
if (_cachedUser == null && sub != null)
|
|
{
|
|
_cachedUser = await _db.Users.FirstOrDefaultAsync(u => u.CognitoSub == sub);
|
|
}
|
|
|
|
if (_cachedUser == null)
|
|
{
|
|
var email = principal.FindFirstValue(ClaimTypes.Email)
|
|
?? principal.FindFirstValue("email")
|
|
?? "unknown@seahaven.com";
|
|
|
|
_cachedUser = await _db.Users.FirstOrDefaultAsync(u => u.Email == email);
|
|
}
|
|
|
|
if (_cachedUser == null)
|
|
{
|
|
var email = principal.FindFirstValue(ClaimTypes.Email)
|
|
?? principal.FindFirstValue("email")
|
|
?? "unknown@seahaven.com";
|
|
|
|
var name = principal.FindFirstValue("name")
|
|
?? email.Split('@')[0];
|
|
|
|
var groups = principal.FindAll("cognito:groups")
|
|
.Select(c => c.Value).ToList();
|
|
|
|
var role = groups.Contains("sysadmins") ? UserRole.SysAdmin
|
|
: groups.Contains("admins") ? UserRole.Admin
|
|
: UserRole.Dispatcher;
|
|
|
|
_cachedUser = new User
|
|
{
|
|
Id = Guid.NewGuid(),
|
|
CognitoSub = sub ?? $"auto-{Guid.NewGuid():N}",
|
|
Email = email,
|
|
DisplayName = name,
|
|
Role = role,
|
|
IsActive = true,
|
|
CreatedAt = DateTime.UtcNow,
|
|
UpdatedAt = DateTime.UtcNow,
|
|
};
|
|
|
|
_db.Users.Add(_cachedUser);
|
|
await _db.SaveChangesAsync();
|
|
}
|
|
}
|
|
|
|
private User GetUser()
|
|
{
|
|
if (_cachedUser != null) return _cachedUser;
|
|
|
|
var principal = _httpContext.HttpContext?.User
|
|
?? throw new UnauthorizedAccessException("No authenticated user");
|
|
|
|
var userId = principal.FindFirstValue(ClaimTypes.NameIdentifier);
|
|
var sub = principal.FindFirstValue("sub");
|
|
|
|
if (userId != null && Guid.TryParse(userId, out var parsedId))
|
|
{
|
|
_cachedUser = _db.Users.FirstOrDefault(u => u.Id == parsedId);
|
|
}
|
|
|
|
if (_cachedUser == null && sub != null)
|
|
{
|
|
_cachedUser = _db.Users.FirstOrDefault(u => u.CognitoSub == sub);
|
|
}
|
|
|
|
if (_cachedUser == null)
|
|
{
|
|
var email = principal.FindFirstValue(ClaimTypes.Email)
|
|
?? principal.FindFirstValue("email")
|
|
?? "unknown@seahaven.com";
|
|
|
|
_cachedUser = _db.Users.FirstOrDefault(u => u.Email == email);
|
|
}
|
|
|
|
if (_cachedUser == null)
|
|
{
|
|
var email = principal.FindFirstValue(ClaimTypes.Email)
|
|
?? principal.FindFirstValue("email")
|
|
?? "unknown@seahaven.com";
|
|
|
|
var name = principal.FindFirstValue("name")
|
|
?? email.Split('@')[0];
|
|
|
|
var groups = principal.FindAll("cognito:groups")
|
|
.Select(c => c.Value).ToList();
|
|
|
|
var role = groups.Contains("sysadmins") ? UserRole.SysAdmin
|
|
: groups.Contains("admins") ? UserRole.Admin
|
|
: UserRole.Dispatcher;
|
|
|
|
_cachedUser = new User
|
|
{
|
|
Id = Guid.NewGuid(),
|
|
CognitoSub = sub ?? $"auto-{Guid.NewGuid():N}",
|
|
Email = email,
|
|
DisplayName = name,
|
|
Role = role,
|
|
IsActive = true,
|
|
CreatedAt = DateTime.UtcNow,
|
|
UpdatedAt = DateTime.UtcNow,
|
|
};
|
|
|
|
_db.Users.Add(_cachedUser);
|
|
_db.SaveChanges();
|
|
}
|
|
|
|
return _cachedUser;
|
|
}
|
|
}
|