@nauticana/sail 1.1.34 → 1.1.35

package/src/service/access.service.ts

@@ -0,0 +1,57 @@
+import { Injectable } from '@angular/core';
+import { Observable, catchError, throwError } from 'rxjs';
+import { ApiKey, MintedApiKey, OAuthGrant } from '../model/access';
+import { TableAction } from '../model/appdata';
+import { BackendService } from './rest_service';
+import { RestURL } from './rest_url';
+
+/** The signed-in user's API keys (keel `api_key` table and actions) and OAuth grants. */
+@Injectable({ providedIn: 'root' })
+export class AccessService extends BackendService {
+  apiKeys(): Observable<ApiKey[]> {
+    return this.list<ApiKey>('api_key', undefined, { orderBy: 'created_at desc' });
+  }
+
+  mintApiKey(keyName: string, scopes: string[], allowedCidrs: string): Observable<MintedApiKey> {
+    return this.apiKeyAction<MintedApiKey>('generate',
+      { key_name: keyName, scopes: scopes.join(','), allowed_cidrs: allowedCidrs });
+  }
+
+  restrictApiKey(id: number, allowedCidrs: string): Observable<void> {
+    return this.apiKeyAction<void>('restrict', { id, allowed_cidrs: allowedCidrs });
+  }
+
+  revokeApiKey(id: number): Observable<{ message: string }> {
+    return this.delete('api_key', { Id: String(id) });
+  }
+
+  grants(): Observable<OAuthGrant[]> {
+    return this.http.get<OAuthGrant[]>(this.url(RestURL.oauthGrantsURL))
+      .pipe(catchError((err) => this.handleError(err)));
+  }
+
+  revokeGrant(clientId: string): Observable<void> {
+    return this.http.post<void>(this.url(RestURL.oauthGrantRevokeURL), { clientId })
+      .pipe(catchError((err) => this.handleError(err)));
+  }
+
+  canApiKeyAction(name: string): boolean {
+    const action = this.findApiKeyAction(name);
+    return !!action && this.auth.canExecute(action.authorityObject, action.authorityCheck, 'api_key');
+  }
+
+  canRevokeApiKey(): boolean {
+    return this.auth.canDelete('api_key');
+  }
+
+  private apiKeyAction<T>(name: string, body: Record<string, unknown>): Observable<T> {
+    const action = this.findApiKeyAction(name);
+    return action
+      ? this.executeAction<T>(action.method, body)
+      : throwError(() => new Error(`sail: api_key/${name} is not available in backend metadata.`));
+  }
+
+  private findApiKeyAction(name: string): TableAction | undefined {
+    return (this.auth.getTableDefinition('api_key')?.Actions ?? []).find((action) => action.action === name);
+  }
+}

package/src/service/caption_pipe.ts

@@ -18,8 +18,14 @@ export class CaptionPipe implements PipeTransform {
     this.loaded();
     if (!this.requested.has(constantId)) {
       this.requested.add(constantId);
-      this.labels.loadLabels(constantId).pipe(takeUntilDestroyed(this.destroyRef))
-        .subscribe({ next: () => this.loaded.update((n) => n + 1), error: () => this.requested.delete(constantId) });
+      // A cached domain emits synchronously: its caption is already current, and a signal
+      // write during render would throw NG0600.
+      let rendering = true;
+      this.labels.loadLabels(constantId).pipe(takeUntilDestroyed(this.destroyRef)).subscribe({
+        next: () => { if (!rendering) this.loaded.update((n) => n + 1); },
+        error: () => this.requested.delete(constantId),
+      });
+      rendering = false;
     }
     return this.labels.getLabel(constantId, code);
   }

package/src/service/currency.service.ts

@@ -0,0 +1,51 @@
+import { Injectable, inject, signal } from '@angular/core';
+import { Observable, map, of, shareReplay, tap } from 'rxjs';
+import { Currency } from '../model/geo';
+import { formatMinor } from '../util/money';
+import { BackendService } from './rest_service';
+
+/**
+ * keel's `currency` catalog, the only source of minor-unit exponents. Loaded once through
+ * generic REST, so the caller's role needs `TABLE SELECT currency`.
+ */
+@Injectable({ providedIn: 'root' })
+export class CurrencyService {
+  private readonly backend = inject(BackendService);
+  private readonly byCode = new Map<string, Currency>();
+  private pending?: Observable<void>;
+  readonly ready = signal(false);
+  readonly failed = signal(false);
+
+  /** Load the catalog; completed and concurrent calls share one request, a failed one is retried. */
+  load(): Observable<void> {
+    if (this.ready()) return of(undefined);
+    this.failed.set(false);
+    this.pending ??= this.backend.list<Currency>('currency', undefined, { limit: 1000 }).pipe(
+      tap({
+        next: (rows) => {
+          for (const row of rows) this.byCode.set(row.Code, row);
+          this.ready.set(true);
+        },
+        error: () => {
+          this.pending = undefined;
+          this.failed.set(true);
+        },
+      }),
+      map(() => undefined),
+      shareReplay({ bufferSize: 1, refCount: false }),
+    );
+    return this.pending;
+  }
+
+  /** Minor-unit exponent of a code; an unknown code is an error, never a guess. */
+  exponent(currency: string): number {
+    if (!this.ready()) throw new Error('sail: the currency catalog is not loaded.');
+    const row = this.byCode.get(currency);
+    if (!row) throw new Error(`sail: unknown currency "${currency}".`);
+    return row.Exponent;
+  }
+
+  format(minor: number, currency: string): string {
+    return formatMinor(minor, currency, this.exponent(currency));
+  }
+}

package/src/service/money_pipe.ts

@@ -0,0 +1,27 @@
+import { DestroyRef, Pipe, PipeTransform, inject } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { formatMinor } from '../util/money';
+import { CurrencyService } from './currency.service';
+
+/**
+ * `{{ minor | sailMoney:currency }}` formats integer minor units at the catalog exponent, '' until
+ * the catalog loads; `{{ minor | sailMoney:currency:exponent }}` uses the exponent keel sent with
+ * the amount and needs no catalog. Impure so it re-renders once the catalog is ready.
+ */
+@Pipe({ name: 'sailMoney', pure: false })
+export class MoneyPipe implements PipeTransform {
+  private readonly currencies = inject(CurrencyService);
+  private readonly destroyRef = inject(DestroyRef);
+  private requested = false;
+
+  transform(minor: number, currency: string, exponent?: number): string {
+    if (exponent !== undefined) return formatMinor(minor, currency, exponent);
+    if (this.currencies.ready()) return this.currencies.format(minor, currency);
+    if (this.currencies.failed()) throw new Error('sail: failed to load the currency catalog.');
+    if (!this.requested) {
+      this.requested = true;
+      this.currencies.load().pipe(takeUntilDestroyed(this.destroyRef)).subscribe({ error: () => undefined });
+    }
+    return '';
+  }
+}

package/src/service/rest_service.ts

@@ -39,7 +39,7 @@ export class SailApiError extends Error {
 
 @Injectable({providedIn: 'root'})
 export class BackendService extends BaseRestService {
-    private readonly auth = inject(BaseAuthService);
+    protected readonly auth = inject(BaseAuthService);
 
     /** Resolved per call so configureRestUrls() may run any time before the first request. */
     protected get prefix(): string {

package/src/service/rest_url.ts

@@ -25,6 +25,9 @@ export const RestURL = {
   trustedDeviceRevokeURL: '/api/user/trusted-device/revoke',
   sessionListURL: '/api/user/sessions',
   sessionRevokeURL: '/api/user/sessions/revoke',
+  // keel GrantHandler (v1.2.112): the signed-in user's OAuth grants.
+  oauthGrantsURL:      '/api/user/oauth-grants',
+  oauthGrantRevokeURL: '/api/user/oauth-grants/revoke',
   checkoutURL:       '/api/billing/checkout',
   subscriptionURL:   '/api/billing/subscription',
   cancelSubURL:      '/api/billing/subscription/cancel',

package/src/util/money.ts

@@ -1,31 +1,19 @@
 import { PlanPrice } from '../model/appdata';
 
 /**
- * Format a major-unit amount in its currency, honouring the currency exponent
- * (JPY 0 decimals, BHD 3, …) via `Intl`. Falls back to "<amount> <currency>"
- * for an unknown currency code rather than throwing.
+ * Format integer minor units at the currency's exponent from keel's `currency` table.
+ * `Intl` supplies only the symbol and grouping; it never decides the decimals.
  */
-export function formatCurrency(amount: number, currency: string): string {
-  try {
-    return new Intl.NumberFormat(undefined, { style: 'currency', currency }).format(amount);
-  } catch {
-    return `${amount} ${currency}`;
+export function formatMinor(minor: number, currency: string, exponent: number): string {
+  if (!Number.isSafeInteger(minor)) throw new Error(`sail: money must be a safe integer (${minor}).`);
+  if (!Number.isInteger(exponent) || exponent < 0 || exponent > 6) {
+    throw new Error(`sail: currency "${currency}" has no valid exponent (${exponent}).`);
   }
-}
-
-/**
- * Format an integer minor-unit amount using the currency's exponent reported
- * by Intl (JPY 0, USD 2, BHD 3, ...). No hardcoded /100 assumption.
- */
-export function formatMinorCurrency(minor: number, currency: string): string {
   const code = currency.trim().toUpperCase();
-  try {
-    const formatter = new Intl.NumberFormat(undefined, { style: 'currency', currency: code });
-    const exponent = formatter.resolvedOptions().maximumFractionDigits ?? 2;
-    return formatter.format(minor / 10 ** exponent);
-  } catch {
-    return `${minor} ${code}`;
-  }
+  if (!code) throw new Error('sail: currency is required.');
+  return new Intl.NumberFormat(undefined, {
+    style: 'currency', currency: code, minimumFractionDigits: exponent, maximumFractionDigits: exponent,
+  }).format(minor / 10 ** exponent);
 }
 
 /** PERIOD_TYPE code vocabulary — the single source for cycle labels/durations. */
@@ -38,19 +26,15 @@ export const PERIOD_TYPE_INFO: Record<string, { label: string; noun: string; suf
 };
 
 /**
- * "From" price teaser for a plan card / dropdown — the cheapest offer once
- * normalized per month (a $2 daily offer must not undercut a $30 monthly one),
- * compared within one currency, rendered with its cycle ("from $30.00/mo").
- * Returns '' when the plan has no priced offers (free/trial). The exact offer
- * is chosen later via `<sail-price-selector>`.
+ * "From" price teaser for a plan card: the cheapest offer per month within the first
+ * offer's currency, rendered with its cycle ("from $30.00/mo"); '' when nothing is priced.
  */
-export function fromPriceLabel(prices: PlanPrice[] | undefined): string {
-  const priced = (prices ?? []).filter((p) => p.amount > 0);
+export function fromPriceLabel(prices: readonly PlanPrice[] | null | undefined): string {
+  const priced = (prices ?? []).filter((p) => p.amountMinor > 0);
   if (priced.length === 0) return '';
-  const currency = priced[0].currency;
-  const comparable = priced.filter((p) => p.currency === currency);
-  const perMonth = (p: PlanPrice) => p.amount / (PERIOD_TYPE_INFO[p.billingCycle]?.months ?? 1);
+  const comparable = priced.filter((p) => p.currency === priced[0].currency);
+  const perMonth = (p: PlanPrice) => p.amountMinor / (PERIOD_TYPE_INFO[p.billingCycle]?.months ?? 1);
   const lowest = comparable.reduce((a, b) => (perMonth(b) < perMonth(a) ? b : a));
-  const formatted = formatCurrency(lowest.amount, lowest.currency) + (PERIOD_TYPE_INFO[lowest.billingCycle]?.suffix ?? '');
-  return priced.length > 1 ? `from ${formatted}` : formatted;
+  const formatted = formatMinor(lowest.amountMinor, lowest.currency, lowest.exponent) + (PERIOD_TYPE_INFO[lowest.billingCycle]?.suffix ?? '');
+  return comparable.length > 1 ? `from ${formatted}` : formatted;
 }