@nauticana/sail 1.1.2 → 1.1.4

package/README.md

@@ -4,6 +4,8 @@ A shared Angular component library for building CRUD-based admin frontends. Prov
 
 > **Compatibility:** sail and keel are versioned in lock-step. The current line is **sail v1.0.x ↔ keel v1.0.x**. Earlier lines: **sail v0.5.x ↔ keel v0.5.x**, **sail v0.6.x / v0.7.x ↔ keel v0.7.x**, **sail v0.8.x ↔ keel v0.8.x**, **sail v0.9.x ↔ keel v0.9.x**. Newer sail releases extend the contract — older keel servers reject unknown endpoints with HTTP 404 / 400. The v0.8.x line additionally ships the `table_action` framework (per-table custom buttons surfaced in `TableList` / `TableSearch` / `TableEdit` / `TableDetail`); see the [Migrating to v0.7.0 §5 — TableAction](#migrating-to-v070--payout-user-payment-methods-table-actions) section for the seed shape (basis `table_action` + `authorization_object` + `authorization_object_action` rows) and the [keel/README Table Actions](https://github.com/nauticana/keel#table-actions) section for backend wiring via `handler.WrapTableAction`.
 
+**Recent additions:** `BaseAuthService.acceptToken(jwt)` — adopt an externally-minted JWT (registration / SSO-handoff flows) and run the full post-login sequence (store under the canonical `jwt` key, load appdata, init routes); apps must use this instead of writing `localStorage` directly. `BaseRestService.analytic<T>(endpoint, params?)` — GET a keel `analytic/<endpoint>` report and return its rows.
+
 ## What it provides
 
 | Category | Exports |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nauticana/sail",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Metadata-driven Angular component library for CRUD admin frontends backed by the keel Go backend. Tables, forms, navigation, OTP/2FA/social auth, billing, payout onboarding.",
   "main": "src/index.ts",
   "scripts": {

package/src/config.ts

@@ -59,6 +59,15 @@ export interface SailGuiConfig {
   defaultPolicyLanguage?: string;
   /** Route to navigate to after account deletion. Defaults to '/login/local'. */
   accountDeletedRoute?: string;
+
+  // ── OAuth authorization-flow bridge (for an OAuth AS on a different host) ──
+  /** Backend path that mirrors the bearer JWT into an HttpOnly session cookie so
+   * a cross-site OAuth `/authorize` can see the session, e.g. '/api/v1/auth/session-cookie'.
+   * When set, login POSTs here before handing off to an allowed ?return= host. */
+  sessionCookieUrl?: string;
+  /** Hostnames a post-login `?return=` may redirect to (open-redirect allowlist),
+   * e.g. ['mcp.example.com']. Anything not listed is ignored. */
+  allowedReturnHosts?: string[];
 }
 
 export const SAIL_GUI_CONFIG = new InjectionToken<SailGuiConfig>('SailGuiConfig');

package/src/service/auth.service.ts

@@ -106,14 +106,51 @@ export abstract class BaseAuthService extends BaseRestService {
     ).subscribe((data: ApplicationData) => this.appData$.next(data));
   }
 
+  /** Adopt an externally-minted JWT (registration/SSO handoff flows) and run the
+   * full post-login sequence — store under the canonical key, load appdata, init
+   * routes. Apps must use this instead of writing localStorage directly. */
+  acceptToken(token: string) {
+    this.completeLogin(token);
+  }
+
   private completeLogin(token: string) {
     this.token = token;
     this.isLoggedIn.set(true);
     localStorage.setItem('jwt', token);
+    const ret = this.validatedReturnUrl();
+    if (ret && this.guiConfig.sessionCookieUrl) {
+      // OAuth flow: mirror the bearer into a cookie, then hand off to the
+      // (cross-origin) authorization server via a full navigation.
+      this.http.post(this.url(this.guiConfig.sessionCookieUrl), {}, { withCredentials: true })
+          .pipe(take(1))
+          .subscribe({
+            next: () => window.location.assign(ret),
+            error: () => window.location.assign(ret),
+          });
+      return;
+    }
     this.loadAppData();
     this.initRoutes();
   }
 
+  /** A post-login `?return=` URL, only when its host is in allowedReturnHosts and
+   * the scheme is https (or loopback) — an open-redirect guard. '' otherwise. */
+  private validatedReturnUrl(): string {
+    const raw = new URLSearchParams(window.location.search).get('return');
+    if (!raw) return '';
+    try {
+      const u = new URL(raw, window.location.origin);
+      if (u.username || u.password) return '';   // reject userinfo ("user@host") spoofing
+      const host = u.hostname.toLowerCase();
+      const okScheme = u.protocol === 'https:' || host === 'localhost' || host === '127.0.0.1';
+      const allowed = (this.guiConfig.allowedReturnHosts ?? []).some((h) => h.toLowerCase() === host);
+      if (okScheme && allowed) {
+        return u.toString();
+      }
+    } catch { /* malformed → reject */ }
+    return '';
+  }
+
   login(username: string, password: string) {
     // withCredentials so the browser sends the server-set `keel_td` cookie
     // (keel v0.9 trusted-device secret). When it maps to a trusted row, keel

package/src/service/base_rest.service.ts

@@ -1,5 +1,6 @@
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
 import { inject } from '@angular/core';
+import { Observable } from 'rxjs';
 import { RestURL } from './rest_url';
 
 /**
@@ -17,4 +18,14 @@ export abstract class BaseRestService {
   protected url(path: string): string {
     return RestURL.httpHost + path;
   }
+
+  /** GET an analytic endpoint (`{host}{api_prefix}analytic/<endpoint>`), returning
+   * its rows. Optional flat string params become the query string. */
+  protected analytic<T>(endpoint: string, params?: Record<string, string>): Observable<T[]> {
+    let p = new HttpParams();
+    for (const k in params) {
+      if (Object.prototype.hasOwnProperty.call(params, k)) p = p.set(k, params[k]);
+    }
+    return this.http.get<T[]>(this.url(RestURL.api_prefix + 'analytic/' + endpoint), { params: p });
+  }
 }