@nauticana/sail 1.1.34 → 1.1.35

package/src/component/payout/bank_info_form.ts

@@ -1,39 +1,23 @@
-import { ChangeDetectionStrategy, Component, computed, effect, inject, input, linkedSignal, output } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { ChangeDetectionStrategy, Component, computed, inject, input, output } from '@angular/core';
+import { toSignal } from '@angular/core/rxjs-interop';
 import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { MatSelectModule } from '@angular/material/select';
-import { BankInfoFormValue, CountryProfile } from '../../model/appdata';
+import { forkJoin, map } from 'rxjs';
+import { BankInfoFormValue } from '../../model/appdata';
+import { Country } from '../../model/geo';
+import { LabelService } from '../../service/label.service';
+import { BackendService } from '../../service/rest_service';
 
 /**
- * Default country profiles bundled with sail. Covers CA / US / EU; downstream
- * apps can pass a different list via the `[countryProfiles]` input.
- *
- * Codes match basis constant_header `tax_id_type` seeded by keel:
- *   S = SIN (CA), N = SSN (US), E = EIN (US business), V = VAT (EU), O = Other.
- */
-export const DEFAULT_COUNTRY_PROFILES: CountryProfile[] = [
-  { code: 'CA', label: 'Canada',         currency: 'CAD', taxIdType: 'S', taxIdLabel: 'SIN',        taxIdPlaceholder: '123456789',   taxIdHint: 'Social Insurance Number — shared with the tax authority for annual reporting' },
-  { code: 'US', label: 'United States',  currency: 'USD', taxIdType: 'N', taxIdLabel: 'SSN or EIN', taxIdPlaceholder: '123-45-6789', taxIdHint: 'SSN for an individual recipient, EIN for an incorporated recipient' },
-  { code: 'DE', label: 'Germany (EU)',   currency: 'EUR', taxIdType: 'V', taxIdLabel: 'VAT number', taxIdPlaceholder: 'DE123456789', taxIdHint: 'VAT registration number' },
-];
-
-/**
- * Payout bank-info form.
- *
- * Captures the basis `user_bank_info` fields (country, currency, account
- * holder, tax id, billing address, agreement). Emits the form value via
- * `(submitted)` — first-time setup POSTs through the app's registration
- * service; CHANGES to an existing destination go through
- * PayoutService.replaceBankInfo (atomic version replacement), never a
- * generic CRUD edit.
- *
- * Ships no CSS — the consuming app styles the classes globally.
- *
- * Selector: <sail-payout-bank-info-form>
+ * Payout bank-info form over keel's `user_bank_info` fields. Countries come from the `country`
+ * table (its default currency is the payout currency) and tax-id types from the `tax_id_type`
+ * domain, so the caller's role needs `TABLE SELECT country`. Emits through `(submitted)`:
+ * first-time setup posts through the app's registration service, changes through
+ * `PayoutService.replaceBankInfo`, never generic CRUD. Ships no CSS.
  */
 @Component({
   selector: 'sail-payout-bank-info-form',
@@ -45,75 +29,47 @@ export const DEFAULT_COUNTRY_PROFILES: CountryProfile[] = [
   templateUrl: './bank_info_form.html',
 })
 export class PayoutBankInfoFormComponent {
-  /** Step title rendered above the form. */
   readonly title = input('Payment and Tax');
-  /** Optional explainer rendered below the title. */
   readonly intro = input('Tax + payout details. Bank account itself is set up with the payout provider in a separate step — only tax-reporting and dispute-correspondence fields are collected here.');
-  /** Override the list of supported countries — keep the default for most apps. */
-  readonly countryProfiles = input<CountryProfile[]>(DEFAULT_COUNTRY_PROFILES);
   /** Provider code persisted on user_bank_info.provider — must match the app's keel --payout_provider. */
   readonly provider = input.required<string>();
-  /** Wording on the provider-agreement checkbox. Override to name the live provider. */
   readonly agreementLabel = input('I agree to the payout provider account agreement');
-  /** Submit-button label — wizards usually use "Next >". */
   readonly submitLabel = input('Next >');
-  /** When true, the back button renders alongside submit. */
   readonly showBack = input(true);
 
-  /**
-   * Emitted on submit as application-layer input. The consumer must use its
-   * registration service for first-time setup or PayoutService.replaceBankInfo
-   * for changes; never send this payload through generic CRUD.
-   */
   readonly submitted = output<BankInfoFormValue>();
-  /** Emitted when the user clicks Back. */
   readonly back = output<void>();
 
-  private readonly fb = inject(FormBuilder);
+  private readonly backend = inject(BackendService);
+  private readonly labels = inject(LabelService);
 
-  readonly form = this.fb.group({
+  readonly form = inject(FormBuilder).group({
     countryCode:       ['', Validators.required],
+    taxIdType:         ['', Validators.required],
     accountHolderName: ['', Validators.required],
     taxId:             ['', Validators.required],
     billingAddress:    ['', Validators.required],
     providerAgreement: [false, Validators.requiredTrue],
   });
 
-  // linkedSignal, not a field initializer: the bound countryProfiles input
-  // isn't available yet during construction.
-  private readonly selectedCountry = linkedSignal<CountryProfile | undefined>(() => this.countryProfiles()[0]);
+  readonly options = toSignal(forkJoin({
+    countries: this.backend.list<Country>('country', undefined, { limit: 1000, orderBy: 'caption' }),
+    labels: this.labels.loadLabels('tax_id_type'),
+  }).pipe(map(({ countries }) => ({ countries, taxIdTypes: this.labels.options('tax_id_type') }))));
 
-  readonly taxIdLabel       = computed(() => this.selectedCountry()?.taxIdLabel ?? '');
-  readonly taxIdPlaceholder = computed(() => this.selectedCountry()?.taxIdPlaceholder ?? '');
-  readonly taxIdHint        = computed(() => this.selectedCountry()?.taxIdHint ?? '');
-
-  constructor() {
-    // Keep the form's country in the bound profile list (never a phantom default).
-    effect(() => {
-      const profiles = this.countryProfiles();
-      const current = this.form.controls.countryCode.value;
-      if (!profiles.some((c) => c.code === current)) {
-        this.form.controls.countryCode.setValue(profiles[0]?.code ?? '');
-      }
-    });
-    this.form.controls.countryCode.valueChanges
-      .pipe(takeUntilDestroyed())
-      .subscribe((code) => {
-        const profiles = this.countryProfiles();
-        this.selectedCountry.set(profiles.find((c) => c.code === code) ?? profiles[0]);
-      });
-  }
+  readonly country = toSignal(this.form.controls.countryCode.valueChanges, { initialValue: '' });
+  readonly currency = computed(() => this.options()?.countries.find((c) => c.Id === this.country())?.Currency ?? '');
 
   submit() {
-    const country = this.selectedCountry();
-    if (this.form.invalid || !country) return;
-    const v = this.form.value;
+    const currency = this.currency();
+    if (this.form.invalid || !currency) return;
+    const v = this.form.getRawValue();
     this.submitted.emit({
-      countryCode:       country.code,
-      currency:          country.currency,
+      countryCode:       v.countryCode!,
+      currency,
       accountHolderName: v.accountHolderName!,
       billingAddress:    v.billingAddress!,
-      taxIdType:         country.taxIdType,
+      taxIdType:         v.taxIdType!,
       taxId:             v.taxId!,
       provider:          this.provider(),
       providerAgreement: v.providerAgreement!,

package/src/component/security/api_keys.html

@@ -0,0 +1,78 @@
+<div class="api-keys">
+  @if (minted(); as key) {
+    <section class="api-keys__minted" role="status" aria-label="New key">
+      <p>Copy this key now; it is not shown again.</p>
+      <code class="api-keys__secret">{{ key.api_key }}</code>
+      <button matButton type="button" (click)="minted.set(null)">I have stored it</button>
+    </section>
+  }
+
+  @if (canGenerate) {
+    <form class="api-keys__new" [formGroup]="form" (ngSubmit)="mint()">
+      <mat-form-field>
+        <mat-label>Key name</mat-label>
+        <input matInput formControlName="keyName" maxlength="100">
+      </mat-form-field>
+      <mat-form-field>
+        <mat-label>Allowed networks (optional)</mat-label>
+        <input matInput formControlName="allowedCidrs" maxlength="2000">
+        <mat-hint>Comma-separated addresses or CIDR ranges. Empty allows any address.</mat-hint>
+      </mat-form-field>
+      <fieldset class="api-keys__scopes">
+        <legend>Scopes</legend>
+        @for (scope of scopes(); track scope.code) {
+          <mat-checkbox [checked]="form.controls.scopes.value.includes(scope.code)"
+            (change)="toggleScope(scope.code, $event.checked)">{{ scope.caption }}</mat-checkbox>
+        }
+      </fieldset>
+      <button matButton="filled" type="submit" [disabled]="form.invalid || loading()">Create key</button>
+    </form>
+  }
+
+  @if (keys().length > 0) {
+    <table class="api-keys__table">
+      <thead>
+        <tr><th>Name</th><th>Prefix</th><th>Scopes</th><th>Networks</th><th>Created</th><th>Last used</th><th><span class="cdk-visually-hidden">Actions</span></th></tr>
+      </thead>
+      <tbody>
+        @for (key of keys(); track key.Id) {
+          <tr [class.api-keys__inactive]="!key.IsActive">
+            <td>{{ key.KeyName }}@if (!key.IsActive) { (inactive) }</td>
+            <td><code>{{ key.KeyPrefix }}…</code></td>
+            <td>{{ key.Scopes }}</td>
+            <td>
+              @if (restricting() === key.Id) {
+                <mat-form-field>
+                  <mat-label>Allowed networks</mat-label>
+                  <input matInput [formControl]="networks" maxlength="2000" (keydown.enter)="saveNetworks(key)">
+                </mat-form-field>
+              } @else {
+                {{ key.AllowedCidrs || 'any address' }}
+              }
+            </td>
+            <td>{{ key.CreatedAt | date: 'short' }}</td>
+            <td>{{ key.LastUsedAt ? (key.LastUsedAt | date: 'short') : '' }}</td>
+            <td>
+              @if (restricting() === key.Id) {
+                <button matButton type="button" (click)="restricting.set(null)">Cancel</button>
+                <button matButton="filled" type="button" [disabled]="networks.invalid || loading()" (click)="saveNetworks(key)">Save</button>
+              } @else {
+                @if (key.IsActive && canRestrict) {
+                  <button matButton type="button" [disabled]="loading()" (click)="editNetworks(key)">Restrict networks</button>
+                }
+                @if (key.IsActive && canRevoke) {
+                  <button matButton type="button" [disabled]="loading()" (click)="revoke(key)">Revoke</button>
+                }
+              }
+            </td>
+          </tr>
+        }
+      </tbody>
+    </table>
+  } @else if (!loading()) {
+    <p class="empty-state">No API key yet.</p>
+  }
+
+  @if (errorMessage()) { <div class="auth-error" role="alert">{{ errorMessage() }}</div> }
+  @if (successMessage()) { <div class="auth-success" role="status">{{ successMessage() }}</div> }
+</div>

package/src/component/security/api_keys.ts

@@ -0,0 +1,90 @@
+import { DatePipe } from '@angular/common';
+import { ChangeDetectionStrategy, Component, OnInit, ViewEncapsulation, inject, input, signal } from '@angular/core';
+import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { ApiKey, MintedApiKey } from '../../model/access';
+import { AccessService } from '../../service/access.service';
+import { LabelOption } from '../../service/label.service';
+import { BaseAsync } from '../abstract/base_async';
+
+/**
+ * The partner's API keys: mint one with scopes and allowed networks (the plaintext shows once),
+ * restrict its networks later, or revoke it. The app passes the scopes it offers; keel's
+ * `ScopePolicy` still decides. Selector: <sail-api-keys>.
+ */
+@Component({
+  selector: 'sail-api-keys',
+  templateUrl: './api_keys.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  encapsulation: ViewEncapsulation.None,
+  imports: [DatePipe, ReactiveFormsModule, MatButtonModule, MatCheckboxModule, MatFormFieldModule, MatInputModule],
+})
+export class ApiKeysComponent extends BaseAsync implements OnInit {
+  private readonly access = inject(AccessService);
+  private readonly fb = inject(FormBuilder).nonNullable;
+
+  /** Scopes offered for a new key, as code and caption. */
+  readonly scopes = input.required<LabelOption[]>();
+
+  readonly canGenerate = this.access.canApiKeyAction('generate');
+  readonly canRestrict = this.access.canApiKeyAction('restrict');
+  readonly canRevoke = this.access.canRevokeApiKey();
+  readonly keys = signal<ApiKey[]>([]);
+  readonly minted = signal<MintedApiKey | null>(null);
+  /** Id of the key whose networks are being edited. */
+  readonly restricting = signal<number | null>(null);
+  readonly form = this.fb.group({
+    keyName:      ['', [Validators.required, Validators.maxLength(100)]],
+    allowedCidrs: ['', Validators.maxLength(2000)],
+    scopes:       [[] as string[], Validators.required],
+  });
+  readonly networks = this.fb.control('', Validators.maxLength(2000));
+
+  ngOnInit(): void {
+    this.load();
+  }
+
+  load(): void {
+    this.run(this.access.apiKeys(), (rows) => this.keys.set(rows), 'Failed to load API keys.');
+  }
+
+  toggleScope(code: string, checked: boolean): void {
+    const control = this.form.controls.scopes;
+    control.setValue(checked ? [...control.value, code] : control.value.filter((s) => s !== code));
+  }
+
+  mint(): void {
+    if (this.form.invalid) return;
+    const { keyName, scopes, allowedCidrs } = this.form.getRawValue();
+    this.run(this.access.mintApiKey(keyName, scopes, allowedCidrs), (key) => {
+      this.minted.set(key);
+      this.form.reset();
+      this.load();
+    }, 'Failed to create the key.');
+  }
+
+  editNetworks(key: ApiKey): void {
+    this.networks.setValue(key.AllowedCidrs ?? '');
+    this.restricting.set(key.Id);
+  }
+
+  saveNetworks(key: ApiKey): void {
+    if (this.networks.invalid) return;
+    this.run(this.access.restrictApiKey(key.Id, this.networks.value), () => {
+      this.restricting.set(null);
+      this.successMessage.set(`Networks of "${key.KeyName}" saved.`);
+      this.load();
+    }, 'Failed to save the networks.');
+  }
+
+  revoke(key: ApiKey): void {
+    if (!confirm(`Revoke key "${key.KeyName}" (${key.KeyPrefix}…)? Anything using it stops working.`)) return;
+    this.run(this.access.revokeApiKey(key.Id), () => {
+      this.successMessage.set(`Key "${key.KeyName}" revoked.`);
+      this.load();
+    }, 'Failed to revoke the key.');
+  }
+}

package/src/component/security/connected_apps.html

@@ -0,0 +1,25 @@
+<div class="connected-apps">
+  @if (grants().length > 0) {
+    <table class="connected-apps__table">
+      <thead>
+        <tr><th>App</th><th>Scopes</th><th>Connected</th><th>Last used</th><th><span class="cdk-visually-hidden">Actions</span></th></tr>
+      </thead>
+      <tbody>
+        @for (grant of grants(); track grant.clientId) {
+          <tr>
+            <td>{{ grant.clientName || grant.clientId }}</td>
+            <td>{{ grant.scopes.join(', ') }}</td>
+            <td>{{ grant.authorizedAt | date: 'short' }}</td>
+            <td>{{ grant.lastIssuedAt | date: 'short' }}</td>
+            <td><button matButton type="button" [disabled]="loading()" (click)="revoke(grant)">Disconnect</button></td>
+          </tr>
+        }
+      </tbody>
+    </table>
+  } @else if (!loading()) {
+    <p class="empty-state">No app is connected.</p>
+  }
+
+  @if (errorMessage()) { <div class="auth-error" role="alert">{{ errorMessage() }}</div> }
+  @if (successMessage()) { <div class="auth-success" role="status">{{ successMessage() }}</div> }
+</div>

package/src/component/security/connected_apps.ts

@@ -0,0 +1,40 @@
+import { DatePipe } from '@angular/common';
+import { ChangeDetectionStrategy, Component, OnInit, ViewEncapsulation, inject, signal } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { OAuthGrant } from '../../model/access';
+import { AccessService } from '../../service/access.service';
+import { BaseAsync } from '../abstract/base_async';
+
+/**
+ * OAuth clients holding a live grant from the signed-in user, with disconnect; a disconnected
+ * client must authorize again. Selector: <sail-connected-apps>.
+ */
+@Component({
+  selector: 'sail-connected-apps',
+  templateUrl: './connected_apps.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  encapsulation: ViewEncapsulation.None,
+  imports: [DatePipe, MatButtonModule],
+})
+export class ConnectedAppsComponent extends BaseAsync implements OnInit {
+  private readonly access = inject(AccessService);
+
+  readonly grants = signal<OAuthGrant[]>([]);
+
+  ngOnInit(): void {
+    this.load();
+  }
+
+  load(): void {
+    this.run(this.access.grants(), (rows) => this.grants.set(rows), 'Failed to load connected apps.');
+  }
+
+  revoke(grant: OAuthGrant): void {
+    const name = grant.clientName || grant.clientId;
+    if (!confirm(`Disconnect "${name}"? It will have to connect again.`)) return;
+    this.run(this.access.revokeGrant(grant.clientId), () => {
+      this.successMessage.set(`Disconnected ${name}.`);
+      this.load();
+    }, 'Failed to disconnect the app.');
+  }
+}

package/src/index.ts

@@ -7,6 +7,8 @@ export * from './model/oauth_connection';
 export * from './model/notification';
 export * from './model/document';
 export * from './model/agency';
+export * from './model/geo';
+export * from './model/access';
 export * from './model/decorator';
 export * from './component/abstract/base_table';
 export * from './component/dashboard/dashboard_shell';
@@ -53,6 +55,8 @@ export * from './component/security/twofactor_setup';
 export * from './component/security/twofactor_verify';
 export * from './component/security/trusted_devices';
 export * from './component/security/sessions';
+export * from './component/security/api_keys';
+export * from './component/security/connected_apps';
 export * from './component/billing/plan_selector';
 export * from './component/billing/price_selector';
 export * from './component/billing/checkout_button';
@@ -95,6 +99,9 @@ export * from './service/rest_service';
 export * from './service/rest_url';
 export * from './service/label.service';
 export * from './service/caption_pipe';
+export * from './service/currency.service';
+export * from './service/access.service';
+export * from './service/money_pipe';
 export * from './service/base_rest.service';
 export * from './util/text';
 export * from './util/money';

package/src/model/access.ts

@@ -0,0 +1,28 @@
+/** A row of keel's `api_key` table as generic REST returns it; the hash never leaves keel. */
+export interface ApiKey {
+  Id:            number;
+  KeyName:       string;
+  KeyPrefix:     string;
+  Scopes:        string;   // CSV
+  IsActive:      boolean;
+  CreatedAt:     string;
+  ExpiresAt?:    string;
+  LastUsedAt?:   string;
+  UserId?:       number;
+  AllowedCidrs?: string;   // CSV of networks; absent allows any address
+}
+
+/** keel `api_key/generate` reply: the plaintext is shown once and never stored. */
+export interface MintedApiKey {
+  api_key:    string;
+  key_prefix: string;
+}
+
+/** An OAuth client the signed-in user authorized on keel's authorization server (`authserver.Grant`). */
+export interface OAuthGrant {
+  clientId:     string;
+  clientName:   string;
+  scopes:       string[];
+  authorizedAt: string;
+  lastIssuedAt: string;
+}

package/src/model/appdata.ts

@@ -252,47 +252,32 @@ export interface PartnerCreated {
 	paymentUrl?:     string;
 }
 
-// One purchasable offer for a plan — a (billing cycle × commitment term) row of
-// keel's `subscription_plan_price` table (v1.0.5). A plan sells several; the
-// customer picks one at checkout via `<sail-price-selector>`. Mirrors keel
-// `billing.PlanPrice`.
+// One purchasable offer for a plan: a (billing cycle × commitment term) row of
+// keel's `subscription_plan_price` table. Mirrors keel `billing.PlanPrice`.
 export interface PlanPrice {
 	billingCycle: string;   // PERIOD_TYPE code (D/W/M/A) — how often charged
 	termCount:    number;   // commitment length, in termType units
 	termType:     string;   // PERIOD_TYPE code — commitment/pricing unit
-	amountMinor:  number;   // price per termType unit, in minor units (cents)
-	amount:       number;   // same amount in major units (currency-exponent applied)
+	amountMinor:  number;   // price per termType unit, in minor units
 	currency:     string;   // ISO 4217
+	exponent:     number;   // minor-unit decimals from keel's currency table
 	// Provider price id (Stripe Price). Empty for free/unpriced offers; pass to
 	// `<sail-checkout-button [priceId]>` / `createCheckout({ priceId })`.
 	priceId?:     string;
 }
 
-// PublicPlan — shape returned by GET /public/plans. Used on the registration
-// page to render the plan picker and to drive `<sail-checkout-button>` flows.
+// Mirrors keel `billing.Plan` from GET /public/plans.
 export interface PublicPlan {
 	id:          string;
 	caption:     string;
-	// NOTE: keel v1.0.7 REMOVED the flat `monthlyCost`/`annualCost` from the plan
-	// JSON (both `/public/plans` and the billing catalog). Price lives per-offer
-	// in `prices[]`; derive a display price with `fromPriceLabel(plan.prices)`.
-	// Purchasable offers (keel v1.0.5 `subscription_plan_price`, nested under the
-	// plan). The source of truth for checkout — feed a chosen offer's `priceId`
-	// to `<sail-checkout-button>`. Returned by `/public/plans` as of keel v1.0.6
-	// (so `<sail-price-selector>` works on the registration page too); absent on
-	// pre-v1.0.6 backends.
-	prices?:     PlanPrice[];
-	// @deprecated keel v1.0.5 moved per-offer prices into `prices[]`
-	// (`subscription_plan.provider_price_id` was dropped). Use
-	// `prices?.[…].priceId`. Kept optional for pre-v1.0.5 backends.
-	priceId?:    string;
-	// keel `subscription_plan.activation_mode` (SUBSCRIPTION_ACTIVATION_MODE
-	// dictionary, single char — e.g. 'P' paid, 'F' free, 'T' trial). Drives the
-	// picker CTA copy ("Start trial" / "Subscribe" / …). Optional — pre-v1.0.3
-	// backends omit it.
-	activationMode?: string;
+	currency:    string;
+	// Purchasable offers; derive a display price with `fromPriceLabel(plan.prices)`
+	// and feed the chosen offer's `priceId` to `<sail-checkout-button>`.
+	prices:      PlanPrice[] | null;
+	// keel `subscription_plan.activation_mode` ('P' paid, 'F' free, 'T' trial); drives the picker CTA.
+	activationMode: string;
 	// Length of the free trial in days when `activationMode === 'T'`.
-	trialDays?:      number;
+	trialDays:      number;
 }
 
 // ConfirmRegisterResponse — shape returned by POST /public/register/confirm:
@@ -323,7 +308,7 @@ export type CheckoutMode = 'subscription' | 'payment' | 'setup';
 export interface CheckoutRequest {
 	mode?:       CheckoutMode;        // default 'subscription'
 	// Required for 'subscription' / 'payment'; must be empty for 'setup'.
-	// Pass `PublicPlan.priceId` straight through.
+	// Pass the chosen `PlanPrice.priceId` straight through.
 	priceId?:    string;
 	quantity?:   number;
 	email?:      string;
@@ -401,33 +386,35 @@ export interface PageRequest {
 	orderBy?: string;
 }
 
+// Mirrors keel `billing.Subscription`; amounts are minor units at `exponent`.
 export interface Subscription {
-	planId:      string;
-	status:      string;  // 'A' active, 'P' pending-payment, 'C' cancelled, 'T' trialing, 'X' past-due — caption via SUBSCRIPTION_STATUS dict
-	begda:       string;
-	endda?:      string;
-	monthlyCost: number;
-	currency:    string;
-	autoRenew:   boolean;
-	// PERIOD_TYPE code (D/W/M/A) the sub is charged on, copied from the chosen
-	// offer (keel `billing_cycle`); absent on pre-v1.0.5 backends.
-	billingCycle?: string;
-	// ISO timestamp the trial ends (keel `trial_end`); empty/absent when not
-	// trialing. Drives `<sail-trial-banner>`.
-	trialEnd?:   string;
-	// Seat quantity on the active/trial sub (keel `seats`); absent for
-	// non-seat plans. Drives `<sail-seat-selector>`.
-	seats?:      number;
-}
-
+	planId:           string;
+	caption?:         string;  // plan display name
+	status:           string;  // 'A' active, 'P' pending-payment, 'C' cancelled, 'T' trialing, 'X' past-due — caption via SUBSCRIPTION_STATUS dict
+	begda:            string;
+	endda?:           string;
+	installmentMinor: number;
+	currency:         string;
+	exponent:         number;
+	autoRenew:        boolean;
+	// PERIOD_TYPE code (D/W/M/A) the sub is charged on, copied from the chosen offer.
+	billingCycle?:    string;
+	// ISO timestamp the trial ends; empty/absent when not trialing. Drives `<sail-trial-banner>`.
+	trialEnd?:        string;
+	// Seat quantity on the active/trial sub; absent for non-seat plans. Drives `<sail-seat-selector>`.
+	seats?:           number;
+}
+
+// Mirrors keel `billing.Invoice`; `status` is keel's one-character invoice status code.
 export interface Invoice {
-	id:       string;
-	number:   string;
-	status:   string;  // 'paid' | 'open' | 'void' | ...
-	total:    number;
-	currency: string;
-	issuedAt: string;
-	paidAt?:  string;
+	id:         string;
+	number:     string;
+	status:     string;
+	totalMinor: number;
+	currency:   string;
+	exponent:   number;
+	issuedAt:   string;
+	paidAt?:    string;
 }
 
 // ── Payout types ──
@@ -469,25 +456,12 @@ export interface BankInfoFormValue {
 	currency:          string;
 	accountHolderName: string;
 	billingAddress:    string;
-	taxIdType:         string;  // 'S' SIN, 'N' SSN, 'E' EIN, 'V' VAT, 'O' other
+	taxIdType:         string;  // keel `tax_id_type` code
 	taxId:             string;
 	provider:          string;
 	providerAgreement: boolean;
 }
 
-// CountryProfile drives the country dropdown in the bank-info form.
-// Each profile bundles ISO codes + tax-id labelling so the form's
-// hint/placeholder text follows the country selection.
-export interface CountryProfile {
-	code:             string;  // ISO 3166-1 alpha-2
-	label:            string;
-	currency:         string;  // ISO 4217
-	taxIdType:        string;  // matches basis constant_header 'tax_id_type'
-	taxIdLabel:       string;
-	taxIdPlaceholder: string;
-	taxIdHint:        string;
-}
-
 // ── User payment methods ──
 // Consumer-side saved cards/wallets. Mirrors basis user_payment_method
 // one-to-one. Distinct from PaymentMethod (partner-scoped SaaS billing

package/src/model/geo.ts

@@ -0,0 +1,12 @@
+/** Rows of keel's `currency` and `country` tables as generic REST returns them. */
+export interface Currency {
+  Code:     string;  // ISO 4217
+  Caption:  string;
+  Exponent: number;  // minor-unit decimals, 0–6
+}
+
+export interface Country {
+  Id:       string;  // ISO 3166-1 alpha-2
+  Caption:  string;
+  Currency: string;  // default ISO 4217 code
+}