feat(api): implement storing connected insitution in db

.aspire/settings.json

@@ -1,3 +0,0 @@
-{
-  "appHostPath": "../src/FiscalOS.AppHost/FiscalOS.AppHost.csproj"
-}

FiscalOS.sln

@@ -21,10 +21,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiscalOS.Infra.Tests", "tes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiscalOS.Core.Tests", "tests\FiscalOS.Core.Tests\FiscalOS.Core.Tests.csproj", "{2D9C02A9-C704-4275-88E9-1BBD3AC12700}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiscalOS.AppHost", "src\FiscalOS.AppHost\FiscalOS.AppHost.csproj", "{B7E4D089-C0EA-4DF2-B828-D5B0E5332098}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiscalOS.ServiceDefaults", "src\FiscalOS.ServiceDefaults\FiscalOS.ServiceDefaults.csproj", "{40804CFE-50CA-4C5B-864A-672C67C6A667}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -119,30 +115,6 @@ Global
 		{2D9C02A9-C704-4275-88E9-1BBD3AC12700}.Release|x64.Build.0 = Release|Any CPU
 		{2D9C02A9-C704-4275-88E9-1BBD3AC12700}.Release|x86.ActiveCfg = Release|Any CPU
 		{2D9C02A9-C704-4275-88E9-1BBD3AC12700}.Release|x86.Build.0 = Release|Any CPU
-		{B7E4D089-C0EA-4DF2-B828-D5B0E5332098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7E4D089-C0EA-4DF2-B828-D5B0E5332098}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7E4D089-C0EA-4DF2-B828-D5B0E5332098}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B7E4D089-C0EA-4DF2-B828-D5B0E5332098}.Debug|x64.Build.0 = Debug|Any CPU
-		{B7E4D089-C0EA-4DF2-B828-D5B0E5332098}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B7E4D089-C0EA-4DF2-B828-D5B0E5332098}.Debug|x86.Build.0 = Debug|Any CPU
-		{B7E4D089-C0EA-4DF2-B828-D5B0E5332098}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7E4D089-C0EA-4DF2-B828-D5B0E5332098}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B7E4D089-C0EA-4DF2-B828-D5B0E5332098}.Release|x64.ActiveCfg = Release|Any CPU
-		{B7E4D089-C0EA-4DF2-B828-D5B0E5332098}.Release|x64.Build.0 = Release|Any CPU
-		{B7E4D089-C0EA-4DF2-B828-D5B0E5332098}.Release|x86.ActiveCfg = Release|Any CPU
-		{B7E4D089-C0EA-4DF2-B828-D5B0E5332098}.Release|x86.Build.0 = Release|Any CPU
-		{40804CFE-50CA-4C5B-864A-672C67C6A667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40804CFE-50CA-4C5B-864A-672C67C6A667}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40804CFE-50CA-4C5B-864A-672C67C6A667}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{40804CFE-50CA-4C5B-864A-672C67C6A667}.Debug|x64.Build.0 = Debug|Any CPU
-		{40804CFE-50CA-4C5B-864A-672C67C6A667}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{40804CFE-50CA-4C5B-864A-672C67C6A667}.Debug|x86.Build.0 = Debug|Any CPU
-		{40804CFE-50CA-4C5B-864A-672C67C6A667}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40804CFE-50CA-4C5B-864A-672C67C6A667}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40804CFE-50CA-4C5B-864A-672C67C6A667}.Release|x64.ActiveCfg = Release|Any CPU
-		{40804CFE-50CA-4C5B-864A-672C67C6A667}.Release|x64.Build.0 = Release|Any CPU
-		{40804CFE-50CA-4C5B-864A-672C67C6A667}.Release|x86.ActiveCfg = Release|Any CPU
-		{40804CFE-50CA-4C5B-864A-672C67C6A667}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Directory.Packages.props

@@ -13,12 +13,5 @@
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
     <PackageVersion Include="Spectre.Console" Version="0.54.0" />
     <PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.1.0" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0" />
-    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.1.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
   </ItemGroup>
-</Project>
+</Project>

src/FiscalOS.API/Accounts/AccountsExtensions.cs

@@ -6,10 +6,9 @@ internal static class AccountsExtensions
 
   public static RouteGroupBuilder MapAccountsEndpoints(this WebApplication app)
   {
-    var accountsGroup = app.MapGroup(RouteGroupPrefix)
-      .RequireAuthorization();
+    var accountsGroup = app.MapGroup(RouteGroupPrefix).RequireAuthorization();
 
-    accountsGroup.MapAddEndpoint();
+    accountsGroup.MapConnectEndpoint();
 
     return accountsGroup;
   }

src/FiscalOS.API/Accounts/Add/Endpoint.cs

@@ -1,56 +0,0 @@
-namespace FiscalOS.API.Accounts.Add;
-
-internal static class Endpoint
-{
-  private const string Route = "/";
-
-  public static RouteHandlerBuilder MapAddEndpoint(this RouteGroupBuilder groupBuilder)
-  {
-    return groupBuilder.MapPost(Route, HandleAsync);
-  }
-
-  private static async Task<IResult> HandleAsync(
-    HttpContext httpContext,
-    [FromBody] Request request,
-    [FromServices] AppDbContext appDbContext,
-    CancellationToken ct
-  )
-  {
-    var userId = httpContext.GetUserId();
-
-    var user = await appDbContext.Users
-      .Include(u => u.Institutions.Where(i => i.Metadata is PlaidMetadata && ((PlaidMetadata)i.Metadata).PlaidId == request.PlaidInstitutionId))
-      .Include(u => u.Accounts.Where(a => a.Metadata is PlaidAccountMetadata && ((PlaidAccountMetadata)a.Metadata).PlaidId == request.PlaidAccountId))
-      .ThenInclude(a => a.Metadata)
-      .SingleOrDefaultAsync(u => u.Id == userId, ct);
-
-    if (user is null)
-    {
-      return Results.Unauthorized();
-    }
-
-    if (user.Institutions.Any() is false)
-    {
-      return Results.ValidationProblem(new Dictionary<string, string[]>
-      {
-        ["PlaidInstitutionId"] = ["The PlaidInstitutionId field is invalid. No institution connected with the given PlaidInstitutionId was found for the user."],
-      });
-    }
-
-    if (user.Accounts.Any())
-    {
-      return Results.Conflict();
-    }
-
-    var accountMetadata = PlaidAccountMetadata.From(request.PlaidAccountId, request.PlaidAccountName);
-    var account = Account.From(user.Institutions.First().Id, request.PlaidAccountName, accountMetadata);
-    var balance = Balance.From(request.AccountCurrentBalance, request.AccountAvailableBalance, request.AccountCurrencyCode);
-
-    account.AddBalance(balance);
-    user.AddAccount(account);
-
-    await appDbContext.SaveChangesAsync(ct);
-
-    return Results.Ok();
-  }
-}

src/FiscalOS.API/Accounts/Add/Request.cs

@@ -1,38 +0,0 @@
-namespace FiscalOS.API.Accounts.Add;
-
-public record Request : IValidatableObject
-{
-  public string PlaidInstitutionId { get; init; } = string.Empty;
-  public string PlaidAccountId { get; init; } = string.Empty;
-  public string PlaidAccountName { get; init; } = string.Empty;
-  public decimal AccountCurrentBalance { get; init; }
-  public decimal AccountAvailableBalance { get; init; }
-  public string AccountCurrencyCode { get; init; } = string.Empty;
-
-  public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
-  {
-    if (string.IsNullOrWhiteSpace(PlaidInstitutionId))
-    {
-      var fieldName = nameof(PlaidInstitutionId);
-      yield return new($"The {fieldName} field is required.", [fieldName]);
-    }
-
-    if (string.IsNullOrWhiteSpace(PlaidAccountId))
-    {
-      var fieldName = nameof(PlaidAccountId);
-      yield return new($"The {fieldName} field is required.", [fieldName]);
-    }
-
-    if (string.IsNullOrWhiteSpace(PlaidAccountName))
-    {
-      var fieldName = nameof(PlaidAccountName);
-      yield return new($"The {fieldName} field is required.", [fieldName]);
-    }
-
-    if (string.IsNullOrWhiteSpace(AccountCurrencyCode))
-    {
-      var fieldName = nameof(AccountCurrencyCode);
-      yield return new($"The {fieldName} field is required.", [fieldName]);
-    }
-  }
-}

src/FiscalOS.API/Accounts/Connect/Endpoint.cs

@@ -1,4 +1,6 @@
-namespace FiscalOS.API.Institutions.Connect;
+using FiscalOS.Core.Accounts;
+
+namespace FiscalOS.API.Accounts.Connect;
 
 internal static class Endpoint
 {
@@ -32,12 +34,20 @@ internal static class Endpoint
 
     if (user is null)
     {
-      return Results.Unauthorized();
+      return Results.Problem(
+        statusCode: StatusCodes.Status401Unauthorized,
+        title: "Unauthorized",
+        detail: "You are not authorized to connect an institution. Please log in and try again."
+      );
     }
 
     if (user.Institutions.Any())
     {
-      return Results.Conflict();
+      return Results.Problem(
+        statusCode: StatusCodes.Status409Conflict,
+        title: "Institution already connected",
+        detail: "The user has already connected an institution with the provided Plaid Institution Id."
+      );
     }
 
     var (itemId, accessToken) = await plaidService.ExchangeTokenAsync(request.PublicToken);

src/FiscalOS.API/Accounts/Connect/Request.cs

@@ -1,4 +1,4 @@
-namespace FiscalOS.API.Institutions.Connect;
+namespace FiscalOS.API.Accounts.Connect;
 
 public record Request : IValidatableObject
 {

src/FiscalOS.API/Auth/AuthExtensions.cs

@@ -1,18 +0,0 @@
-namespace FiscalOS.API.Auth;
-
-internal static class AuthExtensions
-{
-  private const string RouteGroupPrefix = "/auth";
-
-  public static RouteGroupBuilder MapAuthEndpoints(this WebApplication app)
-  {
-    var authGroup = app.MapGroup(RouteGroupPrefix);
-
-    authGroup.MapLoginEndpoint();
-
-    authGroup.MapRefreshEndpoint()
-      .RequireAuthorization(Schemes.AllowExpiredTokens);
-
-    return authGroup;
-  }
-}

src/FiscalOS.API/FiscalOS.API.csproj

@@ -10,7 +10,6 @@
   <ItemGroup>
     <ProjectReference Include="..\FiscalOS.Core\FiscalOS.Core.csproj" />
     <ProjectReference Include="..\FiscalOS.Infra\FiscalOS.Infra.csproj" />
-    <ProjectReference Include="..\FiscalOS.ServiceDefaults\FiscalOS.ServiceDefaults.csproj" />
   </ItemGroup>
 
 </Project>

src/FiscalOS.API/Http/HttpContextExtensions.cs

@@ -1,3 +1,5 @@
+using FiscalOS.Core.Identity;
+
 namespace FiscalOS.API.Http;
 
 internal static class HttpContextExtensions

src/FiscalOS.API/Institutions/GetAvailable/Endpoint.cs

@@ -1,51 +0,0 @@
-namespace FiscalOS.API.Institutions.GetAvailable;
-
-internal static class Endpoint
-{
-  private const string Route = "/{id}/available";
-
-  public static RouteHandlerBuilder MapGetAvailableEndpoint(this RouteGroupBuilder groupBuilder)
-  {
-    return groupBuilder.MapGet(Route, HandleAsync);
-  }
-
-  private static async Task<IResult> HandleAsync(
-    HttpContext httpContext,
-    [FromRoute] Guid id,
-    [FromServices] AppDbContext appDbContext,
-    [FromServices] PlaidService plaidService,
-    [FromServices] IEncryptor encryptor,
-    CancellationToken ct
-  )
-  {
-    var userId = httpContext.GetUserId();
-
-    var user = await appDbContext.Users
-      .Include(u => u.Institutions.Where(i => i.Id == id))
-      .ThenInclude(i => i.Metadata)
-      .SingleOrDefaultAsync(u => u.Id == userId, ct);
-
-    if (user is null)
-    {
-      return Results.Unauthorized();
-    }
-
-    if (user.Institutions.Any() is false)
-    {
-      return Results.NotFound();
-    }
-
-    var institution = user.Institutions.First();
-
-    if (institution.Metadata is not PlaidMetadata plaidMetadata)
-    {
-      return Results.BadRequest();
-    }
-
-    var accessToken = await encryptor.DecryptAsyncFor(user, plaidMetadata.EncryptedAccessToken, ct);
-    var accounts = await plaidService.GetAccountsAsync(accessToken);
-    var accountsDtos = accounts.Select(AccountDto.FromPlaidAccount);
-
-    return Results.Ok(Response.From(accountsDtos));
-  }
-}

src/FiscalOS.API/Institutions/GetAvailable/Response.cs

@@ -1,45 +0,0 @@
-namespace FiscalOS.API.Institutions.GetAvailable;
-
-internal sealed record Response
-{
-  public IEnumerable<AccountDto> Accounts { get; init; } = [];
-
-  [JsonConstructor]
-  private Response()
-  {
-  }
-
-  public static Response From(IEnumerable<AccountDto> accounts)
-  {
-    return new Response
-    {
-      Accounts = accounts
-    };
-  }
-}
-
-internal sealed record AccountDto
-{
-  public string ProviderId { get; init; } = string.Empty;
-  public string ProviderName { get; init; } = string.Empty;
-  public decimal CurrentBalance { get; init; }
-  public decimal AvailableBalance { get; init; }
-  public string CurrencyCode { get; init; } = string.Empty;
-
-  [JsonConstructor]
-  private AccountDto()
-  {
-  }
-
-  public static AccountDto FromPlaidAccount(Going.Plaid.Entity.Account plaidAccount)
-  {
-    return new AccountDto
-    {
-      ProviderId = plaidAccount.AccountId,
-      ProviderName = plaidAccount.Name,
-      AvailableBalance = plaidAccount.Available,
-      CurrentBalance = plaidAccount.Current,
-      CurrencyCode = plaidAccount.CurrencyCode,
-    };
-  }
-}

src/FiscalOS.API/Institutions/InstitutionsExtensions.cs

@@ -1,18 +0,0 @@
-namespace FiscalOS.API.Institutions;
-
-internal static class InstitutionsExtensions
-{
-  private const string RouteGroupPrefix = "/institutions";
-
-  public static RouteGroupBuilder MapInstitutionsEndpoints(this WebApplication app)
-  {
-    var institutionsGroup = app.MapGroup(RouteGroupPrefix)
-      .RequireAuthorization();
-
-    institutionsGroup.MapConnectEndpoint();
-    institutionsGroup.MapGetAvailableEndpoint();
-    institutionsGroup.MapLinkEndpoint();
-
-    return institutionsGroup;
-  }
-}

src/FiscalOS.API/Institutions/Link/Endpoint.cs

@@ -1,31 +0,0 @@
-namespace FiscalOS.API.Institutions.Link;
-
-internal static class Endpoint
-{
-  private const string Route = "/link";
-
-  public static RouteHandlerBuilder MapLinkEndpoint(this RouteGroupBuilder groupBuilder)
-  {
-    return groupBuilder.MapPost(Route, HandleAsync);
-  }
-
-  private static async Task<IResult> HandleAsync(
-    HttpContext httpContext,
-    [FromServices] AppDbContext appDbContext,
-    [FromServices] PlaidService plaidService
-  )
-  {
-    var userId = httpContext.GetUserId();
-
-    var user = await appDbContext.Users.SingleOrDefaultAsync(u => u.Id == userId);
-
-    if (user is null)
-    {
-      return Results.Unauthorized();
-    }
-
-    var linkToken = await plaidService.CreateLinkTokenAsync(user.Id.ToString());
-
-    return Results.Ok(Response.From(linkToken));
-  }
-}

src/FiscalOS.API/Institutions/Link/Response.cs

@@ -1,19 +0,0 @@
-namespace FiscalOS.API.Institutions.Link;
-
-public sealed record Response
-{
-  public string LinkToken { get; init; } = string.Empty;
-
-  [JsonConstructor]
-  private Response()
-  {
-  }
-
-  public static Response From(string linkToken)
-  {
-    return new()
-    {
-      LinkToken = linkToken,
-    };
-  }
-}

src/FiscalOS.API/Login/Endpoint.cs

@@ -1,12 +1,12 @@
-namespace FiscalOS.API.Auth.Login;
+namespace FiscalOS.API.Login;
 
 internal static class Endpoint
 {
   private const string Route = "/login";
 
-  public static RouteHandlerBuilder MapLoginEndpoint(this RouteGroupBuilder groupBuilder)
+  public static RouteHandlerBuilder MapLoginEndpoint(this WebApplication app)
   {
-    return groupBuilder.MapPost(Route, HandleAsync);
+    return app.MapPost(Route, HandleAsync);
   }
 
   private static async Task<IResult> HandleAsync(

src/FiscalOS.API/Login/Request.cs

@@ -1,4 +1,4 @@
-namespace FiscalOS.API.Auth.Login;
+namespace FiscalOS.API.Login;
 
 public record Request : IValidatableObject
 {

src/FiscalOS.API/Login/Response.cs

@@ -1,4 +1,4 @@
-namespace FiscalOS.API.Auth.Login;
+namespace FiscalOS.API.Login;
 
 internal sealed record Response
 {

src/FiscalOS.API/Program.cs

@@ -1,9 +1,5 @@
-using FiscalOS.ServiceDefaults;
-
 var builder = WebApplication.CreateBuilder(args);
 
-builder.AddServiceDefaults();
-
 builder.Services.AddValidation();
 builder.Services.AddProblemDetails();
 
@@ -36,10 +32,11 @@ app.UseAuthentication();
 app.UseAuthorization();
 app.UseStatusCodePages();
 
-app.MapDefaultEndpoints();
+app.MapLoginEndpoint();
+
+app.MapRefreshEndpoint()
+  .RequireAuthorization(Schemes.AllowExpiredTokens);
 
-app.MapAuthEndpoints();
 app.MapAccountsEndpoints();
-app.MapInstitutionsEndpoints();
 
 app.Run();

src/FiscalOS.API/Properties/launchSettings.json

@@ -18,6 +18,6 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
-    }
+    },
   }
 }

src/FiscalOS.API/Refresh/Endpoint.cs

@@ -1,12 +1,12 @@
-namespace FiscalOS.API.Auth.Refresh;
+namespace FiscalOS.API.Refresh;
 
 internal static class Endpoint
 {
   private const string Route = "/refresh";
 
-  public static RouteHandlerBuilder MapRefreshEndpoint(this RouteGroupBuilder groupBuilder)
+  public static RouteHandlerBuilder MapRefreshEndpoint(this WebApplication app)
   {
-    return groupBuilder.MapPost(Route, HandleAsync);
+    return app.MapPost(Route, HandleAsync);
   }
 
   private static async Task<IResult> HandleAsync(

src/FiscalOS.API/Refresh/Response.cs

@@ -1,4 +1,4 @@
-namespace FiscalOS.API.Auth.Refresh;
+namespace FiscalOS.API.Refresh;
 
 internal sealed record Response
 {

src/FiscalOS.API/Usings.cs

@@ -3,18 +3,11 @@ global using System.Security.Claims;
 global using System.Text.Json.Serialization;
 
 global using FiscalOS.API.Accounts;
-global using FiscalOS.API.Accounts.Add;
-global using FiscalOS.API.Auth;
-global using FiscalOS.API.Auth.Login;
-global using FiscalOS.API.Auth.Refresh;
+global using FiscalOS.API.Accounts.Connect;
 global using FiscalOS.API.Http;
-global using FiscalOS.API.Institutions;
-global using FiscalOS.API.Institutions.Connect;
-global using FiscalOS.API.Institutions.GetAvailable;
-global using FiscalOS.API.Institutions.Link;
-global using FiscalOS.Core.Accounts;
+global using FiscalOS.API.Login;
+global using FiscalOS.API.Refresh;
 global using FiscalOS.Core.Authentication;
-global using FiscalOS.Core.Identity;
 global using FiscalOS.Core.Security;
 global using FiscalOS.Infra.Accounts.Plaid;
 global using FiscalOS.Infra.Authentication;

src/FiscalOS.AppHost/AppHost.cs

@@ -1,6 +0,0 @@
-var builder = DistributedApplication.CreateBuilder(args);
-
-var api = builder.AddProject<Projects.FiscalOS_API>("API")
-  .WithHttpHealthCheck("/health");
-
-builder.Build().Run();

src/FiscalOS.AppHost/FiscalOS.AppHost.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Aspire.AppHost.Sdk/13.1.1">
-
-  <ItemGroup>
-    <ProjectReference Include="..\FiscalOS.API\FiscalOS.API.csproj" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <UserSecretsId>80a27726-36cc-4a4d-a55d-11af527158bc</UserSecretsId>
-  </PropertyGroup>
-
-</Project>

src/FiscalOS.AppHost/Properties/launchSettings.json

@@ -1,31 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:17104;http://localhost:15068",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "DOTNET_ENVIRONMENT": "Development",
-        "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21226",
-        "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "https://localhost:23228",
-        "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22081"
-      }
-    },
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:15068",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "DOTNET_ENVIRONMENT": "Development",
-        "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19221",
-        "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:18206",
-        "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20097"
-      }
-    }
-  }
-}

src/FiscalOS.Core/Accounts/Account.cs

@@ -1,30 +0,0 @@
-namespace FiscalOS.Core.Accounts;
-
-public sealed class Account : Entity
-{
-  public Guid UserId { get; init; }
-  public Guid InstitutionId { get; init; }
-  public Institution? Institution { get; init; }
-  public string Name { get; init; } = string.Empty;
-  public AccountMetadata? Metadata { get; init; }
-
-  private readonly List<Balance> _balances = [];
-  public IEnumerable<Balance> Balances => _balances;
-
-  public static Account From(Guid institutionId, string name, AccountMetadata accountMetadata)
-  {
-    return new()
-    {
-      InstitutionId = institutionId,
-      Name = name,
-      Metadata = accountMetadata,
-    };
-  }
-
-  public void AddBalance(Balance balance)
-  {
-    ArgumentNullException.ThrowIfNull(balance);
-
-    _balances.Add(balance);
-  }
-}

src/FiscalOS.Core/Accounts/AccountMetadata.cs

@@ -1,15 +0,0 @@
-namespace FiscalOS.Core.Accounts;
-
-public abstract class AccountMetadata : Entity
-{
-  private readonly string _type;
-
-  public string Type => _type;
-
-  public Guid AccountId { get; init; }
-
-  protected AccountMetadata(string type)
-  {
-    _type = type;
-  }
-}

src/FiscalOS.Core/Accounts/Balance.cs

@@ -1,27 +0,0 @@
-namespace FiscalOS.Core.Accounts;
-
-public sealed class Balance : Entity
-{
-  public Guid AccountId { get; init; }
-  public decimal Current { get; init; }
-  public decimal Available { get; init; }
-  public string CurrencyCode { get; init; } = string.Empty;
-
-  private Balance()
-  {
-  }
-
-  public static Balance From(
-    decimal current,
-    decimal available,
-    string currencyCode
-  )
-  {
-    return new()
-    {
-      Current = current,
-      Available = available,
-      CurrencyCode = currencyCode,
-    };
-  }
-}

src/FiscalOS.Core/Accounts/Institution.cs

@@ -4,7 +4,7 @@ public sealed class Institution : Entity
 {
   public Guid UserId { get; init; }
   public string Name { get; init; } = string.Empty;
-  public InstitutionMetadata? Metadata { get; init; }
+  public InstitutionMetadata Metadata { get; init; } = null!;
 
   private Institution()
   {

src/FiscalOS.Core/Identity/User.cs

@@ -13,9 +13,6 @@ public sealed class User : Entity
   private readonly List<Institution> _institutions = [];
   public IEnumerable<Institution> Institutions => _institutions;
 
-  private readonly List<Account> _accounts = [];
-  public IEnumerable<Account> Accounts => _accounts;
-
   private User()
   {
   }
@@ -53,11 +50,4 @@ public sealed class User : Entity
 
     _institutions.Add(institution);
   }
-
-  public void AddAccount(Account account)
-  {
-    ArgumentNullException.ThrowIfNull(account, nameof(account));
-
-    _accounts.Add(account);
-  }
 }

src/FiscalOS.Infra/Accounts/Plaid/PlaidAccountMetadata.cs

@@ -1,21 +0,0 @@
-namespace FiscalOS.Infra.Accounts.Plaid;
-
-public sealed class PlaidAccountMetadata : AccountMetadata
-{
-  public const string TypeValue = Providers.Plaid;
-  public string PlaidId { get; init; } = string.Empty;
-  public string PlaidName { get; init; } = string.Empty;
-
-  private PlaidAccountMetadata() : base(TypeValue)
-  {
-  }
-
-  public static PlaidAccountMetadata From(string plaidId, string plaidName)
-  {
-    return new()
-    {
-      PlaidId = plaidId,
-      PlaidName = plaidName,
-    };
-  }
-}

src/FiscalOS.Infra/Accounts/Plaid/PlaidExtensions.cs

@@ -1,15 +0,0 @@
-namespace FiscalOS.Infra.Accounts.Plaid;
-
-public static class PlaidExtensions
-{
-#pragma warning disable CA1034
-  extension(Going.Plaid.Entity.Account act)
-  {
-    public string CurrencyCode => act.Balances.IsoCurrencyCode
-      ?? act.Balances.UnofficialCurrencyCode
-      ?? "Unknown";
-
-    public decimal Available => act.Balances.Available.GetValueOrDefault();
-    public decimal Current => act.Balances.Current.GetValueOrDefault();
-  }
-}

src/FiscalOS.Infra/Accounts/Plaid/PlaidMetadata.cs

@@ -2,7 +2,7 @@ namespace FiscalOS.Infra.Accounts.Plaid;
 
 public sealed class PlaidMetadata : InstitutionMetadata
 {
-  public const string TypeValue = Providers.Plaid;
+  public const string TypeValue = "Plaid";
   public string PlaidId { get; init; } = string.Empty;
   public string PlaidName { get; init; } = string.Empty;
   public string EncryptedAccessToken { get; init; } = string.Empty;

src/FiscalOS.Infra/Accounts/Plaid/PlaidService.cs

@@ -1,7 +1,3 @@
-
-
-using System.Reflection;
-
 namespace FiscalOS.Infra.Accounts.Plaid;
 
 public sealed class PlaidService
@@ -19,31 +15,6 @@ public sealed class PlaidService
     return new(client);
   }
 
-  public async Task<string> CreateLinkTokenAsync(string id)
-  {
-    var assemblyName = Assembly.GetExecutingAssembly().GetName().FullName;
-    var environmentName = System.Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
-
-    var ltr = await _client.LinkTokenCreateAsync(new()
-    {
-      ClientName = $"{assemblyName}_{environmentName}",
-      Products = [Products.Transactions],
-      CountryCodes = [CountryCode.Us],
-      Language = Language.English,
-      User = new()
-      {
-        ClientUserId = id,
-      },
-    }).ConfigureAwait(false);
-
-    if (ltr.IsSuccessStatusCode is false)
-    {
-      throw new PlaidException("Unable to create link token");
-    }
-
-    return ltr.LinkToken;
-  }
-
   public async Task<(string ItemId, string AccessToken)> ExchangeTokenAsync(string publicToken)
   {
     var ptr = await _client.ItemPublicTokenExchangeAsync(new()
@@ -59,21 +30,6 @@ public sealed class PlaidService
     return (ptr.ItemId, ptr.AccessToken);
   }
 
-  public async Task<List<Going.Plaid.Entity.Account>> GetAccountsAsync(string accessToken)
-  {
-    var ar = await _client.AccountsGetAsync(new()
-    {
-      AccessToken = accessToken,
-    }).ConfigureAwait(false);
-
-    if (ar.IsSuccessStatusCode is false)
-    {
-      throw new PlaidException("Unable to retrieve accounts");
-    }
-
-    return [.. ar.Accounts];
-  }
-
   public async Task<ItemWithConsentFields> GetItemAsync(string accessToken)
   {
     var ar = await _client.ItemGetAsync(new()
@@ -88,4 +44,4 @@ public sealed class PlaidService
 
     return ar.Item;
   }
-}
+}

src/FiscalOS.Infra/Accounts/Providers.cs

@@ -1,6 +0,0 @@
-namespace FiscalOS.Infra.Accounts;
-
-public static class Providers
-{
-  public const string Plaid = nameof(Plaid);
-}

src/FiscalOS.Infra/Data/AppDbContext.cs

@@ -1,4 +1,3 @@
-using Account = FiscalOS.Core.Accounts.Account;
 using Institution = FiscalOS.Core.Accounts.Institution;
 
 namespace FiscalOS.Infra.Data;
@@ -66,11 +65,6 @@ public sealed class AppDbContext(
         .WithOne()
         .HasForeignKey(static i => i.UserId)
         .OnDelete(DeleteBehavior.Cascade);
-
-      eb.HasMany(static u => u.Accounts)
-        .WithOne()
-        .HasForeignKey(static a => a.UserId)
-        .OnDelete(DeleteBehavior.Cascade);
     });
 
     modelBuilder.Entity<RefreshToken>(static eb =>
@@ -110,50 +104,5 @@ public sealed class AppDbContext(
       eb.Property(static m => m.PlaidName);
       eb.Property(static m => m.EncryptedAccessToken);
     });
-
-    modelBuilder.Entity<Account>(static eb =>
-    {
-      eb.Property(static a => a.Name);
-
-      eb.HasOne(static a => a.Institution)
-        .WithMany()
-        .HasForeignKey(static a => a.InstitutionId)
-        .OnDelete(DeleteBehavior.Cascade);
-
-      eb.HasOne(static a => a.Metadata)
-        .WithOne()
-        .HasForeignKey<AccountMetadata>(static m => m.AccountId)
-        .OnDelete(DeleteBehavior.Cascade);
-
-      eb.HasMany(static a => a.Balances)
-        .WithOne()
-        .HasForeignKey(static b => b.AccountId)
-        .OnDelete(DeleteBehavior.Cascade);
-    });
-
-    modelBuilder.Entity<AccountMetadata>(static eb =>
-    {
-      eb.HasDiscriminator(static m => m.Type)
-        .HasValue<PlaidAccountMetadata>(PlaidAccountMetadata.TypeValue);
-
-      eb.Property(static m => m.AccountId);
-      eb.Property(static m => m.Type);
-    });
-
-    modelBuilder.Entity<PlaidAccountMetadata>(static eb =>
-    {
-      eb.HasBaseType<AccountMetadata>();
-
-      eb.Property(static m => m.PlaidId);
-      eb.Property(static m => m.PlaidName);
-    });
-
-    modelBuilder.Entity<Balance>(static eb =>
-    {
-      eb.Property(static b => b.AccountId);
-      eb.Property(static b => b.Current);
-      eb.Property(static b => b.Available);
-      eb.Property(static b => b.CurrencyCode);
-    });
   }
 }

src/FiscalOS.Infra/DependencyInjection/ServiceCollectionExtensions.cs

@@ -5,7 +5,7 @@ public static class ServiceCollectionExtensions
   public static IServiceCollection AddInfrastructure(this IServiceCollection services)
   {
     services.AddSingleton<IAuthorizationMiddlewareResultHandler, ProblemDetailsAuthResultHandler>();
-
+    
     services.AddHttpClient();
     services.AddSingleton(TimeProvider.System);
     services.AddSingleton<IFileSystem, FileSystem>();

src/FiscalOS.Infra/Migrations/20260212215015_InstitutionAndMetadata.cs

@@ -1,82 +1,81 @@
 using System;
-
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
 namespace FiscalOS.Infra.Migrations
 {
-  /// <inheritdoc />
-  public partial class InstitutionAndMetadata : Migration
-  {
     /// <inheritdoc />
-    protected override void Up(MigrationBuilder migrationBuilder)
+    public partial class InstitutionAndMetadata : Migration
     {
-      migrationBuilder.CreateTable(
-          name: "Institution",
-          columns: table => new
-          {
-            Id = table.Column<Guid>(type: "TEXT", nullable: false),
-            UserId = table.Column<Guid>(type: "TEXT", nullable: false),
-            Name = table.Column<string>(type: "TEXT", nullable: false),
-            CreatedAt = table.Column<DateTimeOffset>(type: "TEXT", nullable: false),
-            UpdatedAt = table.Column<DateTimeOffset>(type: "TEXT", nullable: false)
-          },
-          constraints: table =>
-          {
-            table.PrimaryKey("PK_Institution", x => x.Id);
-            table.ForeignKey(
-                      name: "FK_Institution_Users_UserId",
-                      column: x => x.UserId,
-                      principalTable: "Users",
-                      principalColumn: "Id",
-                      onDelete: ReferentialAction.Cascade);
-          });
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Institution",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    UserId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    Name = table.Column<string>(type: "TEXT", nullable: false),
+                    CreatedAt = table.Column<DateTimeOffset>(type: "TEXT", nullable: false),
+                    UpdatedAt = table.Column<DateTimeOffset>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Institution", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Institution_Users_UserId",
+                        column: x => x.UserId,
+                        principalTable: "Users",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
 
-      migrationBuilder.CreateTable(
-          name: "InstitutionMetadata",
-          columns: table => new
-          {
-            Id = table.Column<Guid>(type: "TEXT", nullable: false),
-            Type = table.Column<string>(type: "TEXT", maxLength: 21, nullable: false),
-            InstitutionId = table.Column<Guid>(type: "TEXT", nullable: false),
-            PlaidId = table.Column<string>(type: "TEXT", nullable: true),
-            PlaidName = table.Column<string>(type: "TEXT", nullable: true),
-            EncryptedAccessToken = table.Column<string>(type: "TEXT", nullable: true),
-            CreatedAt = table.Column<DateTimeOffset>(type: "TEXT", nullable: false),
-            UpdatedAt = table.Column<DateTimeOffset>(type: "TEXT", nullable: false)
-          },
-          constraints: table =>
-          {
-            table.PrimaryKey("PK_InstitutionMetadata", x => x.Id);
-            table.ForeignKey(
-                      name: "FK_InstitutionMetadata_Institution_InstitutionId",
-                      column: x => x.InstitutionId,
-                      principalTable: "Institution",
-                      principalColumn: "Id",
-                      onDelete: ReferentialAction.Cascade);
-          });
+            migrationBuilder.CreateTable(
+                name: "InstitutionMetadata",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    Type = table.Column<string>(type: "TEXT", maxLength: 21, nullable: false),
+                    InstitutionId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    PlaidId = table.Column<string>(type: "TEXT", nullable: true),
+                    PlaidName = table.Column<string>(type: "TEXT", nullable: true),
+                    EncryptedAccessToken = table.Column<string>(type: "TEXT", nullable: true),
+                    CreatedAt = table.Column<DateTimeOffset>(type: "TEXT", nullable: false),
+                    UpdatedAt = table.Column<DateTimeOffset>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_InstitutionMetadata", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_InstitutionMetadata_Institution_InstitutionId",
+                        column: x => x.InstitutionId,
+                        principalTable: "Institution",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
 
-      migrationBuilder.CreateIndex(
-          name: "IX_Institution_UserId",
-          table: "Institution",
-          column: "UserId");
+            migrationBuilder.CreateIndex(
+                name: "IX_Institution_UserId",
+                table: "Institution",
+                column: "UserId");
 
-      migrationBuilder.CreateIndex(
-          name: "IX_InstitutionMetadata_InstitutionId",
-          table: "InstitutionMetadata",
-          column: "InstitutionId",
-          unique: true);
+            migrationBuilder.CreateIndex(
+                name: "IX_InstitutionMetadata_InstitutionId",
+                table: "InstitutionMetadata",
+                column: "InstitutionId",
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "InstitutionMetadata");
+
+            migrationBuilder.DropTable(
+                name: "Institution");
+        }
     }
-
-    /// <inheritdoc />
-    protected override void Down(MigrationBuilder migrationBuilder)
-    {
-      migrationBuilder.DropTable(
-          name: "InstitutionMetadata");
-
-      migrationBuilder.DropTable(
-          name: "Institution");
-    }
-  }
-}
+}

src/FiscalOS.Infra/Migrations/20260213130218_AccountAndMetadata.Designer.cs

@@ -1,327 +0,0 @@
-// <auto-generated />
-using System;
-using FiscalOS.Infra.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace FiscalOS.Infra.Migrations
-{
-    [DbContext(typeof(AppDbContext))]
-    [Migration("20260213130218_AccountAndMetadata")]
-    partial class AccountAndMetadata
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "10.0.2");
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("InstituionId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("InstituionId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Account");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.AccountMetadata", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("AccountId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasMaxLength(21)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AccountId")
-                        .IsUnique();
-
-                    b.ToTable("AccountMetadata");
-
-                    b.HasDiscriminator<string>("Type").HasValue("AccountMetadata");
-
-                    b.UseTphMappingStrategy();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Institution");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.InstitutionMetadata", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("InstitutionId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasMaxLength(21)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("InstitutionId")
-                        .IsUnique();
-
-                    b.ToTable("InstitutionMetadata");
-
-                    b.HasDiscriminator<string>("Type").HasValue("InstitutionMetadata");
-
-                    b.UseTphMappingStrategy();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.RefreshToken", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("ExpiresAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("Revoked")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Token")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Token")
-                        .IsUnique();
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("RefreshTokens");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.User", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("EncryptedDataKey")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("EncryptionKeyId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("HashedPassword")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Username")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Username")
-                        .IsUnique();
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("FiscalOS.Infra.Accounts.Plaid.PlaidAccountMetadata", b =>
-                {
-                    b.HasBaseType("FiscalOS.Core.Accounts.AccountMetadata");
-
-                    b.Property<string>("PlaidId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PlaidName")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasDiscriminator().HasValue("Plaid");
-                });
-
-            modelBuilder.Entity("FiscalOS.Infra.Accounts.Plaid.PlaidMetadata", b =>
-                {
-                    b.HasBaseType("FiscalOS.Core.Accounts.InstitutionMetadata");
-
-                    b.Property<string>("EncryptedAccessToken")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PlaidId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PlaidName")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasDiscriminator().HasValue("Plaid");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Institution", "Institution")
-                        .WithMany()
-                        .HasForeignKey("InstituionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FiscalOS.Core.Identity.User", null)
-                        .WithMany("Accounts")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Institution");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.AccountMetadata", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Account", null)
-                        .WithOne("Metadata")
-                        .HasForeignKey("FiscalOS.Core.Accounts.AccountMetadata", "AccountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Identity.User", null)
-                        .WithMany("Institutions")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.InstitutionMetadata", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Institution", null)
-                        .WithOne("Metadata")
-                        .HasForeignKey("FiscalOS.Core.Accounts.InstitutionMetadata", "InstitutionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.RefreshToken", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Identity.User", "User")
-                        .WithMany("RefreshTokens")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.Navigation("Metadata")
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
-                {
-                    b.Navigation("Metadata")
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.User", b =>
-                {
-                    b.Navigation("Accounts");
-
-                    b.Navigation("Institutions");
-
-                    b.Navigation("RefreshTokens");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

src/FiscalOS.Infra/Migrations/20260213130218_AccountAndMetadata.cs

@@ -1,93 +0,0 @@
-using System;
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace FiscalOS.Infra.Migrations
-{
-  /// <inheritdoc />
-  public partial class AccountAndMetadata : Migration
-  {
-    /// <inheritdoc />
-    protected override void Up(MigrationBuilder migrationBuilder)
-    {
-      migrationBuilder.CreateTable(
-          name: "Account",
-          columns: table => new
-          {
-            Id = table.Column<Guid>(type: "TEXT", nullable: false),
-            UserId = table.Column<Guid>(type: "TEXT", nullable: false),
-            InstituionId = table.Column<Guid>(type: "TEXT", nullable: false),
-            Name = table.Column<string>(type: "TEXT", nullable: false),
-            CreatedAt = table.Column<DateTimeOffset>(type: "TEXT", nullable: false),
-            UpdatedAt = table.Column<DateTimeOffset>(type: "TEXT", nullable: false)
-          },
-          constraints: table =>
-          {
-            table.PrimaryKey("PK_Account", x => x.Id);
-            table.ForeignKey(
-                      name: "FK_Account_Institution_InstituionId",
-                      column: x => x.InstituionId,
-                      principalTable: "Institution",
-                      principalColumn: "Id",
-                      onDelete: ReferentialAction.Cascade);
-            table.ForeignKey(
-                      name: "FK_Account_Users_UserId",
-                      column: x => x.UserId,
-                      principalTable: "Users",
-                      principalColumn: "Id",
-                      onDelete: ReferentialAction.Cascade);
-          });
-
-      migrationBuilder.CreateTable(
-          name: "AccountMetadata",
-          columns: table => new
-          {
-            Id = table.Column<Guid>(type: "TEXT", nullable: false),
-            Type = table.Column<string>(type: "TEXT", maxLength: 21, nullable: false),
-            AccountId = table.Column<Guid>(type: "TEXT", nullable: false),
-            PlaidId = table.Column<string>(type: "TEXT", nullable: true),
-            PlaidName = table.Column<string>(type: "TEXT", nullable: true),
-            CreatedAt = table.Column<DateTimeOffset>(type: "TEXT", nullable: false),
-            UpdatedAt = table.Column<DateTimeOffset>(type: "TEXT", nullable: false)
-          },
-          constraints: table =>
-          {
-            table.PrimaryKey("PK_AccountMetadata", x => x.Id);
-            table.ForeignKey(
-                      name: "FK_AccountMetadata_Account_AccountId",
-                      column: x => x.AccountId,
-                      principalTable: "Account",
-                      principalColumn: "Id",
-                      onDelete: ReferentialAction.Cascade);
-          });
-
-      migrationBuilder.CreateIndex(
-          name: "IX_Account_InstituionId",
-          table: "Account",
-          column: "InstituionId");
-
-      migrationBuilder.CreateIndex(
-          name: "IX_Account_UserId",
-          table: "Account",
-          column: "UserId");
-
-      migrationBuilder.CreateIndex(
-          name: "IX_AccountMetadata_AccountId",
-          table: "AccountMetadata",
-          column: "AccountId",
-          unique: true);
-    }
-
-    /// <inheritdoc />
-    protected override void Down(MigrationBuilder migrationBuilder)
-    {
-      migrationBuilder.DropTable(
-          name: "AccountMetadata");
-
-      migrationBuilder.DropTable(
-          name: "Account");
-    }
-  }
-}

src/FiscalOS.Infra/Migrations/20260213180002_FixAccountInstitutionColumnName.Designer.cs

@@ -1,327 +0,0 @@
-// <auto-generated />
-using System;
-using FiscalOS.Infra.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace FiscalOS.Infra.Migrations
-{
-    [DbContext(typeof(AppDbContext))]
-    [Migration("20260213180002_FixAccountInstitutionColumnName")]
-    partial class FixAccountInstitutionColumnName
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "10.0.2");
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("InstitutionId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("InstitutionId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Account");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.AccountMetadata", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("AccountId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasMaxLength(21)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AccountId")
-                        .IsUnique();
-
-                    b.ToTable("AccountMetadata");
-
-                    b.HasDiscriminator<string>("Type").HasValue("AccountMetadata");
-
-                    b.UseTphMappingStrategy();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Institution");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.InstitutionMetadata", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("InstitutionId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasMaxLength(21)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("InstitutionId")
-                        .IsUnique();
-
-                    b.ToTable("InstitutionMetadata");
-
-                    b.HasDiscriminator<string>("Type").HasValue("InstitutionMetadata");
-
-                    b.UseTphMappingStrategy();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.RefreshToken", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("ExpiresAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("Revoked")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Token")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Token")
-                        .IsUnique();
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("RefreshTokens");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.User", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("EncryptedDataKey")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("EncryptionKeyId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("HashedPassword")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Username")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Username")
-                        .IsUnique();
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("FiscalOS.Infra.Accounts.Plaid.PlaidAccountMetadata", b =>
-                {
-                    b.HasBaseType("FiscalOS.Core.Accounts.AccountMetadata");
-
-                    b.Property<string>("PlaidId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PlaidName")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasDiscriminator().HasValue("Plaid");
-                });
-
-            modelBuilder.Entity("FiscalOS.Infra.Accounts.Plaid.PlaidMetadata", b =>
-                {
-                    b.HasBaseType("FiscalOS.Core.Accounts.InstitutionMetadata");
-
-                    b.Property<string>("EncryptedAccessToken")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PlaidId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PlaidName")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasDiscriminator().HasValue("Plaid");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Institution", "Institution")
-                        .WithMany()
-                        .HasForeignKey("InstitutionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FiscalOS.Core.Identity.User", null)
-                        .WithMany("Accounts")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Institution");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.AccountMetadata", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Account", null)
-                        .WithOne("Metadata")
-                        .HasForeignKey("FiscalOS.Core.Accounts.AccountMetadata", "AccountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Identity.User", null)
-                        .WithMany("Institutions")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.InstitutionMetadata", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Institution", null)
-                        .WithOne("Metadata")
-                        .HasForeignKey("FiscalOS.Core.Accounts.InstitutionMetadata", "InstitutionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.RefreshToken", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Identity.User", "User")
-                        .WithMany("RefreshTokens")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.Navigation("Metadata")
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
-                {
-                    b.Navigation("Metadata")
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.User", b =>
-                {
-                    b.Navigation("Accounts");
-
-                    b.Navigation("Institutions");
-
-                    b.Navigation("RefreshTokens");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

src/FiscalOS.Infra/Migrations/20260213180002_FixAccountInstitutionColumnName.cs

@@ -1,62 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace FiscalOS.Infra.Migrations
-{
-  /// <inheritdoc />
-  public partial class FixAccountInstitutionColumnName : Migration
-  {
-    /// <inheritdoc />
-    protected override void Up(MigrationBuilder migrationBuilder)
-    {
-      migrationBuilder.DropForeignKey(
-          name: "FK_Account_Institution_InstituionId",
-          table: "Account");
-
-      migrationBuilder.RenameColumn(
-          name: "InstituionId",
-          table: "Account",
-          newName: "InstitutionId");
-
-      migrationBuilder.RenameIndex(
-          name: "IX_Account_InstituionId",
-          table: "Account",
-          newName: "IX_Account_InstitutionId");
-
-      migrationBuilder.AddForeignKey(
-          name: "FK_Account_Institution_InstitutionId",
-          table: "Account",
-          column: "InstitutionId",
-          principalTable: "Institution",
-          principalColumn: "Id",
-          onDelete: ReferentialAction.Cascade);
-    }
-
-    /// <inheritdoc />
-    protected override void Down(MigrationBuilder migrationBuilder)
-    {
-      migrationBuilder.DropForeignKey(
-          name: "FK_Account_Institution_InstitutionId",
-          table: "Account");
-
-      migrationBuilder.RenameColumn(
-          name: "InstitutionId",
-          table: "Account",
-          newName: "InstituionId");
-
-      migrationBuilder.RenameIndex(
-          name: "IX_Account_InstitutionId",
-          table: "Account",
-          newName: "IX_Account_InstituionId");
-
-      migrationBuilder.AddForeignKey(
-          name: "FK_Account_Institution_InstituionId",
-          table: "Account",
-          column: "InstituionId",
-          principalTable: "Institution",
-          principalColumn: "Id",
-          onDelete: ReferentialAction.Cascade);
-    }
-  }
-}

src/FiscalOS.Infra/Migrations/20260214112234_AddBalancesWithConnectionToAccounts.Designer.cs

@@ -1,364 +0,0 @@
-// <auto-generated />
-using System;
-using FiscalOS.Infra.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace FiscalOS.Infra.Migrations
-{
-    [DbContext(typeof(AppDbContext))]
-    [Migration("20260214112234_AddBalancesWithConnectionToAccounts")]
-    partial class AddBalancesWithConnectionToAccounts
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "10.0.2");
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("InstitutionId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("InstitutionId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Account");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.AccountMetadata", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("AccountId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasMaxLength(21)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AccountId")
-                        .IsUnique();
-
-                    b.ToTable("AccountMetadata");
-
-                    b.HasDiscriminator<string>("Type").HasValue("AccountMetadata");
-
-                    b.UseTphMappingStrategy();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Balance", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("AccountId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("Available")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("Current")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AccountId");
-
-                    b.ToTable("Balance");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Institution");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.InstitutionMetadata", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("InstitutionId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasMaxLength(21)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("InstitutionId")
-                        .IsUnique();
-
-                    b.ToTable("InstitutionMetadata");
-
-                    b.HasDiscriminator<string>("Type").HasValue("InstitutionMetadata");
-
-                    b.UseTphMappingStrategy();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.RefreshToken", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("ExpiresAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("Revoked")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Token")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Token")
-                        .IsUnique();
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("RefreshTokens");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.User", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("EncryptedDataKey")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("EncryptionKeyId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("HashedPassword")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Username")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Username")
-                        .IsUnique();
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("FiscalOS.Infra.Accounts.Plaid.PlaidAccountMetadata", b =>
-                {
-                    b.HasBaseType("FiscalOS.Core.Accounts.AccountMetadata");
-
-                    b.Property<string>("PlaidId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PlaidName")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasDiscriminator().HasValue("Plaid");
-                });
-
-            modelBuilder.Entity("FiscalOS.Infra.Accounts.Plaid.PlaidMetadata", b =>
-                {
-                    b.HasBaseType("FiscalOS.Core.Accounts.InstitutionMetadata");
-
-                    b.Property<string>("EncryptedAccessToken")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PlaidId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PlaidName")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasDiscriminator().HasValue("Plaid");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Institution", "Institution")
-                        .WithMany()
-                        .HasForeignKey("InstitutionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FiscalOS.Core.Identity.User", null)
-                        .WithMany("Accounts")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Institution");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.AccountMetadata", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Account", null)
-                        .WithOne("Metadata")
-                        .HasForeignKey("FiscalOS.Core.Accounts.AccountMetadata", "AccountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Balance", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Account", null)
-                        .WithMany("Balances")
-                        .HasForeignKey("AccountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Identity.User", null)
-                        .WithMany("Institutions")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.InstitutionMetadata", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Institution", null)
-                        .WithOne("Metadata")
-                        .HasForeignKey("FiscalOS.Core.Accounts.InstitutionMetadata", "InstitutionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.RefreshToken", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Identity.User", "User")
-                        .WithMany("RefreshTokens")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.Navigation("Balances");
-
-                    b.Navigation("Metadata");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
-                {
-                    b.Navigation("Metadata");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.User", b =>
-                {
-                    b.Navigation("Accounts");
-
-                    b.Navigation("Institutions");
-
-                    b.Navigation("RefreshTokens");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

src/FiscalOS.Infra/Migrations/20260214112234_AddBalancesWithConnectionToAccounts.cs

@@ -1,50 +0,0 @@
-using System;
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace FiscalOS.Infra.Migrations
-{
-  /// <inheritdoc />
-  public partial class AddBalancesWithConnectionToAccounts : Migration
-  {
-    /// <inheritdoc />
-    protected override void Up(MigrationBuilder migrationBuilder)
-    {
-      migrationBuilder.CreateTable(
-          name: "Balance",
-          columns: table => new
-          {
-            Id = table.Column<Guid>(type: "TEXT", nullable: false),
-            AccountId = table.Column<Guid>(type: "TEXT", nullable: false),
-            Current = table.Column<decimal>(type: "TEXT", nullable: false),
-            Available = table.Column<decimal>(type: "TEXT", nullable: false),
-            CreatedAt = table.Column<DateTimeOffset>(type: "TEXT", nullable: false),
-            UpdatedAt = table.Column<DateTimeOffset>(type: "TEXT", nullable: false)
-          },
-          constraints: table =>
-          {
-            table.PrimaryKey("PK_Balance", x => x.Id);
-            table.ForeignKey(
-                      name: "FK_Balance_Account_AccountId",
-                      column: x => x.AccountId,
-                      principalTable: "Account",
-                      principalColumn: "Id",
-                      onDelete: ReferentialAction.Cascade);
-          });
-
-      migrationBuilder.CreateIndex(
-          name: "IX_Balance_AccountId",
-          table: "Balance",
-          column: "AccountId");
-    }
-
-    /// <inheritdoc />
-    protected override void Down(MigrationBuilder migrationBuilder)
-    {
-      migrationBuilder.DropTable(
-          name: "Balance");
-    }
-  }
-}

src/FiscalOS.Infra/Migrations/20260214122622_AddCurrencyCodeToBalanceModel.Designer.cs

@@ -1,368 +0,0 @@
-// <auto-generated />
-using System;
-using FiscalOS.Infra.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace FiscalOS.Infra.Migrations
-{
-    [DbContext(typeof(AppDbContext))]
-    [Migration("20260214122622_AddCurrencyCodeToBalanceModel")]
-    partial class AddCurrencyCodeToBalanceModel
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "10.0.2");
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("InstitutionId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("InstitutionId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Account");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.AccountMetadata", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("AccountId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasMaxLength(21)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AccountId")
-                        .IsUnique();
-
-                    b.ToTable("AccountMetadata");
-
-                    b.HasDiscriminator<string>("Type").HasValue("AccountMetadata");
-
-                    b.UseTphMappingStrategy();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Balance", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("AccountId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("Available")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CurrencyCode")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("Current")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AccountId");
-
-                    b.ToTable("Balance");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Institution");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.InstitutionMetadata", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("InstitutionId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasMaxLength(21)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("InstitutionId")
-                        .IsUnique();
-
-                    b.ToTable("InstitutionMetadata");
-
-                    b.HasDiscriminator<string>("Type").HasValue("InstitutionMetadata");
-
-                    b.UseTphMappingStrategy();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.RefreshToken", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("ExpiresAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("Revoked")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Token")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Token")
-                        .IsUnique();
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("RefreshTokens");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.User", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("EncryptedDataKey")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("EncryptionKeyId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("HashedPassword")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Username")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Username")
-                        .IsUnique();
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("FiscalOS.Infra.Accounts.Plaid.PlaidAccountMetadata", b =>
-                {
-                    b.HasBaseType("FiscalOS.Core.Accounts.AccountMetadata");
-
-                    b.Property<string>("PlaidId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PlaidName")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasDiscriminator().HasValue("Plaid");
-                });
-
-            modelBuilder.Entity("FiscalOS.Infra.Accounts.Plaid.PlaidMetadata", b =>
-                {
-                    b.HasBaseType("FiscalOS.Core.Accounts.InstitutionMetadata");
-
-                    b.Property<string>("EncryptedAccessToken")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PlaidId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PlaidName")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasDiscriminator().HasValue("Plaid");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Institution", "Institution")
-                        .WithMany()
-                        .HasForeignKey("InstitutionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FiscalOS.Core.Identity.User", null)
-                        .WithMany("Accounts")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Institution");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.AccountMetadata", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Account", null)
-                        .WithOne("Metadata")
-                        .HasForeignKey("FiscalOS.Core.Accounts.AccountMetadata", "AccountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Balance", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Account", null)
-                        .WithMany("Balances")
-                        .HasForeignKey("AccountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Identity.User", null)
-                        .WithMany("Institutions")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.InstitutionMetadata", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Institution", null)
-                        .WithOne("Metadata")
-                        .HasForeignKey("FiscalOS.Core.Accounts.InstitutionMetadata", "InstitutionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.RefreshToken", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Identity.User", "User")
-                        .WithMany("RefreshTokens")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.Navigation("Balances");
-
-                    b.Navigation("Metadata");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
-                {
-                    b.Navigation("Metadata");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Identity.User", b =>
-                {
-                    b.Navigation("Accounts");
-
-                    b.Navigation("Institutions");
-
-                    b.Navigation("RefreshTokens");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

src/FiscalOS.Infra/Migrations/20260214122622_AddCurrencyCodeToBalanceModel.cs

@@ -1,29 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace FiscalOS.Infra.Migrations
-{
-  /// <inheritdoc />
-  public partial class AddCurrencyCodeToBalanceModel : Migration
-  {
-    /// <inheritdoc />
-    protected override void Up(MigrationBuilder migrationBuilder)
-    {
-      migrationBuilder.AddColumn<string>(
-          name: "CurrencyCode",
-          table: "Balance",
-          type: "TEXT",
-          nullable: false,
-          defaultValue: "");
-    }
-
-    /// <inheritdoc />
-    protected override void Down(MigrationBuilder migrationBuilder)
-    {
-      migrationBuilder.DropColumn(
-          name: "CurrencyCode",
-          table: "Balance");
-    }
-  }
-}

src/FiscalOS.Infra/Migrations/AppDbContextModelSnapshot.cs

@@ -17,101 +17,6 @@ namespace FiscalOS.Infra.Migrations
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "10.0.2");
 
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("InstitutionId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("InstitutionId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Account");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.AccountMetadata", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("AccountId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasMaxLength(21)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AccountId")
-                        .IsUnique();
-
-                    b.ToTable("AccountMetadata");
-
-                    b.HasDiscriminator<string>("Type").HasValue("AccountMetadata");
-
-                    b.UseTphMappingStrategy();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Balance", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("AccountId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("Available")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CurrencyCode")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<decimal>("Current")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset>("UpdatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AccountId");
-
-                    b.ToTable("Balance");
-                });
-
             modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
                 {
                     b.Property<Guid>("Id")
@@ -241,21 +146,6 @@ namespace FiscalOS.Infra.Migrations
                     b.ToTable("Users");
                 });
 
-            modelBuilder.Entity("FiscalOS.Infra.Accounts.Plaid.PlaidAccountMetadata", b =>
-                {
-                    b.HasBaseType("FiscalOS.Core.Accounts.AccountMetadata");
-
-                    b.Property<string>("PlaidId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PlaidName")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasDiscriminator().HasValue("Plaid");
-                });
-
             modelBuilder.Entity("FiscalOS.Infra.Accounts.Plaid.PlaidMetadata", b =>
                 {
                     b.HasBaseType("FiscalOS.Core.Accounts.InstitutionMetadata");
@@ -275,41 +165,6 @@ namespace FiscalOS.Infra.Migrations
                     b.HasDiscriminator().HasValue("Plaid");
                 });
 
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Institution", "Institution")
-                        .WithMany()
-                        .HasForeignKey("InstitutionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FiscalOS.Core.Identity.User", null)
-                        .WithMany("Accounts")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Institution");
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.AccountMetadata", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Account", null)
-                        .WithOne("Metadata")
-                        .HasForeignKey("FiscalOS.Core.Accounts.AccountMetadata", "AccountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Balance", b =>
-                {
-                    b.HasOne("FiscalOS.Core.Accounts.Account", null)
-                        .WithMany("Balances")
-                        .HasForeignKey("AccountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
             modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
                 {
                     b.HasOne("FiscalOS.Core.Identity.User", null)
@@ -339,22 +194,14 @@ namespace FiscalOS.Infra.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("FiscalOS.Core.Accounts.Account", b =>
-                {
-                    b.Navigation("Balances");
-
-                    b.Navigation("Metadata");
-                });
-
             modelBuilder.Entity("FiscalOS.Core.Accounts.Institution", b =>
                 {
-                    b.Navigation("Metadata");
+                    b.Navigation("Metadata")
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("FiscalOS.Core.Identity.User", b =>
                 {
-                    b.Navigation("Accounts");
-
                     b.Navigation("Institutions");
 
                     b.Navigation("RefreshTokens");

src/FiscalOS.ServiceDefaults/FiscalOS.ServiceDefaults.csproj

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <IsAspireSharedProject>true</IsAspireSharedProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
-  </ItemGroup>
-
-</Project>

src/FiscalOS.ServiceDefaults/ServiceDefaultsExtensions.cs

@@ -1,89 +0,0 @@
-namespace FiscalOS.ServiceDefaults;
-
-public static class ServiceDefaultsExtensions
-{
-  private const string HealthEndpointPath = "/health";
-  private const string AlivenessEndpointPath = "/alive";
-
-  public static TBuilder AddServiceDefaults<TBuilder>(this TBuilder builder) where TBuilder : IHostApplicationBuilder
-  {
-    builder.ConfigureOpenTelemetry();
-
-    builder.AddDefaultHealthChecks();
-
-    builder.Services.AddServiceDiscovery();
-
-    builder.Services.ConfigureHttpClientDefaults(static http =>
-    {
-      http.AddStandardResilienceHandler();
-      http.AddServiceDiscovery();
-    });
-
-    return builder;
-  }
-
-  public static TBuilder ConfigureOpenTelemetry<TBuilder>(this TBuilder builder) where TBuilder : IHostApplicationBuilder
-  {
-    builder.Logging.AddOpenTelemetry(logging =>
-    {
-      logging.IncludeFormattedMessage = true;
-      logging.IncludeScopes = true;
-    });
-
-    builder.Services.AddOpenTelemetry()
-      .WithMetrics(metrics => metrics.AddAspNetCoreInstrumentation()
-        .AddHttpClientInstrumentation()
-        .AddRuntimeInstrumentation()
-      )
-      .WithTracing(tracing => tracing.AddSource(builder.Environment.ApplicationName)
-        .AddAspNetCoreInstrumentation(tracing =>
-          tracing.Filter = context =>
-            context.Request.Path.StartsWithSegments(HealthEndpointPath, StringComparison.InvariantCultureIgnoreCase) is false &&
-            context.Request.Path.StartsWithSegments(AlivenessEndpointPath, StringComparison.InvariantCultureIgnoreCase) is false
-        )
-        .AddHttpClientInstrumentation()
-      );
-
-    builder.AddOpenTelemetryExporters();
-
-    return builder;
-  }
-
-  public static TBuilder AddDefaultHealthChecks<TBuilder>(this TBuilder builder) where TBuilder : IHostApplicationBuilder
-  {
-    builder.Services.AddHealthChecks()
-      .AddCheck("self", static () => HealthCheckResult.Healthy(), ["live"]);
-
-    return builder;
-  }
-
-  public static WebApplication MapDefaultEndpoints(this WebApplication app)
-  {
-    ArgumentNullException.ThrowIfNull(app);
-
-    if (app.Environment.IsDevelopment())
-    {
-      app.MapHealthChecks(HealthEndpointPath);
-
-      app.MapHealthChecks(AlivenessEndpointPath, new HealthCheckOptions
-      {
-        Predicate = static r => r.Tags.Contains("live")
-      });
-    }
-
-    return app;
-  }
-
-  private static TBuilder AddOpenTelemetryExporters<TBuilder>(this TBuilder builder) where TBuilder : IHostApplicationBuilder
-  {
-    var useOtlpExporter = !string.IsNullOrWhiteSpace(builder.Configuration["OTEL_EXPORTER_OTLP_ENDPOINT"]);
-
-    if (useOtlpExporter)
-    {
-      builder.Services.AddOpenTelemetry().UseOtlpExporter();
-    }
-
-    return builder;
-  }
-
-}

src/FiscalOS.ServiceDefaults/Usings.cs

@@ -1,10 +0,0 @@
-global using Microsoft.AspNetCore.Builder;
-global using Microsoft.AspNetCore.Diagnostics.HealthChecks;
-global using Microsoft.Extensions.DependencyInjection;
-global using Microsoft.Extensions.Diagnostics.HealthChecks;
-global using Microsoft.Extensions.Hosting;
-global using Microsoft.Extensions.Logging;
-
-global using OpenTelemetry;
-global using OpenTelemetry.Metrics;
-global using OpenTelemetry.Trace;

tests/FiscalOS.API.Tests/Assertions/HttpResponseMessageAssertions.cs

@@ -21,19 +21,18 @@ internal sealed class HttpResponseMessageAssertions(
     HttpStatusCode expectedStatusCode
   )
   {
-    _chain.ForCondition(Subject.StatusCode == expectedStatusCode)
-      .FailWith(
-        "Expected response status code to be {0}, but found {1}",
-        expectedStatusCode,
-        Subject.StatusCode
-      );
-
     _chain.ForCondition(Subject.Content.Headers.ContentType?.MediaType is "application/json")
       .FailWith(
         "Expected response to be application/json, but found {0}",
         Subject.Content.Headers.ContentType?.MediaType
       );
 
+    _chain.ForCondition(Subject.StatusCode == expectedStatusCode)
+      .FailWith(
+        "Expected response status code to be {0}, but found {1}",
+        expectedStatusCode,
+        Subject.StatusCode
+      );
 
     var content = await Subject.Content.ReadFromJsonAsync<T>();
 

tests/FiscalOS.API.Tests/Common/SerializableDictionary.cs

@@ -1,10 +1,10 @@
-namespace FiscalOS.API.Tests.Infra;
+namespace FiscalOS.API.Tests.Common;
 
 public interface ISerializableDictionary<TKey, TValue> : IDictionary<TKey, TValue>, IXunitSerializable
 {
 }
 
-public class SerializableDictionary<TKey, TValue>
+public class SerializableDictionary<TKey, TValue> 
   : Dictionary<TKey, TValue>, ISerializableDictionary<TKey, TValue> where TKey : notnull
 {
   public SerializableDictionary() { }

tests/FiscalOS.API.Tests/Infra/HttpRequestBuilder.cs

@@ -1,128 +0,0 @@
-namespace FiscalOS.API.Tests.Infra;
-
-internal sealed class HttpRequestBuilder
-{
-  private HttpMethod _method = HttpMethod.Get;
-  private Uri? _uri;
-  private object? _body;
-  private string? _bearerToken;
-  private readonly Dictionary<string, string> _cookies = [];
-  private readonly Dictionary<string, string> _headers = [];
-
-  private HttpRequestBuilder()
-  {
-  }
-
-  public static HttpRequestBuilder New() => new();
-
-  public HttpRequestBuilder WithMethod(HttpMethod method)
-  {
-    _method = method;
-    return this;
-  }
-
-  public HttpRequestBuilder WithUri(Uri uri)
-  {
-    _uri = uri;
-    return this;
-  }
-
-  public HttpRequestBuilder WithBody<T>(T body)
-  {
-    _body = body;
-    return this;
-  }
-
-  public HttpRequestBuilder WithBearerToken(string token)
-  {
-    _bearerToken = token;
-    return this;
-  }
-
-  public HttpRequestBuilder WithUserId(Guid userId)
-  {
-    _bearerToken = JwtTokenBuilder.New()
-      .WithClaim(JwtRegisteredClaimNames.Sub, userId.ToString())
-      .Build();
-
-    return this;
-  }
-
-  public HttpRequestBuilder WithCookie(string name, string value)
-  {
-    _cookies[name] = value;
-    return this;
-  }
-
-  public HttpRequestBuilder WithRefreshCookie(string token)
-  {
-    return WithCookie("fiscalos_refresh_cookie", token);
-  }
-
-  public HttpRequestBuilder WithHeader(string name, string value)
-  {
-    _headers[name] = value;
-    return this;
-  }
-
-  public HttpRequestBuilder Post(Uri uri)
-  {
-    _method = HttpMethod.Post;
-    _uri = uri;
-    return this;
-  }
-
-  public HttpRequestBuilder Get(Uri uri)
-  {
-    _method = HttpMethod.Get;
-    _uri = uri;
-    return this;
-  }
-
-  public HttpRequestBuilder Put(Uri uri)
-  {
-    _method = HttpMethod.Put;
-    _uri = uri;
-    return this;
-  }
-
-  public HttpRequestBuilder Delete(Uri uri)
-  {
-    _method = HttpMethod.Delete;
-    _uri = uri;
-    return this;
-  }
-
-  public HttpRequestMessage Build()
-  {
-    if (_uri is null)
-    {
-      throw new InvalidOperationException("URI must be set before building the request.");
-    }
-
-    var request = new HttpRequestMessage(_method, _uri);
-
-    if (_body is not null)
-    {
-      var json = JsonSerializer.Serialize(_body);
-      request.Content = new StringContent(json, Encoding.UTF8, "application/json");
-    }
-
-    if (_bearerToken is not null)
-    {
-      request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", _bearerToken);
-    }
-
-    foreach (var (key, value) in _cookies)
-    {
-      request.Headers.Add("Cookie", $"{key}={value}");
-    }
-
-    foreach (var (key, value) in _headers)
-    {
-      request.Headers.Add(key, value);
-    }
-
-    return request;
-  }
-}

tests/FiscalOS.API.Tests/Infra/TestApi.cs

@@ -1,3 +1,5 @@
+using Microsoft.Extensions.Configuration;
+
 namespace FiscalOS.API.Tests.Infra;
 
 public class TestApi : WebApplicationFactory<Program>

tests/FiscalOS.API.Tests/Integration/Accounts/AddTests.cs

@@ -1,280 +0,0 @@
-using Account = FiscalOS.Core.Accounts.Account;
-using Institution = FiscalOS.Core.Accounts.Institution;
-
-namespace FiscalOS.API.Tests.Integration.Accounts;
-
-public class AddTests(TestApi testApi) : IntegrationTest(testApi)
-{
-  private static readonly Uri AddUri = new("/accounts", UriKind.Relative);
-
-  [Fact]
-  public async Task Add_WhenCalledWhenNotLoggedIn_ItShouldReturn401WithProblemDetails()
-  {
-    var response = await Client.PostAsync(AddUri, null, TestContext.Current.CancellationToken);
-
-    await response.Should().BeProblemDetails(HttpStatusCode.Unauthorized);
-  }
-
-  [Fact]
-  public async Task Add_WhenCalledWithoutRequiredInformation_ItShouldReturn400WithProblemDetails()
-  {
-    using var request = HttpRequestBuilder.New()
-      .Post(AddUri)
-      .WithUserId(Guid.NewGuid())
-      .WithBody(new { })
-      .Build();
-
-    var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    await response.Should().BeValidationProblemDetails(new Dictionary<string, string[]>()
-    {
-      ["PlaidInstitutionId"] = ["The PlaidInstitutionId field is required."],
-      ["PlaidAccountId"] = ["The PlaidAccountId field is required."],
-      ["PlaidAccountName"] = ["The PlaidAccountName field is required."],
-      ["AccountCurrencyCode"] = ["The AccountCurrencyCode field is required."],
-    });
-  }
-
-  [Fact]
-  public async Task Add_WhenCalledWithoutInstitutionId_ItShouldReturn400WithProblemDetails()
-  {
-    using var request = HttpRequestBuilder.New()
-      .Post(AddUri)
-      .WithUserId(Guid.NewGuid())
-      .WithBody(new
-      {
-        plaidAccountId = "accountId",
-        plaidAccountName = "Some Account",
-        accountCurrencyCode = "USD",
-      })
-      .Build();
-
-    var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    await response.Should().BeValidationProblemDetails(new Dictionary<string, string[]>()
-    {
-      ["PlaidInstitutionId"] = ["The PlaidInstitutionId field is required."],
-    });
-  }
-
-  [Fact]
-  public async Task Add_WhenCalledWithoutAccountId_ItShouldReturn400WithProblemDetails()
-  {
-    using var request = HttpRequestBuilder.New()
-      .Post(AddUri)
-      .WithUserId(Guid.NewGuid())
-      .WithBody(new
-      {
-        plaidInstitutionId = "institutionId",
-        plaidAccountName = "Some Account",
-        accountCurrencyCode = "USD",
-      })
-      .Build();
-
-    var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    await response.Should().BeValidationProblemDetails(new Dictionary<string, string[]>()
-    {
-      ["PlaidAccountId"] = ["The PlaidAccountId field is required."],
-    });
-  }
-
-  [Fact]
-  public async Task Add_WhenCalledWithoutAccountName_ItShouldReturn400WithProblemDetails()
-  {
-    using var request = HttpRequestBuilder.New()
-      .Post(AddUri)
-      .WithUserId(Guid.NewGuid())
-      .WithBody(new
-      {
-        plaidInstitutionId = "institutionId",
-        plaidAccountId = "accountId",
-        accountCurrencyCode = "USD",
-      })
-      .Build();
-
-    var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    await response.Should().BeValidationProblemDetails(new Dictionary<string, string[]>()
-    {
-      ["PlaidAccountName"] = ["The PlaidAccountName field is required."],
-    });
-  }
-
-  [Fact]
-  public async Task Add_WhenCalledWithNonExistentUser_ItShouldReturn401WithProblemDetails()
-  {
-    using var request = HttpRequestBuilder.New()
-      .Post(AddUri)
-      .WithUserId(Guid.NewGuid())
-      .WithBody(new
-      {
-        plaidInstitutionId = "id",
-        plaidAccountId = "id",
-        plaidAccountName = "Some Account",
-        accountCurrencyCode = "USD",
-      })
-      .Build();
-
-    var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    await response.Should().BeProblemDetails(HttpStatusCode.Unauthorized);
-  }
-
-  [Fact]
-  public async Task Add_WhenCalledWithPlaidInstitutionIdThatHasNotBeenAdded_ItShouldReturn400WithProblemDetails()
-  {
-    var user = await ExecuteAsync(static async (context, ct, sp) =>
-    {
-      var passwordHasher = sp.GetRequiredService<IPasswordHasher>();
-      var encryptor = sp.GetRequiredService<IEncryptor>();
-
-      var userEncryptionKey = await encryptor.GenerateEncryptedKeyAsync(ct);
-      var user = User.From("User1", passwordHasher.Hash("@Password1"), userEncryptionKey);
-
-
-      await context.AddAsync(user, ct);
-      await context.SaveChangesAsync(ct);
-      return user;
-    }, TestContext.Current.CancellationToken);
-
-    using var request = HttpRequestBuilder.New()
-      .Post(AddUri)
-      .WithUserId(user.Id)
-      .WithBody(new
-      {
-        plaidInstitutionId = "id",
-        plaidAccountId = "id",
-        plaidAccountName = "Some Account",
-        accountCurrencyCode = "USD",
-      })
-      .Build();
-
-    var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    await response.Should().BeValidationProblemDetails(new Dictionary<string, string[]>()
-    {
-      ["PlaidInstitutionId"] = ["The PlaidInstitutionId field is invalid. No institution connected with the given PlaidInstitutionId was found for the user."],
-    });
-  }
-
-  [Fact]
-  public async Task Add_WhenCalledWithPlaidAccountIdThatHasAlreadyBeenAdded_ItShouldReturn409WithProblemDetails()
-  {
-    var (user, institution, account) = await ExecuteAsync(static async (context, ct, sp) =>
-    {
-      var passwordHasher = sp.GetRequiredService<IPasswordHasher>();
-      var encryptor = sp.GetRequiredService<IEncryptor>();
-
-      var userEncryptionKey = await encryptor.GenerateEncryptedKeyAsync(ct);
-      var user = User.From("User1", passwordHasher.Hash("@Password1"), userEncryptionKey);
-
-      await context.AddAsync(user, ct);
-
-      var encryptedAccessToken = await encryptor.EncryptAsyncFor(user, "accessToken", ct);
-      var plaidMetadata = PlaidMetadata.From("alreadyExists", "Some Bank", encryptedAccessToken);
-      var institution = Institution.From("Some Bank", plaidMetadata);
-
-      await context.AddAsync(institution, ct);
-
-      var plaidAccountMetadata = PlaidAccountMetadata.From("accountId", "Some Account");
-      var account = Account.From(institution.Id, "Some Account", plaidAccountMetadata);
-
-      user.AddInstitution(institution);
-      user.AddAccount(account);
-
-      await context.SaveChangesAsync(ct);
-      return (user, institution, account);
-    }, TestContext.Current.CancellationToken);
-
-    using var request = HttpRequestBuilder.New()
-      .Post(AddUri)
-      .WithUserId(user.Id)
-      .WithBody(new
-      {
-        plaidInstitutionId = ((PlaidMetadata)institution.Metadata!).PlaidId,
-        plaidAccountId = ((PlaidAccountMetadata)account.Metadata!).PlaidId,
-        plaidAccountName = ((PlaidAccountMetadata)account.Metadata).PlaidName,
-        accountCurrencyCode = "USD",
-      })
-      .Build();
-
-    var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    await response.Should().BeProblemDetails(HttpStatusCode.Conflict);
-  }
-
-  [Fact]
-  public async Task Add_WhenCalledWithNewAccount_ItShouldReturn200()
-  {
-    var (user, institution) = await ExecuteAsync(async (context, ct, sp) =>
-    {
-      var passwordHasher = sp.GetRequiredService<IPasswordHasher>();
-      var encryptor = sp.GetRequiredService<IEncryptor>();
-      var plaidClient = sp.GetRequiredService<PlaidClient>();
-
-      var userEncryptionKey = await encryptor.GenerateEncryptedKeyAsync(ct);
-      var user = User.From("User1", passwordHasher.Hash("@Password1"), userEncryptionKey);
-
-      var encryptedAccessToken = await encryptor.EncryptAsyncFor(user, "accessToken", ct);
-      var plaidMetadata = PlaidMetadata.From("id", "Some Bank", encryptedAccessToken);
-      var institution = Institution.From("Some Bank", plaidMetadata);
-
-      user.AddInstitution(institution);
-
-      await context.AddAsync(user, ct);
-      await context.SaveChangesAsync(ct);
-      return (user, institution);
-    }, TestContext.Current.CancellationToken);
-
-    var newAccountId = "newAccountId";
-    var newAccountName = "New Account";
-    var expectedBalance = 100;
-    var expectedCurrencyCode = "USD";
-
-    using var request = HttpRequestBuilder.New()
-      .Post(AddUri)
-      .WithUserId(user.Id)
-      .WithBody(new
-      {
-        plaidInstitutionId = ((PlaidMetadata)institution.Metadata!).PlaidId,
-        plaidAccountId = newAccountId,
-        plaidAccountName = newAccountName,
-        accountCurrentBalance = expectedBalance,
-        accountAvailableBalance = expectedBalance,
-        accountCurrencyCode = expectedCurrencyCode,
-      })
-      .Build();
-
-    var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    response.StatusCode.Should().Be(HttpStatusCode.OK);
-
-    var updatedUser = await ExecuteAsync(
-      async (context, ct) => await context.Set<User>()
-        .Include(u => u.Accounts)
-        .ThenInclude(a => a.Metadata)
-        .Include(u => u.Accounts)
-        .ThenInclude(a => a.Balances)
-        .AsSplitQuery()
-        .FirstAsync(u => u.Id == user.Id, ct),
-      TestContext.Current.CancellationToken
-    );
-
-    updatedUser.Accounts.Should().ContainSingle(
-      a => a.Name == newAccountName &&
-        a.InstitutionId == institution.Id &&
-        a.Metadata is PlaidAccountMetadata &&
-        ((PlaidAccountMetadata)a.Metadata).PlaidId == newAccountId &&
-        ((PlaidAccountMetadata)a.Metadata).PlaidName == newAccountName
-    );
-
-    updatedUser.Accounts.First()
-      .Balances.Should().ContainSingle(
-        b => b.AccountId == updatedUser.Accounts.First().Id &&
-          b.Current == expectedBalance &&
-          b.Available == expectedBalance &&
-          b.CurrencyCode == expectedCurrencyCode
-      );
-  }
-}

tests/FiscalOS.API.Tests/Integration/ConnectTests.cs

@@ -1,20 +1,15 @@
 using Institution = FiscalOS.Core.Accounts.Institution;
 
-namespace FiscalOS.API.Tests.Integration.Institutions;
+namespace FiscalOS.API.Tests.Integration;
 
 public class ConnectTests(TestApi testApi) : IntegrationTest(testApi)
 {
-  private static readonly Uri ConnectUri = new("/institutions/connect", UriKind.Relative);
+  private static readonly Uri ConnectUri = new("/accounts/connect", UriKind.Relative);
 
   [Fact]
   public async Task Connect_WhenCalledWithoutValidToken_ItShouldReturn401WithProblemDetails()
   {
-    using var request = HttpRequestBuilder.New()
-      .Post(ConnectUri)
-      .WithBody(new { })
-      .Build();
-
-    var res = await Client.SendAsync(request, TestContext.Current.CancellationToken);
+    var res = await Client.PostAsJsonAsync(ConnectUri, new { }, TestContext.Current.CancellationToken);
 
     await res.Should().BeProblemDetails(HttpStatusCode.Unauthorized);
   }
@@ -22,12 +17,17 @@ public class ConnectTests(TestApi testApi) : IntegrationTest(testApi)
   [Fact]
   public async Task Connect_WhenCalledWithoutPublicTokenOrPlaidInstitutionId_ItShouldReturn400WithProblemDetails()
   {
-    using var request = HttpRequestBuilder.New()
-      .Post(ConnectUri)
-      .WithUserId(Guid.NewGuid())
-      .WithBody(new { })
+    var jwt = JwtTokenBuilder.New()
+      .WithClaim(JwtRegisteredClaimNames.Sub, Guid.NewGuid().ToString())
       .Build();
 
+    using var content = new StringContent(JsonSerializer.Serialize(new { }), Encoding.UTF8, "application/json");
+    using var request = new HttpRequestMessage(HttpMethod.Post, ConnectUri)
+    {
+      Content = content,
+    };
+    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+
     var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
 
     await response.Should().BeValidationProblemDetails(new Dictionary<string, string[]>()
@@ -40,12 +40,18 @@ public class ConnectTests(TestApi testApi) : IntegrationTest(testApi)
   [Fact]
   public async Task Connect_WhenCalledWithoutPublicToken_ItShouldReturn400WithProblemDetails()
   {
-    using var request = HttpRequestBuilder.New()
-      .Post(ConnectUri)
-      .WithUserId(Guid.NewGuid())
-      .WithBody(new { plaidInstitutionId = "id" })
+    var jwt = JwtTokenBuilder.New()
+      .WithClaim(JwtRegisteredClaimNames.Sub, Guid.NewGuid().ToString())
       .Build();
 
+    var json = JsonSerializer.Serialize(new { plaidInstitutionId = "id" });
+    using var content = new StringContent(json, Encoding.UTF8, "application/json");
+    using var request = new HttpRequestMessage(HttpMethod.Post, ConnectUri)
+    {
+      Content = content,
+    };
+    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+
     var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
 
     await response.Should().BeValidationProblemDetails(new Dictionary<string, string[]>()
@@ -57,12 +63,18 @@ public class ConnectTests(TestApi testApi) : IntegrationTest(testApi)
   [Fact]
   public async Task Connect_WhenCalledWithoutPlaidInstitutionId_ItShouldReturn400WithProblemDetails()
   {
-    using var request = HttpRequestBuilder.New()
-      .Post(ConnectUri)
-      .WithUserId(Guid.NewGuid())
-      .WithBody(new { publicToken = "token" })
+    var jwt = JwtTokenBuilder.New()
+      .WithClaim(JwtRegisteredClaimNames.Sub, Guid.NewGuid().ToString())
       .Build();
 
+    var json = JsonSerializer.Serialize(new { publicToken = "token" });
+    using var content = new StringContent(json, Encoding.UTF8, "application/json");
+    using var request = new HttpRequestMessage(HttpMethod.Post, ConnectUri)
+    {
+      Content = content,
+    };
+    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+
     var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
 
     await response.Should().BeValidationProblemDetails(new Dictionary<string, string[]>()
@@ -74,16 +86,22 @@ public class ConnectTests(TestApi testApi) : IntegrationTest(testApi)
   [Fact]
   public async Task Connect_WhenCalledWithNonExistentUser_ItShouldReturn401WithProblemDetails()
   {
-    using var request = HttpRequestBuilder.New()
-      .Post(ConnectUri)
-      .WithUserId(Guid.NewGuid())
-      .WithBody(new
-      {
-        publicToken = "token",
-        plaidInstitutionId = "id",
-      })
+    var jwt = JwtTokenBuilder.New()
+      .WithClaim(JwtRegisteredClaimNames.Sub, Guid.NewGuid().ToString())
       .Build();
 
+    var json = JsonSerializer.Serialize(new
+    {
+      publicToken = "token",
+      plaidInstitutionId = "id",
+    });
+    using var content = new StringContent(json, Encoding.UTF8, "application/json");
+    using var request = new HttpRequestMessage(HttpMethod.Post, ConnectUri)
+    {
+      Content = content,
+    };
+    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+
     var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
 
     await response.Should().BeProblemDetails(HttpStatusCode.Unauthorized);
@@ -111,16 +129,22 @@ public class ConnectTests(TestApi testApi) : IntegrationTest(testApi)
       return (user, institution);
     }, TestContext.Current.CancellationToken);
 
-    using var request = HttpRequestBuilder.New()
-      .Post(ConnectUri)
-      .WithUserId(user.Id)
-      .WithBody(new
-      {
-        publicToken = "token",
-        plaidInstitutionId = ((PlaidMetadata)institution.Metadata!).PlaidId,
-      })
+    var jwt = JwtTokenBuilder.New()
+      .WithClaim(JwtRegisteredClaimNames.Sub, user.Id.ToString())
       .Build();
 
+    var json = JsonSerializer.Serialize(new
+    {
+      publicToken = "token",
+      plaidInstitutionId = ((PlaidMetadata)institution.Metadata).PlaidId,
+    });
+    using var content = new StringContent(json, Encoding.UTF8, "application/json");
+    using var request = new HttpRequestMessage(HttpMethod.Post, ConnectUri)
+    {
+      Content = content,
+    };
+    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+
     var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
 
     await response.Should().BeProblemDetails(HttpStatusCode.Conflict);
@@ -143,25 +167,31 @@ public class ConnectTests(TestApi testApi) : IntegrationTest(testApi)
       await context.AddAsync(user, ct);
       await context.SaveChangesAsync(ct);
 
-      var publicTokenResponse = await plaidClient.SandboxPublicTokenCreateAsync(new()
+      var publicToken = await plaidClient.SandboxPublicTokenCreateAsync(new()
       {
         InstitutionId = plaidInstitutionId,
         InitialProducts = [Products.Transactions],
       });
 
-      return (user, publicTokenResponse.PublicToken);
+      return (user, publicToken.PublicToken);
     }, TestContext.Current.CancellationToken);
 
-    using var request = HttpRequestBuilder.New()
-      .Post(ConnectUri)
-      .WithUserId(user.Id)
-      .WithBody(new
-      {
-        publicToken,
-        plaidInstitutionId,
-      })
+    var jwt = JwtTokenBuilder.New()
+      .WithClaim(JwtRegisteredClaimNames.Sub, user.Id.ToString())
       .Build();
 
+    var json = JsonSerializer.Serialize(new
+    {
+      publicToken,
+      plaidInstitutionId,
+    });
+    using var content = new StringContent(json, Encoding.UTF8, "application/json");
+    using var request = new HttpRequestMessage(HttpMethod.Post, ConnectUri)
+    {
+      Content = content,
+    };
+    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+
     var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
 
     response.StatusCode.Should().Be(HttpStatusCode.OK);

tests/FiscalOS.API.Tests/Integration/Institutions/GetAvailableTests.cs

@@ -1,116 +0,0 @@
-using FiscalOS.API.Institutions.GetAvailable;
-
-using Institution = FiscalOS.Core.Accounts.Institution;
-
-namespace FiscalOS.API.Tests.Integration.Institutions;
-
-public class GetAvailableTests(TestApi testApi) : IntegrationTest(testApi)
-{
-  private static Uri GetAvailableUri(Guid id)
-  {
-    return new($"/institutions/{id}/available", UriKind.Relative);
-  }
-
-  [Fact]
-  public async Task GetAvailable_WhenCalledAndUnauthenticated_ItShouldReturn401WithProblemDetails()
-  {
-    using var request = HttpRequestBuilder.New()
-      .WithUri(GetAvailableUri(Guid.NewGuid()))
-      .Build();
-
-    var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    await response.Should().BeProblemDetails(HttpStatusCode.Unauthorized);
-  }
-
-  [Fact]
-  public async Task GetAvailable_WhenCalledByNonExistentUser_ItShouldReturn401WithProblemDetails()
-  {
-    using var request = HttpRequestBuilder.New()
-      .WithUri(GetAvailableUri(Guid.NewGuid()))
-      .WithUserId(Guid.NewGuid())
-      .Build();
-
-    var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    await response.Should().BeProblemDetails(HttpStatusCode.Unauthorized);
-  }
-
-  [Fact]
-  public async Task GetAvailable_WhenCalledWithNonExistentInstitutionId_ItShouldReturn404WithProblemDetails()
-  {
-    var user = await ExecuteAsync(static async (context, ct, sp) =>
-    {
-      var passwordHasher = sp.GetRequiredService<IPasswordHasher>();
-      var encryptor = sp.GetRequiredService<IEncryptor>();
-
-      var userEncryptionKey = await encryptor.GenerateEncryptedKeyAsync(ct);
-      var user = User.From("Stevan", passwordHasher.Hash("@Password1"), userEncryptionKey);
-
-      context.Add(user);
-      await context.SaveChangesAsync(ct);
-      return user;
-    }, TestContext.Current.CancellationToken);
-
-    using var request = HttpRequestBuilder.New()
-      .WithUri(GetAvailableUri(Guid.NewGuid()))
-      .WithUserId(user.Id)
-      .Build();
-
-    var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    await response.Should().BeProblemDetails(HttpStatusCode.NotFound);
-  }
-
-  [Fact]
-  public async Task GetAvailable_WhenCalledWithConnectedInstitution_ItShouldReturn200WithAvailableAccounts()
-  {
-    var (user, institution, expectedAccounts) = await ExecuteAsync(static async (context, ct, sp) =>
-    {
-      var passwordHasher = sp.GetRequiredService<IPasswordHasher>();
-      var encryptor = sp.GetRequiredService<IEncryptor>();
-      var plaidClient = sp.GetRequiredService<PlaidClient>();
-
-      var userEncryptionKey = await encryptor.GenerateEncryptedKeyAsync(ct);
-      var user = User.From("Stevan", passwordHasher.Hash("@Password1"), userEncryptionKey);
-
-      var institutionId = "ins_109508";
-
-      var publicTokenResponse = await plaidClient.SandboxPublicTokenCreateAsync(new()
-      {
-        InstitutionId = institutionId,
-        InitialProducts = [Products.Transactions],
-      });
-
-      var exchangeTokenResponse = await plaidClient.ItemPublicTokenExchangeAsync(new()
-      {
-        PublicToken = publicTokenResponse.PublicToken,
-      });
-
-      var accountsResponse = await plaidClient.AccountsGetAsync(new()
-      {
-        AccessToken = exchangeTokenResponse.AccessToken,
-      });
-      var encryptedAccessToken = await encryptor.EncryptAsyncFor(user, exchangeTokenResponse.AccessToken, ct);
-      var institutionMetadata = PlaidMetadata.From(institutionId, "Some Bank", encryptedAccessToken);
-      var institution = Institution.From("Some Bank", institutionMetadata);
-
-      user.AddInstitution(institution);
-
-      context.Add(user);
-      context.Add(institution);
-      await context.SaveChangesAsync(ct);
-      return (user, institution, accountsResponse.Accounts);
-    }, TestContext.Current.CancellationToken);
-
-    using var request = HttpRequestBuilder.New()
-      .WithUri(GetAvailableUri(institution.Id))
-      .WithUserId(user.Id)
-      .Build();
-
-    var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    (await response.Should().BeJsonContentOfType<Response>(HttpStatusCode.OK))
-      .Which.Accounts.Should().BeEquivalentTo(expectedAccounts.Select(AccountDto.FromPlaidAccount));
-  }
-}

tests/FiscalOS.API.Tests/Integration/Institutions/LinkTests.cs

@@ -1,58 +0,0 @@
-namespace FiscalOS.API.Tests.Integration.Institutions;
-
-public class LinkTests(TestApi testApi) : IntegrationTest(testApi)
-{
-  private static readonly Uri LinkUri = new("/institutions/link", UriKind.Relative);
-
-  [Fact]
-  public async Task Link_WhenCalledAndUnauthenticated_ItShouldReturn401WithProblemDetails()
-  {
-    using var request = HttpRequestBuilder.New()
-      .Post(LinkUri)
-      .Build();
-
-    var res = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    await res.Should().BeProblemDetails(HttpStatusCode.Unauthorized);
-  }
-
-  [Fact]
-  public async Task Link_WhenCalledWithNonExistentUser_ItShouldReturn401WithProblemDetails()
-  {
-    using var request = HttpRequestBuilder.New()
-      .Post(LinkUri)
-      .WithUserId(Guid.NewGuid())
-      .Build();
-
-    var res = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    await res.Should().BeProblemDetails(HttpStatusCode.Unauthorized);
-  }
-
-  [Fact]
-  public async Task Link_WhenCalledWithUserWhoExists_ItShouldReturnLinkToken()
-  {
-    var user = await ExecuteAsync(static async (context, ct, sp) =>
-    {
-      var passwordHasher = sp.GetRequiredService<IPasswordHasher>();
-      var encryptor = sp.GetRequiredService<IEncryptor>();
-
-      var userEncryptionKey = await encryptor.GenerateEncryptedKeyAsync(ct);
-      var user = User.From("User1", passwordHasher.Hash("@Password1"), userEncryptionKey);
-
-      await context.AddAsync(user, ct);
-      await context.SaveChangesAsync(ct);
-      return user;
-    }, TestContext.Current.CancellationToken);
-
-    using var request = HttpRequestBuilder.New()
-      .Post(LinkUri)
-      .WithUserId(user.Id)
-      .Build();
-
-    var res = await Client.SendAsync(request, TestContext.Current.CancellationToken);
-
-    (await res.Should().BeJsonContentOfType<API.Institutions.Link.Response>(HttpStatusCode.OK))
-      .Which.LinkToken.Should().NotBeEmpty();
-  }
-}

tests/FiscalOS.API.Tests/Integration/LoginTests.cs

@@ -1,23 +1,22 @@
-namespace FiscalOS.API.Tests.Integration.Auth;
+using FiscalOS.API.Tests.Common;
+
+namespace FiscalOS.API.Tests.Integration;
 
 public class LoginTests(TestApi testApi) : IntegrationTest(testApi)
 {
-  private static readonly Uri LoginUri = new("/auth/login", UriKind.Relative);
+  private static readonly Uri LoginUri = new("/login", UriKind.Relative);
 
   [Theory]
   [ClassData<LoginValidationTestCases>]
   public async Task Login_WhenUserSubmitsInvalidRequest_ItShouldReturn400WithProblemDetails(LoginValidationTestCase tc)
   {
-    using var request = HttpRequestBuilder.New()
-      .Post(LoginUri)
-      .WithBody(new
-      {
-        username = tc.Username,
-        password = tc.Password,
-      })
-      .Build();
+    var req = new
+    {
+      username = tc.Username,
+      password = tc.Password,
+    };
 
-    var res = await Client.SendAsync(request, TestContext.Current.CancellationToken);
+    var res = await Client.PostAsJsonAsync(LoginUri, req, TestContext.Current.CancellationToken);
 
     await res.Should().BeValidationProblemDetails(tc.ExpectedErrors);
   }
@@ -25,16 +24,13 @@ public class LoginTests(TestApi testApi) : IntegrationTest(testApi)
   [Fact]
   public async Task Login_WhenUserDoesNotExist_ItShouldReturn401WithProblemDetails()
   {
-    using var request = HttpRequestBuilder.New()
-      .Post(LoginUri)
-      .WithBody(new
-      {
-        username = "Test",
-        password = "@Password2",
-      })
-      .Build();
+    var req = new
+    {
+      username = "Test",
+      password = "@Password2",
+    };
 
-    var res = await Client.SendAsync(request, TestContext.Current.CancellationToken);
+    var res = await Client.PostAsJsonAsync(LoginUri, req, TestContext.Current.CancellationToken);
 
     await res.Should().BeProblemDetails(HttpStatusCode.Unauthorized);
   }
@@ -53,16 +49,13 @@ public class LoginTests(TestApi testApi) : IntegrationTest(testApi)
       await context.SaveChangesAsync(ct);
     }, TestContext.Current.CancellationToken);
 
-    using var request = HttpRequestBuilder.New()
-      .Post(LoginUri)
-      .WithBody(new
-      {
-        username = "Stevan",
-        password = "@Password2",
-      })
-      .Build();
+    var req = new
+    {
+      username = "Stevan",
+      password = "@Password2",
+    };
 
-    var res = await Client.SendAsync(request, TestContext.Current.CancellationToken);
+    var res = await Client.PostAsJsonAsync(LoginUri, req, TestContext.Current.CancellationToken);
 
     await res.Should().BeProblemDetails(HttpStatusCode.Unauthorized);
   }
@@ -81,19 +74,16 @@ public class LoginTests(TestApi testApi) : IntegrationTest(testApi)
       await context.SaveChangesAsync(ct);
     }, TestContext.Current.CancellationToken);
 
-    using var request = HttpRequestBuilder.New()
-      .Post(LoginUri)
-      .WithBody(new
-      {
-        username = "Stevan",
-        password = "@Password1",
-      })
-      .Build();
+    var req = new
+    {
+      username = "Stevan",
+      password = "@Password1",
+    };
 
-    var res = await Client.SendAsync(request, TestContext.Current.CancellationToken);
+    var res = await Client.PostAsJsonAsync(LoginUri, req, TestContext.Current.CancellationToken);
 
     res.Should().HaveSetCookieHeader("fiscalos_refresh_cookie");
-    await res.Should().BeJsonContentOfType<API.Auth.Login.Response>(HttpStatusCode.OK);
+    await res.Should().BeJsonContentOfType<Login.Response>(HttpStatusCode.OK);
   }
 }
 

tests/FiscalOS.API.Tests/Integration/RefreshTests.cs

@@ -1,8 +1,8 @@
-namespace FiscalOS.API.Tests.Integration.Auth;
+namespace FiscalOS.API.Tests.Integration;
 
 public class RefreshTests(TestApi testApi) : IntegrationTest(testApi)
 {
-  private static readonly Uri RefreshUri = new("/auth/refresh", UriKind.Relative);
+  private static readonly Uri RefreshUri = new("/refresh", UriKind.Relative);
 
   [Fact]
   public async Task Refresh_WhenCalledWithNoAccessToken_ItShouldReturn401WithProblemDetails()
@@ -15,12 +15,14 @@ public class RefreshTests(TestApi testApi) : IntegrationTest(testApi)
   [Fact]
   public async Task Refresh_WhenCalledWithNonExistentRefreshToken_ItShouldReturn400WithProblemDetails()
   {
-    using var request = HttpRequestBuilder.New()
-      .Post(RefreshUri)
-      .WithUserId(Guid.NewGuid())
-      .WithRefreshCookie("nonexistenttoken")
+    var jwt = JwtTokenBuilder.New()
+      .WithClaim(JwtRegisteredClaimNames.Sub, Guid.NewGuid().ToString())
       .Build();
 
+    using var request = new HttpRequestMessage(HttpMethod.Post, RefreshUri);
+    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+    request.Headers.Add("Cookie", "fiscalos_refresh_cookie=nonexistenttoken");
+
     var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
 
     await response.Should().BeProblemDetails(HttpStatusCode.BadRequest);
@@ -51,12 +53,14 @@ public class RefreshTests(TestApi testApi) : IntegrationTest(testApi)
       return (new User[] { user1, user2 }, refreshToken1);
     }, TestContext.Current.CancellationToken);
 
-    using var request = HttpRequestBuilder.New()
-      .Post(RefreshUri)
-      .WithUserId(users[0].Id)
-      .WithRefreshCookie(refreshToken.Token)
+    var jwt = JwtTokenBuilder.New()
+      .WithClaim(JwtRegisteredClaimNames.Sub, users[0].Id.ToString())
       .Build();
 
+    using var request = new HttpRequestMessage(HttpMethod.Post, RefreshUri);
+    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+    request.Headers.Add("Cookie", $"fiscalos_refresh_cookie={refreshToken.Token}");
+
     var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
 
     await response.Should().BeProblemDetails(HttpStatusCode.Forbidden);
@@ -94,12 +98,14 @@ public class RefreshTests(TestApi testApi) : IntegrationTest(testApi)
       return (user, refreshToken);
     }, TestContext.Current.CancellationToken);
 
-    using var request = HttpRequestBuilder.New()
-      .Post(RefreshUri)
-      .WithUserId(user.Id)
-      .WithRefreshCookie(refreshToken.Token)
+    var jwt = JwtTokenBuilder.New()
+      .WithClaim(JwtRegisteredClaimNames.Sub, user.Id.ToString())
       .Build();
 
+    using var request = new HttpRequestMessage(HttpMethod.Post, RefreshUri);
+    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+    request.Headers.Add("Cookie", $"fiscalos_refresh_cookie={refreshToken.Token}");
+
     var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
 
     await response.Should().BeProblemDetails(HttpStatusCode.BadRequest);
@@ -126,12 +132,14 @@ public class RefreshTests(TestApi testApi) : IntegrationTest(testApi)
       return (user, refreshToken);
     }, TestContext.Current.CancellationToken);
 
-    using var request = HttpRequestBuilder.New()
-      .Post(RefreshUri)
-      .WithUserId(user.Id)
-      .WithRefreshCookie(refreshToken.Token)
+    var jwt = JwtTokenBuilder.New()
+      .WithClaim(JwtRegisteredClaimNames.Sub, user.Id.ToString())
       .Build();
 
+    using var request = new HttpRequestMessage(HttpMethod.Post, RefreshUri);
+    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+    request.Headers.Add("Cookie", $"fiscalos_refresh_cookie={refreshToken.Token}");
+
     var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
 
     await response.Should().BeProblemDetails(HttpStatusCode.BadRequest);
@@ -160,19 +168,19 @@ public class RefreshTests(TestApi testApi) : IntegrationTest(testApi)
       return (user, refreshToken);
     }, TestContext.Current.CancellationToken);
 
-    using var request = HttpRequestBuilder.New()
-      .Post(RefreshUri)
-      .WithBearerToken(JwtTokenBuilder.New()
-        .WithClaim(JwtRegisteredClaimNames.Sub, user.Id.ToString())
-        .WithExpiresAt(DateTime.UtcNow.AddMinutes(accessTokenExpiresAtOffset))
-        .Build())
-      .WithRefreshCookie(refreshToken.Token)
+    var jwt = JwtTokenBuilder.New()
+      .WithClaim(JwtRegisteredClaimNames.Sub, user.Id.ToString())
+      .WithExpiresAt(DateTime.UtcNow.AddMinutes(accessTokenExpiresAtOffset))
       .Build();
 
+    using var request = new HttpRequestMessage(HttpMethod.Post, RefreshUri);
+    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+    request.Headers.Add("Cookie", $"fiscalos_refresh_cookie={refreshToken.Token}");
+
     var response = await Client.SendAsync(request, TestContext.Current.CancellationToken);
 
     response.Should().HaveSetCookieHeader("fiscalos_refresh_cookie");
-    await response.Should().BeJsonContentOfType<API.Auth.Refresh.Response>(HttpStatusCode.OK);
+    await response.Should().BeJsonContentOfType<Refresh.Response>(HttpStatusCode.OK);
 
     var oldRefreshTokenInDb = await ExecuteAsync(
       async (context, ct) => await context.Set<RefreshToken>()

tests/FiscalOS.API.Tests/Usings.cs

@@ -27,7 +27,6 @@ global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.AspNetCore.Mvc.Testing;
 global using Microsoft.AspNetCore.TestHost;
 global using Microsoft.EntityFrameworkCore;
-global using Microsoft.Extensions.Configuration;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;