Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eb98391f80 |
+18
-62
@@ -8,10 +8,6 @@ on:
|
||||
push:
|
||||
branches: [main]
|
||||
|
||||
env:
|
||||
COSIGN_KEY: ${{ secrets.COSIGN_KEY }}
|
||||
COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
|
||||
|
||||
jobs:
|
||||
shared:
|
||||
runs-on: docker
|
||||
@@ -112,65 +108,25 @@ jobs:
|
||||
PLAYWRIGHT_TEST_PASS: ${{ secrets.STAGE_TEST_PASS }}
|
||||
|
||||
image:
|
||||
# Builds the portal image and ships it through the same path every
|
||||
# other service in orca-infra uses: push :latest + :sha-<sha> to
|
||||
# repo.breakpilot.com, then POST a github-style payload to the
|
||||
# orca webhook so the master pulls and redeploys the portal services.
|
||||
needs: [shared, test]
|
||||
# NOTE: no hashFiles() here — at job level it evaluates BEFORE checkout
|
||||
# against an empty workspace, so the old condition was always false and
|
||||
# this job silently never ran (deployment sat on a June-10 image).
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main' && hashFiles('Dockerfile') != ''
|
||||
runs-on: docker
|
||||
# The runner's default job container has no docker CLI, so
|
||||
# docker/login-action + docker/build-push-action die with "Unable to
|
||||
# locate executable file: docker" (proven by tenant-registry run 5441).
|
||||
# Same pattern as the proven breakpilot-compliance build-push-deploy.yml:
|
||||
# run in docker:27-cli and use plain docker commands.
|
||||
container: docker:27-cli
|
||||
steps:
|
||||
- name: Checkout
|
||||
run: |
|
||||
apk add --no-cache git curl openssl
|
||||
git clone --depth 1 --branch ${GITHUB_REF_NAME} $(echo ${GITHUB_SERVER_URL} | sed -E "s#^(https?://)#\1ci:${{ secrets.GITHUB_TOKEN }}@#")/${GITHUB_REPOSITORY}.git .
|
||||
|
||||
- name: Login
|
||||
- uses: actions/checkout@v4
|
||||
- uses: docker/login-action@v3
|
||||
with:
|
||||
registry: registry.breakpilot.com
|
||||
username: ${{ secrets.REGISTRY_USER }}
|
||||
password: ${{ secrets.REGISTRY_PASS }}
|
||||
- uses: docker/build-push-action@v6
|
||||
with:
|
||||
push: true
|
||||
tags: |
|
||||
registry.breakpilot.com/${{ github.event.repository.name }}:sha-${{ github.sha }}
|
||||
registry.breakpilot.com/${{ github.event.repository.name }}:env-stage
|
||||
- uses: anchore/sbom-action@v0
|
||||
with:
|
||||
image: registry.breakpilot.com/${{ github.event.repository.name }}:sha-${{ github.sha }}
|
||||
- run: orca apply --env=stage --image-tag=sha-${{ github.sha }}
|
||||
env:
|
||||
REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
|
||||
REGISTRY_PASS: ${{ secrets.REGISTRY_PASS }}
|
||||
run: echo "$REGISTRY_PASS" | docker login repo.breakpilot.com -u "$REGISTRY_USER" --password-stdin
|
||||
|
||||
- name: Build + push
|
||||
run: |
|
||||
set -eu
|
||||
docker build \
|
||||
-t repo.breakpilot.com/breakpilot/portal:latest \
|
||||
-t repo.breakpilot.com/breakpilot/portal:sha-${GITHUB_SHA} \
|
||||
.
|
||||
docker push repo.breakpilot.com/breakpilot/portal:latest
|
||||
docker push repo.breakpilot.com/breakpilot/portal:sha-${GITHUB_SHA}
|
||||
|
||||
- name: sign image (cosign)
|
||||
run: |
|
||||
{ command -v cosign >/dev/null 2>&1 || curl -sSfLo /usr/local/bin/cosign https://github.com/sigstore/cosign/releases/download/v2.4.3/cosign-linux-amd64 || wget -qO /usr/local/bin/cosign https://github.com/sigstore/cosign/releases/download/v2.4.3/cosign-linux-amd64; } || echo "::warning::cosign fetch failed"
|
||||
chmod +x /usr/local/bin/cosign 2>/dev/null || true
|
||||
cosign sign --yes --key env://COSIGN_KEY repo.breakpilot.com/breakpilot/portal:latest || echo "::warning::cosign failed"
|
||||
|
||||
- name: trigger orca redeploy
|
||||
# Signs the POST with HMAC-SHA256 over the JSON body using the
|
||||
# secret orca generated when the webhook was registered. Orca's
|
||||
# endpoint is publicly reachable on the master, so the signature
|
||||
# gates who can fire a deploy. Plain http like the proven
|
||||
# compliance trigger-orca job (the endpoint does not serve TLS).
|
||||
env:
|
||||
ORCA_WEBHOOK_SECRET: ${{ secrets.ORCA_WEBHOOK_SECRET }}
|
||||
run: |
|
||||
set -eu
|
||||
BODY='{"repository":{"full_name":"platform/portal"},"ref":"refs/heads/main"}'
|
||||
SIG="sha256=$(printf '%s' "$BODY" | openssl dgst -sha256 -hmac "$ORCA_WEBHOOK_SECRET" -hex | awk '{print $NF}')"
|
||||
curl -ksSf -X POST \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "X-GitHub-Event: push" \
|
||||
-H "X-Hub-Signature-256: $SIG" \
|
||||
-d "$BODY" \
|
||||
http://46.225.100.82:6880/api/v1/webhooks/github
|
||||
ORCA_TOKEN: ${{ secrets.ORCA_STAGE_TOKEN }}
|
||||
|
||||
@@ -22,7 +22,7 @@ jobs:
|
||||
|
||||
- name: verify stage soak (>= 24h on this image)
|
||||
run: |
|
||||
IMG=repo.breakpilot.com/breakpilot/${{ github.event.repository.name }}:env-stage
|
||||
IMG=registry.breakpilot.com/${{ github.event.repository.name }}:env-stage
|
||||
SOAK_SECONDS=$(orca image-age --env=stage --image $IMG)
|
||||
if [ "$SOAK_SECONDS" -lt 86400 ]; then
|
||||
echo "Stage soak only $SOAK_SECONDS s, < 24h. Aborting."
|
||||
@@ -34,12 +34,12 @@ jobs:
|
||||
- name: re-tag image as semver + env-prod
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: repo.breakpilot.com
|
||||
registry: registry.breakpilot.com
|
||||
username: ${{ secrets.REGISTRY_USER }}
|
||||
password: ${{ secrets.REGISTRY_PASS }}
|
||||
|
||||
- run: |
|
||||
IMG=repo.breakpilot.com/breakpilot/${{ github.event.repository.name }}
|
||||
IMG=registry.breakpilot.com/${{ github.event.repository.name }}
|
||||
docker pull $IMG:env-stage
|
||||
docker tag $IMG:env-stage $IMG:v${{ steps.v.outputs.version }}
|
||||
docker tag $IMG:env-stage $IMG:env-prod
|
||||
@@ -67,7 +67,7 @@ jobs:
|
||||
curl -X POST -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$(jq -Rs '{tag_name:"v${{ steps.v.outputs.version }}", name:"v${{ steps.v.outputs.version }}", body:.}' < RELEASE_NOTES.md)" \
|
||||
https://git.breakpilot.com/api/v1/repos/${{ github.repository }}/releases
|
||||
https://gitea.meghsakha.com/api/v1/repos/${{ github.repository }}/releases
|
||||
|
||||
rollback-on-failure:
|
||||
needs: promote
|
||||
|
||||
+3
-12
@@ -23,8 +23,8 @@
|
||||
"clsx": "^2.1.1",
|
||||
"geist": "^1.7.2",
|
||||
"lucide-react": "^1.17.0",
|
||||
"next": "16.2.11",
|
||||
"next-auth": "5.0.0-beta.32",
|
||||
"next": "16.2.6",
|
||||
"next-auth": "5.0.0-beta.25",
|
||||
"react": "19.0.0",
|
||||
"react-dom": "19.0.0",
|
||||
"tailwind-merge": "^3.6.0"
|
||||
@@ -48,14 +48,5 @@
|
||||
"workerDirectory": [
|
||||
"public"
|
||||
]
|
||||
},
|
||||
"pnpm": {
|
||||
"overrides": {
|
||||
"nanoid@<3.3.18": ">=3.3.18",
|
||||
"postcss@<8.5.18": ">=8.5.18",
|
||||
"@auth/core@<0.41.3": ">=0.41.3",
|
||||
"sharp@<0.35.0": ">=0.35.0",
|
||||
"browserslist@<4.28.7": ">=4.28.7"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Generated
+304
-339
File diff suppressed because it is too large
Load Diff
@@ -107,22 +107,13 @@ export default async function ProductsPage({
|
||||
title="Findings across products"
|
||||
tail={
|
||||
<span className="row" style={{ gap: 6 }}>
|
||||
{/* Derived from the tenant's own products, not a hard-coded list —
|
||||
a hard-coded id (e.g. "compliance-scanner") silently filters to
|
||||
nothing when the registry calls the product something else. */}
|
||||
<Link
|
||||
href={`/${slug}/products`}
|
||||
className={"btn btn-sm" + (productFilter === "all" ? " btn-primary" : "")}
|
||||
>
|
||||
All
|
||||
</Link>
|
||||
{t.products.map((p) => (
|
||||
{["all", "compliance-scanner", "certifai"].map((o) => (
|
||||
<Link
|
||||
key={p.id}
|
||||
href={`/${slug}/products?p=${p.slug}`}
|
||||
className={"btn btn-sm" + (productFilter === p.slug ? " btn-primary" : "")}
|
||||
key={o}
|
||||
href={o === "all" ? `/${slug}/products` : `/${slug}/products?p=${o}`}
|
||||
className={"btn btn-sm" + (productFilter === o ? " btn-primary" : "")}
|
||||
>
|
||||
{p.name}
|
||||
{o === "all" ? "All" : o === "certifai" ? "CERTifAI" : "Scanner"}
|
||||
</Link>
|
||||
))}
|
||||
</span>
|
||||
|
||||
+5
-65
@@ -10,51 +10,11 @@
|
||||
// Once the registry is enriched to carry the design fields end-to-end this
|
||||
// module collapses into a thin pass-through.
|
||||
|
||||
import { tenantBySlug, type ProductDef, type TenantRecord } from "@/lib/fixtures";
|
||||
import {
|
||||
fetchCatalog,
|
||||
fetchEntitlements,
|
||||
fetchTenantBySlug,
|
||||
type CatalogEntry,
|
||||
type Entitlement,
|
||||
type Tenant,
|
||||
} from "@/lib/tenant-registry";
|
||||
import { tenantBySlug, type TenantRecord } from "@/lib/fixtures";
|
||||
import { fetchTenantBySlug, type Tenant } from "@/lib/tenant-registry";
|
||||
|
||||
export type PortalTenant = TenantRecord;
|
||||
|
||||
/** Registry catalog entry -> the shape the product screens render.
|
||||
*
|
||||
* The registry `key` becomes both `id` and `slug`, deliberately. The screens
|
||||
* compare `entitled.includes(p.id)`, and `entitled` is built from the SAME
|
||||
* registry keys below — so the two sides cannot drift apart. Hard-coding a
|
||||
* product list here is what previously made a real entitlement (`compliance`)
|
||||
* fail to match a hand-written product id (`compliance-scanner`).
|
||||
*
|
||||
* `frameworks` is empty because the registry contract does not carry it
|
||||
* (PRODUCT_INTEGRATION_SPEC has products publish a manifest later); the UI
|
||||
* already renders an empty list without complaint.
|
||||
*/
|
||||
function productFromCatalog(entry: CatalogEntry): ProductDef {
|
||||
return {
|
||||
id: entry.key,
|
||||
slug: entry.key,
|
||||
name: entry.name,
|
||||
mono: entry.name.replace(/[^A-Za-z]/g, "").slice(0, 2).toUpperCase() || "??",
|
||||
status: "live",
|
||||
blurb: entry.description,
|
||||
frameworks: [],
|
||||
};
|
||||
}
|
||||
|
||||
/** Entitlements the tenant may actually use right now. */
|
||||
function activeEntitlements(items: Entitlement[], nowMs: number): Entitlement[] {
|
||||
return items.filter((e) => {
|
||||
if (!e.enabled) return false;
|
||||
if (!e.expires_at) return true;
|
||||
return new Date(e.expires_at).getTime() > nowMs;
|
||||
});
|
||||
}
|
||||
|
||||
export async function loadTenantForShell(slug: string): Promise<PortalTenant | null> {
|
||||
const fx = tenantBySlug(slug);
|
||||
if (fx) return fx;
|
||||
@@ -70,26 +30,6 @@ export async function loadTenantForShell(slug: string): Promise<PortalTenant | n
|
||||
}
|
||||
if (!live) return null;
|
||||
|
||||
// Entitlements and catalog are what make a started trial actually show as
|
||||
// entitled. Both are best-effort: the shell must still render if the
|
||||
// registry answers the tenant but not these, so a failure degrades to an
|
||||
// empty product grid rather than a 404 on the whole page.
|
||||
const now = Date.now();
|
||||
const [catalog, entitlements] = await Promise.all([
|
||||
fetchCatalog().catch(() => [] as CatalogEntry[]),
|
||||
fetchEntitlements(live.id).catch(() => [] as Entitlement[]),
|
||||
]);
|
||||
const active = activeEntitlements(entitlements, now);
|
||||
const entitled = active.map((e) => e.product);
|
||||
const trialing = active
|
||||
.filter((e) => Boolean(e.expires_at))
|
||||
.map((e) => e.product);
|
||||
// Show the catalog, with the entitled ones first so the grid leads with what
|
||||
// the tenant can actually open.
|
||||
const products = catalog
|
||||
.map(productFromCatalog)
|
||||
.sort((a, b) => Number(entitled.includes(b.id)) - Number(entitled.includes(a.id)));
|
||||
|
||||
// Minimal shim so the shell can render. Design-rich fields fall back to
|
||||
// placeholders that won't blow up the layout.
|
||||
return {
|
||||
@@ -111,12 +51,12 @@ export async function loadTenantForShell(slug: string): Promise<PortalTenant | n
|
||||
contactEmail: "—",
|
||||
renewal: "—",
|
||||
since: live.created_at?.slice(0, 10) ?? "—",
|
||||
entitled,
|
||||
trialing,
|
||||
entitled: [],
|
||||
trialing: [],
|
||||
trialEnds: live.trial_ends_at ?? undefined,
|
||||
seed: 0,
|
||||
findingCount: 0,
|
||||
products,
|
||||
products: [],
|
||||
findings: [],
|
||||
activity: [],
|
||||
audit: [],
|
||||
|
||||
@@ -1,168 +0,0 @@
|
||||
import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
|
||||
|
||||
import {
|
||||
resetServiceTokenCache,
|
||||
serviceAuthHeader,
|
||||
serviceToken,
|
||||
} from "./service-token";
|
||||
|
||||
const ISSUER = "https://auth.breakpilot.com/realms/breakpilot-dev";
|
||||
|
||||
function tokenResponse(value: string, expiresIn = 300) {
|
||||
return {
|
||||
ok: true,
|
||||
status: 200,
|
||||
json: async () => ({ access_token: value, expires_in: expiresIn }),
|
||||
} as Response;
|
||||
}
|
||||
|
||||
function configure() {
|
||||
process.env.KEYCLOAK_ISSUER = ISSUER;
|
||||
process.env.PORTAL_SVC_CLIENT_ID = "portal-svc";
|
||||
process.env.PORTAL_SVC_CLIENT_SECRET = "shh";
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
resetServiceTokenCache();
|
||||
delete process.env.PORTAL_SVC_CLIENT_ID;
|
||||
delete process.env.PORTAL_SVC_CLIENT_SECRET;
|
||||
delete process.env.KEYCLOAK_ISSUER;
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
vi.restoreAllMocks();
|
||||
vi.useRealTimers();
|
||||
});
|
||||
|
||||
describe("serviceToken", () => {
|
||||
test("returns null and makes no request when unconfigured", async () => {
|
||||
const fetchSpy = vi.spyOn(globalThis, "fetch");
|
||||
expect(await serviceToken()).toBeNull();
|
||||
expect(await serviceAuthHeader()).toEqual({});
|
||||
expect(fetchSpy).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
test("requests a client_credentials token against the realm", async () => {
|
||||
configure();
|
||||
const fetchSpy = vi
|
||||
.spyOn(globalThis, "fetch")
|
||||
.mockResolvedValue(tokenResponse("tok-1"));
|
||||
|
||||
expect(await serviceToken()).toBe("tok-1");
|
||||
|
||||
const [url, init] = fetchSpy.mock.calls[0] as [string, RequestInit];
|
||||
expect(url).toBe(`${ISSUER}/protocol/openid-connect/token`);
|
||||
expect(init.method).toBe("POST");
|
||||
const body = new URLSearchParams(init.body as string);
|
||||
expect(body.get("grant_type")).toBe("client_credentials");
|
||||
expect(body.get("client_id")).toBe("portal-svc");
|
||||
expect(body.get("client_secret")).toBe("shh");
|
||||
});
|
||||
|
||||
test("caches the token across calls", async () => {
|
||||
configure();
|
||||
const fetchSpy = vi
|
||||
.spyOn(globalThis, "fetch")
|
||||
.mockResolvedValue(tokenResponse("tok-1"));
|
||||
|
||||
await serviceToken();
|
||||
await serviceToken();
|
||||
await serviceToken();
|
||||
expect(fetchSpy).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
test("de-dupes concurrent fetches into one request", async () => {
|
||||
configure();
|
||||
const fetchSpy = vi
|
||||
.spyOn(globalThis, "fetch")
|
||||
.mockResolvedValue(tokenResponse("tok-1"));
|
||||
|
||||
const results = await Promise.all([
|
||||
serviceToken(),
|
||||
serviceToken(),
|
||||
serviceToken(),
|
||||
]);
|
||||
expect(results).toEqual(["tok-1", "tok-1", "tok-1"]);
|
||||
expect(fetchSpy).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
test("refreshes shortly before expiry", async () => {
|
||||
configure();
|
||||
vi.useFakeTimers();
|
||||
vi.setSystemTime(new Date("2026-08-25T10:00:00Z"));
|
||||
const fetchSpy = vi
|
||||
.spyOn(globalThis, "fetch")
|
||||
.mockResolvedValueOnce(tokenResponse("tok-1", 300))
|
||||
.mockResolvedValueOnce(tokenResponse("tok-2", 300));
|
||||
|
||||
expect(await serviceToken()).toBe("tok-1");
|
||||
// 4 minutes in: still inside the window
|
||||
vi.setSystemTime(new Date("2026-08-25T10:04:00Z"));
|
||||
expect(await serviceToken()).toBe("tok-1");
|
||||
// 4:40 — inside the 30s refresh margin
|
||||
vi.setSystemTime(new Date("2026-08-25T10:04:40Z"));
|
||||
expect(await serviceToken()).toBe("tok-2");
|
||||
expect(fetchSpy).toHaveBeenCalledTimes(2);
|
||||
});
|
||||
|
||||
test("surfaces a rejected token request instead of calling unauthenticated", async () => {
|
||||
configure();
|
||||
// no json() on the mock: fetchToken throws on !ok before reading the body
|
||||
vi.spyOn(globalThis, "fetch").mockResolvedValue({
|
||||
ok: false,
|
||||
status: 401,
|
||||
} as Response);
|
||||
|
||||
await expect(serviceToken()).rejects.toThrow("service token request failed: 401");
|
||||
});
|
||||
|
||||
test("surfaces a malformed token response", async () => {
|
||||
configure();
|
||||
vi.spyOn(globalThis, "fetch").mockResolvedValue({
|
||||
ok: true,
|
||||
status: 200,
|
||||
json: async () => ({}),
|
||||
} as Response);
|
||||
|
||||
await expect(serviceToken()).rejects.toThrow("no access_token");
|
||||
});
|
||||
|
||||
test("a failed fetch does not poison the cache", async () => {
|
||||
configure();
|
||||
vi.spyOn(globalThis, "fetch")
|
||||
.mockResolvedValueOnce({ ok: false, status: 503 } as Response)
|
||||
.mockResolvedValueOnce(tokenResponse("tok-ok"));
|
||||
|
||||
await expect(serviceToken()).rejects.toThrow();
|
||||
expect(await serviceToken()).toBe("tok-ok");
|
||||
});
|
||||
|
||||
test("a response without expires_in gets the 300s default lifetime", async () => {
|
||||
configure();
|
||||
vi.useFakeTimers();
|
||||
vi.setSystemTime(new Date("2026-08-30T10:00:00Z"));
|
||||
const fetchSpy = vi
|
||||
.spyOn(globalThis, "fetch")
|
||||
.mockResolvedValueOnce({
|
||||
ok: true,
|
||||
status: 200,
|
||||
json: async () => ({ access_token: "tok-default" }),
|
||||
} as Response)
|
||||
.mockResolvedValueOnce(tokenResponse("tok-next"));
|
||||
|
||||
expect(await serviceToken()).toBe("tok-default");
|
||||
// 4 minutes in: still inside the defaulted 300s window
|
||||
vi.setSystemTime(new Date("2026-08-30T10:04:00Z"));
|
||||
expect(await serviceToken()).toBe("tok-default");
|
||||
// past the default expiry
|
||||
vi.setSystemTime(new Date("2026-08-30T10:05:01Z"));
|
||||
expect(await serviceToken()).toBe("tok-next");
|
||||
expect(fetchSpy).toHaveBeenCalledTimes(2);
|
||||
});
|
||||
|
||||
test("serviceAuthHeader carries the bearer token when configured", async () => {
|
||||
configure();
|
||||
vi.spyOn(globalThis, "fetch").mockResolvedValue(tokenResponse("tok-1"));
|
||||
expect(await serviceAuthHeader()).toEqual({ authorization: "Bearer tok-1" });
|
||||
});
|
||||
});
|
||||
@@ -1,96 +0,0 @@
|
||||
// Client-credentials service token for portal → tenant-registry calls.
|
||||
//
|
||||
// tenant-registry's API is INTERNAL_SERVICE_ONLY: once its AUTH_ENABLED
|
||||
// flips, every route except /healthz and /readyz needs a Keycloak token
|
||||
// whose audience contains `tenant-registry`. The portal is a service
|
||||
// principal here — this is machine-to-machine, unrelated to the visitor's
|
||||
// SSO session (that one authenticates a human against `dev-portal`).
|
||||
//
|
||||
// Inert until configured: with no PORTAL_SVC_CLIENT_ID / _SECRET the
|
||||
// helper returns null and callers send no Authorization header, which is
|
||||
// exactly today's behaviour against a tenant-registry that is not yet
|
||||
// enforcing. Configure both to switch the portal over.
|
||||
//
|
||||
// Server-only: the client secret must never reach the browser. Every
|
||||
// caller (src/lib/tenant-registry.ts) already runs server-side.
|
||||
|
||||
const REFRESH_MARGIN_SECONDS = 30;
|
||||
|
||||
type CachedToken = { value: string; expiresAt: number };
|
||||
|
||||
let cached: CachedToken | null = null;
|
||||
// de-dupes concurrent fetches: many parallel renders share one request
|
||||
let inFlight: Promise<CachedToken> | null = null;
|
||||
|
||||
function config(): { issuer: string; clientId: string; secret: string } | null {
|
||||
const clientId = process.env.PORTAL_SVC_CLIENT_ID;
|
||||
const secret = process.env.PORTAL_SVC_CLIENT_SECRET;
|
||||
const issuer = process.env.KEYCLOAK_ISSUER;
|
||||
if (!clientId || !secret || !issuer) return null;
|
||||
return { issuer, clientId, secret };
|
||||
}
|
||||
|
||||
async function fetchToken(cfg: {
|
||||
issuer: string;
|
||||
clientId: string;
|
||||
secret: string;
|
||||
}): Promise<CachedToken> {
|
||||
const res = await fetch(`${cfg.issuer}/protocol/openid-connect/token`, {
|
||||
method: "POST",
|
||||
headers: { "content-type": "application/x-www-form-urlencoded" },
|
||||
body: new URLSearchParams({
|
||||
grant_type: "client_credentials",
|
||||
client_id: cfg.clientId,
|
||||
client_secret: cfg.secret,
|
||||
}),
|
||||
cache: "no-store",
|
||||
});
|
||||
if (!res.ok) {
|
||||
throw new Error(`service token request failed: ${res.status}`);
|
||||
}
|
||||
const body = (await res.json()) as {
|
||||
access_token?: string;
|
||||
expires_in?: number;
|
||||
};
|
||||
if (!body.access_token) {
|
||||
throw new Error("service token response carried no access_token");
|
||||
}
|
||||
return {
|
||||
value: body.access_token,
|
||||
expiresAt: Date.now() / 1000 + (body.expires_in ?? 300),
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* A valid service token, or null when the portal is not configured to
|
||||
* send one. Cached in memory and refreshed shortly before expiry (realm
|
||||
* tokens live 5 minutes).
|
||||
*/
|
||||
export async function serviceToken(): Promise<string | null> {
|
||||
const cfg = config();
|
||||
if (!cfg) return null;
|
||||
|
||||
const now = Date.now() / 1000;
|
||||
if (cached && now < cached.expiresAt - REFRESH_MARGIN_SECONDS) {
|
||||
return cached.value;
|
||||
}
|
||||
if (!inFlight) {
|
||||
inFlight = fetchToken(cfg).finally(() => {
|
||||
inFlight = null;
|
||||
});
|
||||
}
|
||||
cached = await inFlight;
|
||||
return cached.value;
|
||||
}
|
||||
|
||||
/** Authorization header for an outbound call, or {} when unconfigured. */
|
||||
export async function serviceAuthHeader(): Promise<Record<string, string>> {
|
||||
const token = await serviceToken();
|
||||
return token ? { authorization: `Bearer ${token}` } : {};
|
||||
}
|
||||
|
||||
/** Test seam: drop the cached token. */
|
||||
export function resetServiceTokenCache(): void {
|
||||
cached = null;
|
||||
inFlight = null;
|
||||
}
|
||||
@@ -1,8 +1,6 @@
|
||||
// Tenant Registry client — covers everything the portal needs to call
|
||||
// from server components and server actions.
|
||||
|
||||
import { serviceAuthHeader } from "./service-token";
|
||||
|
||||
export type Tenant = {
|
||||
id: string;
|
||||
slug: string;
|
||||
@@ -76,12 +74,9 @@ async function req<T>(
|
||||
path: string,
|
||||
body?: unknown,
|
||||
): Promise<{ status: number; data: T | null }> {
|
||||
// tenant-registry is INTERNAL_SERVICE_ONLY — the portal calls it as a
|
||||
// service principal. Unconfigured ⇒ {} ⇒ unchanged, header-less calls.
|
||||
const auth = await serviceAuthHeader();
|
||||
const init: RequestInit = {
|
||||
method,
|
||||
headers: { accept: "application/json", ...auth },
|
||||
headers: { accept: "application/json" },
|
||||
cache: "no-store",
|
||||
};
|
||||
if (body !== undefined) {
|
||||
|
||||
Reference in New Issue
Block a user