bcc69f0a2e
Node-agent — full render pipeline (items 1-3):
- render-svc: ClaimedJob now includes aep_download_url (presigned MinIO GET,
2h TTL, path=templates/{original_project_id}/template.aep)
- render-svc: POST /v1/internal/render/jobs/:id/output-upload-url
allocates Export row + returns presigned MinIO PUT URL + export_id
- render-svc: db.CreateExportForJob() inserts export row with 30-day retention
- render-svc: InternalHandler now owns minio client (templatesBucket + exportsBucket)
MINIO_TEMPLATES_BUCKET env var (default flatrender-templates)
- node-agent: runner/download.go — DownloadFile() + UploadFile() (stdlib only)
- node-agent: client.GetOutputUploadURL() + ClaimedJob.AEPDownloadURL field
- node-agent: runJob() full flow: download AEP → render → get upload URL →
PUT output to MinIO → Complete(export_id)
All steps are non-fatal with fallback (AEP miss → mock, upload fail → no export)
TLS reverse proxy (item 15):
- Caddyfile: three virtual hosts (DOMAIN, API_DOMAIN, STORAGE_DOMAIN)
auto-TLS via Let's Encrypt; security headers; 512MB upload limit on API
- docker-compose.v2.yml: caddy:2-alpine service, ports 80/443/443udp,
caddy_data + caddy_config volumes; env vars DOMAIN/API_DOMAIN/STORAGE_DOMAIN/ACME_EMAIL
- .env.v2.example: new Caddy + MINIO_TEMPLATES_BUCKET entries
Billing portal (item 5):
- Identity: POST /v1/users/me/plan/cancel — sets cancelled_at, auto_renew=false
(access continues to expiry); 404 when no active plan
- POST /api/billing/cancel — frontend proxy, validates auth
- GET /api/billing/portal — redirects to /dashboard/settings?tab=billing
- SettingsBilling: "Cancel plan" button with confirm dialog + optimistic UI,
"Change plan" button; becomes "use client" component
Password reset UI (item 7):
- POST /api/auth/password-reset — proxies /v1/auth/password/reset/request
(always 200, anti-enumeration)
- POST /api/auth/password-reset-confirm — proxies /v1/auth/password/reset/confirm
- AuthPageContent: "Forgot password?" link on sign-in tab opens 2-step reset flow
(email → OTP+new-password) without leaving the auth page
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
71 lines
2.5 KiB
C#
71 lines
2.5 KiB
C#
using FlatRender.IdentitySvc.Application.Services.Interfaces;
|
|
using FlatRender.IdentitySvc.Models.Requests;
|
|
using FlatRender.IdentitySvc.Models.Responses;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
|
|
namespace FlatRender.IdentitySvc.Controllers;
|
|
|
|
[ApiController]
|
|
[Route("v1")]
|
|
[Authorize]
|
|
public class PlansController(IPlanService planService) : ControllerBase
|
|
{
|
|
[AllowAnonymous]
|
|
[HttpGet("plans")]
|
|
[ProducesResponseType(typeof(object), 200)]
|
|
public async Task<IActionResult> List([FromQuery] string? scope)
|
|
{
|
|
var plans = await planService.ListAsync(GetTenantIdOrNull(), scope);
|
|
return Ok(new { data = plans });
|
|
}
|
|
|
|
[AllowAnonymous]
|
|
[HttpGet("plans/{planId:guid}")]
|
|
[ProducesResponseType(typeof(PlanResponse), 200)]
|
|
public async Task<IActionResult> GetById(Guid planId)
|
|
=> Ok(await planService.GetByIdAsync(planId));
|
|
|
|
[HttpGet("users/me/plan")]
|
|
[ProducesResponseType(typeof(UserPlanResponse), 200)]
|
|
public async Task<IActionResult> GetCurrentPlan()
|
|
=> Ok(await planService.GetCurrentPlanAsync(GetUserId()));
|
|
|
|
[HttpPost("users/me/plan/purchase")]
|
|
[ProducesResponseType(typeof(PurchasePlanResponse), 200)]
|
|
public async Task<IActionResult> Purchase([FromBody] PurchasePlanRequest request)
|
|
{
|
|
var result = await planService.PurchasePlanAsync(GetUserId(), GetTenantId(), request);
|
|
return Ok(result);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Cancel the current active subscription. The plan stays active until its
|
|
/// expiry date but will not auto-renew. Returns 404 when no active plan exists.
|
|
/// </summary>
|
|
[HttpPost("users/me/plan/cancel")]
|
|
[ProducesResponseType(204)]
|
|
[ProducesResponseType(404)]
|
|
public async Task<IActionResult> Cancel()
|
|
{
|
|
try
|
|
{
|
|
await planService.CancelPlanAsync(GetUserId());
|
|
return NoContent();
|
|
}
|
|
catch (KeyNotFoundException ex)
|
|
{
|
|
return NotFound(new { error = ex.Message });
|
|
}
|
|
}
|
|
|
|
private Guid GetUserId() => Guid.Parse(User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value
|
|
?? User.FindFirst("sub")?.Value ?? throw new UnauthorizedAccessException());
|
|
|
|
private Guid GetTenantId() => Guid.Parse(User.FindFirst("tenant_id")?.Value
|
|
?? throw new UnauthorizedAccessException());
|
|
|
|
private Guid? GetTenantIdOrNull() => User.FindFirst("tenant_id")?.Value is { } t && Guid.TryParse(t, out var id)
|
|
? id : null;
|
|
}
|