Logan CusanoandClaude Opus 5
83416fe169
SAAS_PLAN.md B7. "admin" meant two different things before this: platform operator (SAAS_PLAN.md's own framing) and, by accident of how app/settings/layout.tsx was gated, the only role that could ever reach an org's own billing/members/node-ownership settings. A paying customer who is their own org's owner couldn't reach their own Settings page - the gate checked isAdmin, which only platform admins ever have. settings/layout.tsx now admits org_role === "owner" as well as platform admins (isAdmin stays valid too, for support access to any org's settings). Nav.tsx shows the Settings link on the same condition, and moves Admin (the platform-operator screens: feature flags, users, audit, correlation debug) out of the customer-facing link group entirely - it was already gated server-side, this is just the nav no longer implying it's part of the product. Trips - an internal utility feature riding along on this stack, not a tenant-scoped product surface (see [[trips-feature-intentional]]) - drops out of the customer-facing viewer link group and only shows for the founding org (new lib/tenancy.ts mirrors app/internal/tenancy.py's FOUNDING_ORG_ID) or a platform admin, matching the mutation-route gating routers/trips.py already got in the backend tenancy commit. Reads stay open to any signed-in user, same as before - trips' own visibility model (public/private per trip) predates and is unrelated to org tenancy, and restricting it further wasn't asked for. Also closes two DEFERRED.md items now that they have somewhere to write to: app/settings/organization's "Save changes" button now actually calls c2api.getOrg()/updateOrg() (routers/org.py, shipped in the backend tenancy commit) instead of being permanently disabled. app/settings/nodes gained an EnrollmentTokensPanel (mint/list/revoke against the same commit's /org/enrollment-tokens routes) - without this, B2b's whole point (a customer enrolls their own node with their own token instead of an admin-issued key) had no way to actually be used outside a raw API call. Left alone, and written up as new DEFERRED.md entries instead of guessed at: node/system *write* routes (approve, create, delete) stay platform-admin-only rather than being loosened to org owner/operator - a real gap per SAAS_PLAN.md 2.4, but a separate authorization design that the plan's 12-item build order doesn't enumerate. And settings/members + settings/nodes' ownership table both still call GET /admin/users (platform-admin-only) - a pure org owner who reaches the page via this commit's gate will get 403s from it. Today's only real user is also a platform admin, so this is invisible until a second, non-admin org owner exists. Typecheck: clean (tsc --noEmit via the WSL-native ~/drb-frontend copy). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
62 lines
2.1 KiB
TypeScript
62 lines
2.1 KiB
TypeScript
"use client";
|
|
|
|
import { useEffect } from "react";
|
|
import Link from "next/link";
|
|
import { usePathname, useRouter } from "next/navigation";
|
|
import { useAuth } from "@/components/AuthProvider";
|
|
import { PageHeader } from "@/components/ui/PageHeader";
|
|
|
|
const TABS = [
|
|
{ href: "/settings/organization", label: "Organization" },
|
|
{ href: "/settings/members", label: "Members" },
|
|
{ href: "/settings/nodes", label: "Node Ownership" },
|
|
{ href: "/settings/api-keys", label: "API Keys" },
|
|
{ href: "/settings/billing", label: "Billing" },
|
|
];
|
|
|
|
export default function SettingsLayout({ children }: { children: React.ReactNode }) {
|
|
// SAAS_PLAN.md B7: this used to gate on isAdmin (platform admin) alone,
|
|
// which meant a paying customer who is their own org's owner couldn't
|
|
// reach their own billing/members/node-ownership settings — "admin" here
|
|
// conflated "platform operator" with "org owner". isAdmin still passes
|
|
// (support/debugging access to any org's settings), but org_role ===
|
|
// "owner" is now sufficient on its own.
|
|
const { isAdmin, isOrgOwner, loading } = useAuth();
|
|
const canAccess = isAdmin || isOrgOwner;
|
|
const pathname = usePathname();
|
|
const router = useRouter();
|
|
|
|
useEffect(() => {
|
|
if (!loading && !canAccess) router.replace("/dashboard");
|
|
}, [loading, canAccess, router]);
|
|
|
|
if (loading || !canAccess) return null;
|
|
|
|
return (
|
|
<div className="space-y-6">
|
|
<PageHeader
|
|
title="Settings"
|
|
description="Organization profile, team access, node ownership, API keys, and billing."
|
|
/>
|
|
|
|
<div className="flex flex-wrap gap-1 bg-gray-900 border border-gray-800 rounded-lg p-1 w-fit max-w-full overflow-x-auto">
|
|
{TABS.map((t) => (
|
|
<Link
|
|
key={t.href}
|
|
href={t.href}
|
|
className={`text-sm font-mono px-4 py-1.5 rounded-md transition-colors whitespace-nowrap ${
|
|
pathname === t.href || pathname.startsWith(t.href + "/")
|
|
? "bg-gray-800 text-white"
|
|
: "text-gray-500 hover:text-gray-300"
|
|
}`}
|
|
>
|
|
{t.label}
|
|
</Link>
|
|
))}
|
|
</div>
|
|
|
|
{children}
|
|
</div>
|
|
);
|
|
}
|