Feat(Fix): SSH Keys-Expiry+Log; Department+Principal Link; CA Keys mgmt;
- Fix Login nav to /profile or /
This commit is contained in:
@@ -0,0 +1,728 @@
|
||||
import { useState, useEffect, useCallback } from "react";
|
||||
import {
|
||||
Shield,
|
||||
ShieldAlert,
|
||||
Copy,
|
||||
CheckCircle,
|
||||
Loader2,
|
||||
Terminal,
|
||||
Plus,
|
||||
Trash2,
|
||||
Users,
|
||||
Lock,
|
||||
User,
|
||||
Server,
|
||||
Settings,
|
||||
AlertCircle,
|
||||
} from "lucide-react";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { Textarea } from "@/components/ui/textarea";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import {
|
||||
Card,
|
||||
CardContent,
|
||||
CardDescription,
|
||||
CardHeader,
|
||||
CardTitle,
|
||||
} from "@/components/ui/card";
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogDescription,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
} from "@/components/ui/dialog";
|
||||
import {
|
||||
AlertDialog,
|
||||
AlertDialogAction,
|
||||
AlertDialogCancel,
|
||||
AlertDialogContent,
|
||||
AlertDialogDescription,
|
||||
AlertDialogFooter,
|
||||
AlertDialogHeader,
|
||||
AlertDialogTitle,
|
||||
} from "@/components/ui/alert-dialog";
|
||||
import {
|
||||
Select,
|
||||
SelectContent,
|
||||
SelectItem,
|
||||
SelectTrigger,
|
||||
SelectValue,
|
||||
} from "@/components/ui/select";
|
||||
import { useToast } from "@/hooks/use-toast";
|
||||
import { useParams } from "react-router-dom";
|
||||
import { useCurrentOrganizationId } from "@/hooks/useCurrentOrganization";
|
||||
import { api, OrgCA, CAPermission, ApiError } from "@/lib/api";
|
||||
|
||||
function CopyButton({ text }: { text: string }) {
|
||||
const [copied, setCopied] = useState(false);
|
||||
const { toast } = useToast();
|
||||
const handleCopy = async () => {
|
||||
try {
|
||||
await navigator.clipboard.writeText(text);
|
||||
setCopied(true);
|
||||
toast({ title: "Copied to clipboard" });
|
||||
setTimeout(() => setCopied(false), 2000);
|
||||
} catch {
|
||||
toast({ variant: "destructive", title: "Copy failed" });
|
||||
}
|
||||
};
|
||||
return (
|
||||
<Button variant="ghost" size="icon" className="h-8 w-8 flex-shrink-0" onClick={handleCopy}>
|
||||
{copied ? <CheckCircle className="w-4 h-4 text-green-500" /> : <Copy className="w-4 h-4" />}
|
||||
</Button>
|
||||
);
|
||||
}
|
||||
|
||||
function formatDate(d: string | null) {
|
||||
if (!d) return "—";
|
||||
return new Date(d).toLocaleDateString(undefined, { year: "numeric", month: "short", day: "numeric" });
|
||||
}
|
||||
|
||||
// ──────────────────────────────────────────────────────────────────────────────
|
||||
|
||||
interface PermissionsCardProps {
|
||||
ca: OrgCA;
|
||||
}
|
||||
|
||||
function PermissionsCard({ ca }: PermissionsCardProps) {
|
||||
const { toast } = useToast();
|
||||
const [perms, setPerms] = useState<CAPermission[]>([]);
|
||||
const [openToAll, setOpenToAll] = useState(true);
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
const [showAdd, setShowAdd] = useState(false);
|
||||
const [addEmail, setAddEmail] = useState("");
|
||||
const [addPermission, setAddPermission] = useState<"sign" | "admin">("sign");
|
||||
const [isAdding, setIsAdding] = useState(false);
|
||||
const [addError, setAddError] = useState<string | null>(null);
|
||||
const [removingUserId, setRemovingUserId] = useState<string | null>(null);
|
||||
const [isRemoving, setIsRemoving] = useState(false);
|
||||
|
||||
const fetchPerms = useCallback(async () => {
|
||||
setIsLoading(true);
|
||||
try {
|
||||
const data = await api.ssh.listCaPermissions(ca.id);
|
||||
setPerms(data.permissions);
|
||||
setOpenToAll(data.open_to_all);
|
||||
} catch {
|
||||
// non-fatal
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
}, [ca.id]);
|
||||
|
||||
useEffect(() => { fetchPerms(); }, [fetchPerms]);
|
||||
|
||||
const handleAdd = async () => {
|
||||
setAddError(null);
|
||||
if (!addEmail.trim()) { setAddError("Email is required"); return; }
|
||||
setIsAdding(true);
|
||||
try {
|
||||
// Resolve user_id from email via org members search
|
||||
// We pass the email as user_id — the backend expects a user UUID.
|
||||
// To keep it simple, we pass the email; if the backend doesn't support
|
||||
// lookup by email, the admin must use the user UUID directly.
|
||||
await api.ssh.addCaPermission(ca.id, addEmail.trim(), addPermission);
|
||||
toast({ title: "Permission granted" });
|
||||
setShowAdd(false);
|
||||
setAddEmail("");
|
||||
fetchPerms();
|
||||
} catch (err) {
|
||||
setAddError(err instanceof ApiError ? err.message : "Failed to add permission");
|
||||
} finally {
|
||||
setIsAdding(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleRemove = async () => {
|
||||
if (!removingUserId) return;
|
||||
setIsRemoving(true);
|
||||
try {
|
||||
await api.ssh.removeCaPermission(ca.id, removingUserId);
|
||||
setPerms((prev) => prev.filter((p) => p.user_id !== removingUserId));
|
||||
toast({ title: "Permission revoked" });
|
||||
} catch (err) {
|
||||
toast({ variant: "destructive", title: "Failed to revoke permission", description: err instanceof ApiError ? err.message : "" });
|
||||
} finally {
|
||||
setIsRemoving(false);
|
||||
setRemovingUserId(null);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<div className="flex items-center justify-between">
|
||||
<div>
|
||||
<CardTitle className="text-sm flex items-center gap-2">
|
||||
<Users className="w-4 h-4" />
|
||||
Access Control
|
||||
</CardTitle>
|
||||
<CardDescription className="text-xs mt-0.5">
|
||||
{openToAll
|
||||
? "Open to all org members — add users below to restrict access"
|
||||
: "Restricted — only listed users may sign certificates"}
|
||||
</CardDescription>
|
||||
</div>
|
||||
<Button size="sm" variant="outline" onClick={() => setShowAdd(true)}>
|
||||
<Plus className="w-3 h-3 mr-1" />
|
||||
Add user
|
||||
</Button>
|
||||
</div>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
{isLoading ? (
|
||||
<div className="flex justify-center py-4"><Loader2 className="w-5 h-5 animate-spin text-muted-foreground" /></div>
|
||||
) : perms.length === 0 ? (
|
||||
<div className="text-center py-4 text-muted-foreground text-sm">
|
||||
<Lock className="w-6 h-6 mx-auto mb-2 opacity-40" />
|
||||
{openToAll ? "No restrictions — all org members can sign" : "No users granted access"}
|
||||
</div>
|
||||
) : (
|
||||
<div className="space-y-2">
|
||||
{perms.map((p) => (
|
||||
<div key={p.id} className="flex items-center justify-between p-2 border rounded-lg text-sm">
|
||||
<div>
|
||||
<p className="font-medium">{p.user_email ?? p.user_id}</p>
|
||||
<Badge variant="secondary" className="text-xs mt-0.5">{p.permission}</Badge>
|
||||
</div>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
className="h-7 w-7 text-destructive hover:text-destructive"
|
||||
onClick={() => setRemovingUserId(p.user_id)}
|
||||
>
|
||||
<Trash2 className="w-3 h-3" />
|
||||
</Button>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</CardContent>
|
||||
|
||||
{/* Add permission dialog */}
|
||||
<Dialog open={showAdd} onOpenChange={(o) => { setShowAdd(o); setAddError(null); }}>
|
||||
<DialogContent className="sm:max-w-sm">
|
||||
<DialogHeader>
|
||||
<DialogTitle>Grant CA Access</DialogTitle>
|
||||
<DialogDescription>
|
||||
Enter the user ID (UUID) to grant permission on <strong>{ca.name}</strong>.
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
<div className="space-y-3 py-2">
|
||||
{addError && <div className="p-2 rounded bg-destructive/10 text-destructive text-xs">{addError}</div>}
|
||||
<div className="space-y-1">
|
||||
<Label className="text-xs">User ID</Label>
|
||||
<Input placeholder="uuid..." value={addEmail} onChange={(e) => setAddEmail(e.target.value)} disabled={isAdding} />
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<Label className="text-xs">Permission</Label>
|
||||
<Select value={addPermission} onValueChange={(v) => setAddPermission(v as "sign" | "admin")}>
|
||||
<SelectTrigger>
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="sign">sign — can request certificates</SelectItem>
|
||||
<SelectItem value="admin">admin — can sign + manage CA</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
</div>
|
||||
<DialogFooter>
|
||||
<Button variant="outline" onClick={() => setShowAdd(false)} disabled={isAdding}>Cancel</Button>
|
||||
<Button onClick={handleAdd} disabled={isAdding || !addEmail.trim()}>
|
||||
{isAdding && <Loader2 className="w-4 h-4 mr-2 animate-spin" />}
|
||||
Grant
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
|
||||
{/* Confirm revoke */}
|
||||
<AlertDialog open={!!removingUserId} onOpenChange={() => setRemovingUserId(null)}>
|
||||
<AlertDialogContent>
|
||||
<AlertDialogHeader>
|
||||
<AlertDialogTitle>Revoke access?</AlertDialogTitle>
|
||||
<AlertDialogDescription>
|
||||
This will remove the user's permission to sign certificates with this CA.
|
||||
</AlertDialogDescription>
|
||||
</AlertDialogHeader>
|
||||
<AlertDialogFooter>
|
||||
<AlertDialogCancel disabled={isRemoving}>Cancel</AlertDialogCancel>
|
||||
<AlertDialogAction
|
||||
onClick={handleRemove}
|
||||
disabled={isRemoving}
|
||||
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
|
||||
>
|
||||
{isRemoving && <Loader2 className="w-4 h-4 mr-2 animate-spin" />}
|
||||
Revoke
|
||||
</AlertDialogAction>
|
||||
</AlertDialogFooter>
|
||||
</AlertDialogContent>
|
||||
</AlertDialog>
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
||||
// ─── CA Detail Card ───────────────────────────────────────────────────────────
|
||||
|
||||
interface CADetailCardProps {
|
||||
ca: OrgCA;
|
||||
onEdit: (ca: OrgCA) => void;
|
||||
}
|
||||
|
||||
function CADetailCard({ ca, onEdit }: CADetailCardProps) {
|
||||
const isUser = ca.ca_type === "user";
|
||||
const sshConfig = isUser
|
||||
? `# /etc/ssh/sshd_config:\nTrustedUserCAKeys /etc/ssh/trusted_user_ca_keys\n\n# Add public key:\necho '${ca.public_key.trim()}' \\\n >> /etc/ssh/trusted_user_ca_keys`
|
||||
: `# /etc/ssh/sshd_config:\nHostCertificate /etc/ssh/ssh_host_ed25519_key-cert.pub\n\n# Add to known_hosts (clients):\n@cert-authority * ${ca.public_key.trim()}`;
|
||||
|
||||
return (
|
||||
<div className="space-y-4">
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<div className="flex items-start justify-between">
|
||||
<div>
|
||||
<CardTitle className="text-base flex items-center gap-2">
|
||||
{isUser ? <User className="w-4 h-4" /> : <Server className="w-4 h-4" />}
|
||||
{ca.name}
|
||||
{ca.is_active ? (
|
||||
<Badge className="bg-green-500/10 text-green-600 border-0 text-xs">Active</Badge>
|
||||
) : (
|
||||
<Badge variant="secondary" className="text-xs">Inactive</Badge>
|
||||
)}
|
||||
</CardTitle>
|
||||
{ca.description && (
|
||||
<CardDescription className="mt-1">{ca.description}</CardDescription>
|
||||
)}
|
||||
</div>
|
||||
<Badge variant="outline" className="text-xs font-mono">{ca.key_type}</Badge>
|
||||
</div>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-4">
|
||||
{/* Stats */}
|
||||
<div className="grid grid-cols-3 gap-3 text-center">
|
||||
<div className="p-2 bg-muted rounded-lg">
|
||||
<p className="text-lg font-semibold">{ca.active_certs}</p>
|
||||
<p className="text-xs text-muted-foreground">Active certs</p>
|
||||
</div>
|
||||
<div className="p-2 bg-muted rounded-lg">
|
||||
<p className="text-lg font-semibold">{ca.total_certs}</p>
|
||||
<p className="text-xs text-muted-foreground">Total issued</p>
|
||||
</div>
|
||||
<div className="p-2 bg-muted rounded-lg">
|
||||
<p className="text-lg font-semibold">{ca.default_cert_validity_hours}h</p>
|
||||
<p className="text-xs text-muted-foreground">Default validity</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Fingerprint */}
|
||||
<div>
|
||||
<p className="text-xs text-muted-foreground mb-1">Fingerprint</p>
|
||||
<code className="text-xs font-mono bg-muted px-2 py-1 rounded break-all">{ca.fingerprint}</code>
|
||||
</div>
|
||||
|
||||
{/* Public key */}
|
||||
<div>
|
||||
<div className="flex items-center justify-between mb-1">
|
||||
<p className="text-xs text-muted-foreground">Public key</p>
|
||||
<CopyButton text={ca.public_key} />
|
||||
</div>
|
||||
<Textarea readOnly value={ca.public_key} className="font-mono text-xs min-h-[60px]" />
|
||||
</div>
|
||||
|
||||
{/* Setup instructions */}
|
||||
<div className="rounded-lg bg-muted p-3">
|
||||
<p className="text-xs font-semibold flex items-center gap-1 mb-1">
|
||||
<Terminal className="w-3 h-3" />
|
||||
{isUser ? "Add to SSH servers (sshd_config)" : "Host certificate setup"}
|
||||
</p>
|
||||
<pre className="text-xs font-mono whitespace-pre-wrap break-all">{sshConfig}</pre>
|
||||
</div>
|
||||
|
||||
<p className="text-xs text-muted-foreground">Created {formatDate(ca.created_at)}</p>
|
||||
|
||||
<div className="pt-2 border-t">
|
||||
<Button variant="outline" size="sm" onClick={() => onEdit(ca)} className="w-full">
|
||||
<Settings className="w-3 h-3 mr-2" />
|
||||
Edit Configuration
|
||||
</Button>
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
{/* Permissions — user CAs only */}
|
||||
{isUser && <PermissionsCard ca={ca} />}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// ─── CA Section (one per type) ────────────────────────────────────────────────
|
||||
|
||||
interface CASectionProps {
|
||||
caType: "user" | "host";
|
||||
ca: OrgCA | null;
|
||||
onCreateClick: (caType: "user" | "host") => void;
|
||||
onEdit: (ca: OrgCA) => void;
|
||||
}
|
||||
|
||||
function CASection({ caType, ca, onCreateClick, onEdit }: CASectionProps) {
|
||||
const isUser = caType === "user";
|
||||
const title = isUser ? "User Signing Key" : "Host Signing Key";
|
||||
const subtitle = isUser
|
||||
? "Signs SSH user certificates so users can authenticate to servers."
|
||||
: "Signs SSH host certificates so clients can verify server identity.";
|
||||
const Icon = isUser ? User : Server;
|
||||
|
||||
return (
|
||||
<div className="space-y-3">
|
||||
<div className="flex items-center gap-2">
|
||||
<Icon className="w-4 h-4 text-muted-foreground" />
|
||||
<h2 className="text-sm font-semibold">{title}</h2>
|
||||
{ca ? (
|
||||
<Badge className="bg-green-500/10 text-green-600 border-0 text-xs">Configured</Badge>
|
||||
) : (
|
||||
<Badge variant="secondary" className="text-xs flex items-center gap-1">
|
||||
<AlertCircle className="w-3 h-3" />
|
||||
Not configured
|
||||
</Badge>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{ca ? (
|
||||
<CADetailCard ca={ca} onEdit={onEdit} />
|
||||
) : (
|
||||
<Card className="border-dashed">
|
||||
<CardContent className="flex flex-col items-center py-10 text-muted-foreground">
|
||||
<ShieldAlert className="w-10 h-10 mb-3 opacity-30" />
|
||||
<p className="text-sm font-medium mb-1">No {title} configured</p>
|
||||
<p className="text-xs text-center mb-4 max-w-sm">{subtitle}</p>
|
||||
<Button onClick={() => onCreateClick(caType)} size="sm" variant="outline">
|
||||
<Plus className="w-4 h-4 mr-2" />
|
||||
Generate {title}
|
||||
</Button>
|
||||
</CardContent>
|
||||
</Card>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// ─── Main Page ────────────────────────────────────────────────────────────────
|
||||
|
||||
export default function CAsPage() {
|
||||
const params = useParams<{ orgId?: string }>();
|
||||
const { orgId: fallbackOrgId } = useCurrentOrganizationId();
|
||||
const orgId = params.orgId || fallbackOrgId;
|
||||
|
||||
const { toast } = useToast();
|
||||
const [cas, setCAs] = useState<OrgCA[]>([]);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
|
||||
// Create CA dialog
|
||||
const [isCreateOpen, setIsCreateOpen] = useState(false);
|
||||
const [createCaType, setCreateCaType] = useState<"user" | "host">("user");
|
||||
const [createForm, setCreateForm] = useState({
|
||||
name: "",
|
||||
description: "",
|
||||
key_type: "ed25519" as "ed25519" | "rsa" | "ecdsa",
|
||||
default_cert_validity_hours: 8,
|
||||
max_cert_validity_hours: 720,
|
||||
});
|
||||
const [isCreating, setIsCreating] = useState(false);
|
||||
const [createError, setCreateError] = useState<string | null>(null);
|
||||
|
||||
// Edit CA dialog
|
||||
const [editingCA, setEditingCA] = useState<OrgCA | null>(null);
|
||||
const [isEditDialogOpen, setIsEditDialogOpen] = useState(false);
|
||||
const [editFormData, setEditFormData] = useState({
|
||||
default_cert_validity_hours: 1,
|
||||
max_cert_validity_hours: 24,
|
||||
});
|
||||
const [isEditSaving, setIsEditSaving] = useState(false);
|
||||
const [editError, setEditError] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
if (!orgId) { setIsLoading(false); return; }
|
||||
(async () => {
|
||||
setIsLoading(true);
|
||||
try {
|
||||
const data = await api.organizations.getCAs(orgId);
|
||||
setCAs(data.cas);
|
||||
} catch (err) {
|
||||
if (err instanceof ApiError && err.code === 403) {
|
||||
toast({ variant: "destructive", title: "Access denied", description: "Admin or owner role required." });
|
||||
} else {
|
||||
toast({ variant: "destructive", title: "Failed to load CAs" });
|
||||
}
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
})();
|
||||
}, [orgId, toast]);
|
||||
|
||||
const userCA = cas.find((c) => c.ca_type === "user") ?? null;
|
||||
const hostCA = cas.find((c) => c.ca_type === "host") ?? null;
|
||||
|
||||
const handleOpenCreate = (caType: "user" | "host") => {
|
||||
setCreateCaType(caType);
|
||||
setCreateForm({
|
||||
name: caType === "user" ? "User CA" : "Host CA",
|
||||
description: "",
|
||||
key_type: "ed25519",
|
||||
default_cert_validity_hours: caType === "user" ? 8 : 720,
|
||||
max_cert_validity_hours: caType === "user" ? 720 : 8760,
|
||||
});
|
||||
setCreateError(null);
|
||||
setIsCreateOpen(true);
|
||||
};
|
||||
|
||||
const handleCreateCA = async () => {
|
||||
if (!orgId) return;
|
||||
if (!createForm.name.trim()) { setCreateError("Name is required"); return; }
|
||||
if (createForm.default_cert_validity_hours <= 0 || createForm.max_cert_validity_hours <= 0) {
|
||||
setCreateError("Validity hours must be greater than 0"); return;
|
||||
}
|
||||
if (createForm.default_cert_validity_hours > createForm.max_cert_validity_hours) {
|
||||
setCreateError("Default validity must be ≤ maximum validity"); return;
|
||||
}
|
||||
setIsCreating(true);
|
||||
setCreateError(null);
|
||||
try {
|
||||
const result = await api.organizations.createCA(orgId, {
|
||||
name: createForm.name.trim(),
|
||||
description: createForm.description.trim() || undefined,
|
||||
ca_type: createCaType,
|
||||
key_type: createForm.key_type,
|
||||
default_cert_validity_hours: createForm.default_cert_validity_hours,
|
||||
max_cert_validity_hours: createForm.max_cert_validity_hours,
|
||||
});
|
||||
setCAs((prev) => [...prev, result.ca]);
|
||||
setIsCreateOpen(false);
|
||||
toast({
|
||||
title: `${createCaType === "user" ? "User" : "Host"} CA created`,
|
||||
description: result.ca.name,
|
||||
});
|
||||
} catch (err) {
|
||||
if (err instanceof ApiError) {
|
||||
setCreateError(err.message);
|
||||
} else {
|
||||
setCreateError("Failed to create CA — please try again");
|
||||
}
|
||||
} finally {
|
||||
setIsCreating(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleEditCA = (ca: OrgCA) => {
|
||||
setEditingCA(ca);
|
||||
setEditFormData({
|
||||
default_cert_validity_hours: ca.default_cert_validity_hours,
|
||||
max_cert_validity_hours: ca.max_cert_validity_hours,
|
||||
});
|
||||
setEditError(null);
|
||||
setIsEditDialogOpen(true);
|
||||
};
|
||||
|
||||
const handleSaveCA = async () => {
|
||||
if (!orgId || !editingCA) return;
|
||||
if (editFormData.default_cert_validity_hours <= 0 || editFormData.max_cert_validity_hours <= 0) {
|
||||
setEditError("Validity hours must be greater than 0"); return;
|
||||
}
|
||||
if (editFormData.default_cert_validity_hours > editFormData.max_cert_validity_hours) {
|
||||
setEditError("Default validity must be less than or equal to maximum validity"); return;
|
||||
}
|
||||
setIsEditSaving(true);
|
||||
try {
|
||||
const updated = await api.organizations.updateCA(orgId, editingCA.id, editFormData);
|
||||
setCAs(cas.map((ca) => (ca.id === editingCA.id ? updated.ca : ca)));
|
||||
setIsEditDialogOpen(false);
|
||||
setEditingCA(null);
|
||||
toast({ title: "CA configuration updated" });
|
||||
} catch (err) {
|
||||
setEditError(err instanceof ApiError ? err.message : "Failed to update CA");
|
||||
} finally {
|
||||
setIsEditSaving(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="page-container">
|
||||
<div className="page-header">
|
||||
<div>
|
||||
<h1 className="page-title">Certificate Authorities</h1>
|
||||
<p className="page-description">
|
||||
Manage your organization's SSH certificate authorities and access controls
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{isLoading ? (
|
||||
<div className="flex items-center justify-center py-20">
|
||||
<Loader2 className="w-6 h-6 animate-spin text-muted-foreground" />
|
||||
</div>
|
||||
) : (
|
||||
<div className="space-y-8">
|
||||
<CASection caType="user" ca={userCA} onCreateClick={handleOpenCreate} onEdit={handleEditCA} />
|
||||
<div className="border-t" />
|
||||
<CASection caType="host" ca={hostCA} onCreateClick={handleOpenCreate} onEdit={handleEditCA} />
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* ── Edit CA Dialog ── */}
|
||||
<Dialog open={isEditDialogOpen} onOpenChange={(open) => { setIsEditDialogOpen(open); if (!open) setEditError(null); }}>
|
||||
<DialogContent className="sm:max-w-md">
|
||||
<DialogHeader>
|
||||
<DialogTitle>Edit CA Configuration</DialogTitle>
|
||||
<DialogDescription>
|
||||
Update certificate validity settings for <strong>{editingCA?.name}</strong>
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
<div className="space-y-4 py-4">
|
||||
{editError && (
|
||||
<div className="p-3 rounded-lg bg-destructive/10 text-destructive text-sm flex items-start gap-2">
|
||||
<AlertCircle className="w-4 h-4 mt-0.5 flex-shrink-0" />
|
||||
{editError}
|
||||
</div>
|
||||
)}
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="default-validity">Default Certificate Validity (hours)</Label>
|
||||
<Input
|
||||
id="default-validity"
|
||||
type="number"
|
||||
min="1"
|
||||
value={editFormData.default_cert_validity_hours}
|
||||
onChange={(e) => setEditFormData({ ...editFormData, default_cert_validity_hours: parseInt(e.target.value) || 1 })}
|
||||
disabled={isEditSaving}
|
||||
/>
|
||||
<p className="text-xs text-muted-foreground">Default validity period when issuing new certificates</p>
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="max-validity">Maximum Certificate Validity (hours)</Label>
|
||||
<Input
|
||||
id="max-validity"
|
||||
type="number"
|
||||
min="1"
|
||||
value={editFormData.max_cert_validity_hours}
|
||||
onChange={(e) => setEditFormData({ ...editFormData, max_cert_validity_hours: parseInt(e.target.value) || 1 })}
|
||||
disabled={isEditSaving}
|
||||
/>
|
||||
<p className="text-xs text-muted-foreground">Maximum allowed validity period for any certificate from this CA</p>
|
||||
</div>
|
||||
</div>
|
||||
<DialogFooter>
|
||||
<Button variant="outline" onClick={() => setIsEditDialogOpen(false)} disabled={isEditSaving}>Cancel</Button>
|
||||
<Button onClick={handleSaveCA} disabled={isEditSaving}>
|
||||
{isEditSaving && <Loader2 className="w-4 h-4 mr-2 animate-spin" />}
|
||||
Save Changes
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
|
||||
{/* ── Create CA Dialog ── */}
|
||||
<Dialog open={isCreateOpen} onOpenChange={(open) => { setIsCreateOpen(open); if (!open) setCreateError(null); }}>
|
||||
<DialogContent className="sm:max-w-md">
|
||||
<DialogHeader>
|
||||
<DialogTitle className="flex items-center gap-2">
|
||||
{createCaType === "user" ? <User className="w-5 h-5" /> : <Server className="w-5 h-5" />}
|
||||
Generate {createCaType === "user" ? "User" : "Host"} Signing Key
|
||||
</DialogTitle>
|
||||
<DialogDescription>
|
||||
{createCaType === "user"
|
||||
? "Creates a key pair for signing SSH user certificates. The private key is stored securely and never exposed."
|
||||
: "Creates a key pair for signing SSH host certificates, allowing clients to verify server identity."}
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
|
||||
<div className="space-y-4 py-4">
|
||||
{createError && (
|
||||
<div className="p-3 rounded-lg bg-destructive/10 text-destructive text-sm flex items-start gap-2">
|
||||
<AlertCircle className="w-4 h-4 mt-0.5 flex-shrink-0" />
|
||||
<span>{createError}</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="ca-name">Name <span className="text-destructive">*</span></Label>
|
||||
<Input
|
||||
id="ca-name"
|
||||
placeholder={createCaType === "user" ? "User CA" : "Host CA"}
|
||||
value={createForm.name}
|
||||
onChange={(e) => setCreateForm({ ...createForm, name: e.target.value })}
|
||||
disabled={isCreating}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="ca-description">Description</Label>
|
||||
<Input
|
||||
id="ca-description"
|
||||
placeholder="Optional description"
|
||||
value={createForm.description}
|
||||
onChange={(e) => setCreateForm({ ...createForm, description: e.target.value })}
|
||||
disabled={isCreating}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="ca-key-type">Key Algorithm</Label>
|
||||
<Select
|
||||
value={createForm.key_type}
|
||||
onValueChange={(v) => setCreateForm({ ...createForm, key_type: v as "ed25519" | "rsa" | "ecdsa" })}
|
||||
disabled={isCreating}
|
||||
>
|
||||
<SelectTrigger id="ca-key-type"><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="ed25519">Ed25519 (recommended)</SelectItem>
|
||||
<SelectItem value="ecdsa">ECDSA (P-521)</SelectItem>
|
||||
<SelectItem value="rsa">RSA-4096</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="ca-default-validity">Default validity (hours)</Label>
|
||||
<Input
|
||||
id="ca-default-validity"
|
||||
type="number"
|
||||
min="1"
|
||||
value={createForm.default_cert_validity_hours}
|
||||
onChange={(e) => setCreateForm({ ...createForm, default_cert_validity_hours: parseInt(e.target.value) || 1 })}
|
||||
disabled={isCreating}
|
||||
/>
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="ca-max-validity">Max validity (hours)</Label>
|
||||
<Input
|
||||
id="ca-max-validity"
|
||||
type="number"
|
||||
min="1"
|
||||
value={createForm.max_cert_validity_hours}
|
||||
onChange={(e) => setCreateForm({ ...createForm, max_cert_validity_hours: parseInt(e.target.value) || 1 })}
|
||||
disabled={isCreating}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<DialogFooter>
|
||||
<Button variant="outline" onClick={() => setIsCreateOpen(false)} disabled={isCreating}>Cancel</Button>
|
||||
<Button onClick={handleCreateCA} disabled={isCreating}>
|
||||
{isCreating ? (
|
||||
<><Loader2 className="w-4 h-4 mr-2 animate-spin" />Generating key…</>
|
||||
) : (
|
||||
<><Shield className="w-4 h-4 mr-2" />Generate Key</>
|
||||
)}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
import { useState, useEffect } from "react";
|
||||
import { Search, Plus, MoreHorizontal, Users, Loader2, Trash2, Edit2 } from "lucide-react";
|
||||
import { useState, useEffect, useCallback } from "react";
|
||||
import { Search, Plus, MoreHorizontal, Users, Loader2, Trash2, Edit2, X } from "lucide-react";
|
||||
import { useParams } from "react-router-dom";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Card, CardContent } from "@/components/ui/card";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import {
|
||||
DropdownMenu,
|
||||
DropdownMenuContent,
|
||||
@@ -22,16 +21,20 @@ import {
|
||||
} from "@/components/ui/dialog";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { Textarea } from "@/components/ui/textarea";
|
||||
import { api, Department } from "@/lib/api";
|
||||
import { api, Department, Principal } from "@/lib/api";
|
||||
import { useCurrentOrganizationId } from "@/hooks/useCurrentOrganization";
|
||||
import { useToast } from "@/hooks/use-toast";
|
||||
|
||||
export default function DepartmentsPage() {
|
||||
const params = useParams<{ orgId?: string }>();
|
||||
const { orgId: fallbackOrgId } = useCurrentOrganizationId();
|
||||
const orgId = params.orgId || fallbackOrgId;
|
||||
const { toast } = useToast();
|
||||
|
||||
const [search, setSearch] = useState("");
|
||||
const [departments, setDepartments] = useState<Department[]>([]);
|
||||
const [linkedPrincipals, setLinkedPrincipals] = useState<Record<string, Principal[]>>({});
|
||||
const [unlinkingKey, setUnlinkingKey] = useState<string | null>(null);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false);
|
||||
@@ -39,34 +42,69 @@ export default function DepartmentsPage() {
|
||||
const [editingDept, setEditingDept] = useState<Department | null>(null);
|
||||
const [formData, setFormData] = useState({ name: "", description: "" });
|
||||
|
||||
const fetchDepartments = async (currentOrgId: string) => {
|
||||
const fetchLinkedPrincipals = useCallback(async (currentOrgId: string, deptList: Department[]) => {
|
||||
if (!deptList.length) return;
|
||||
const results = await Promise.allSettled(
|
||||
deptList.map((dept) =>
|
||||
api.organizations.getDepartmentPrincipals(currentOrgId, dept.id)
|
||||
)
|
||||
);
|
||||
const map: Record<string, Principal[]> = {};
|
||||
deptList.forEach((dept, i) => {
|
||||
const result = results[i];
|
||||
map[dept.id] = result.status === "fulfilled" ? result.value.principals || [] : [];
|
||||
});
|
||||
setLinkedPrincipals(map);
|
||||
}, []);
|
||||
|
||||
const fetchDepartments = useCallback(async (currentOrgId: string) => {
|
||||
try {
|
||||
setIsLoading(true);
|
||||
setError(null);
|
||||
const response = await api.organizations.getDepartments(currentOrgId);
|
||||
setDepartments(response.departments || []);
|
||||
const deptList = response.departments || [];
|
||||
setDepartments(deptList);
|
||||
await fetchLinkedPrincipals(currentOrgId, deptList);
|
||||
} catch (err) {
|
||||
console.error("Failed to fetch departments:", err);
|
||||
setError("Failed to load departments. Please try again.");
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
}, [fetchLinkedPrincipals]);
|
||||
|
||||
useEffect(() => {
|
||||
setError(null);
|
||||
setDepartments([]);
|
||||
setLinkedPrincipals({});
|
||||
if (!orgId) {
|
||||
setIsLoading(false);
|
||||
return;
|
||||
}
|
||||
fetchDepartments(orgId);
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [orgId]);
|
||||
}, [orgId, fetchDepartments]);
|
||||
|
||||
const handleUnlink = async (deptId: string, principalId: string) => {
|
||||
if (!orgId) return;
|
||||
const key = `${deptId}:${principalId}`;
|
||||
setUnlinkingKey(key);
|
||||
try {
|
||||
await api.organizations.unlinkPrincipalFromDepartment(orgId, principalId, deptId);
|
||||
setLinkedPrincipals((prev) => ({
|
||||
...prev,
|
||||
[deptId]: (prev[deptId] || []).filter((p) => p.id !== principalId),
|
||||
}));
|
||||
toast({ title: "Unlinked", description: "Principal removed from department." });
|
||||
} catch (err) {
|
||||
console.error("Failed to unlink:", err);
|
||||
toast({ title: "Error", description: "Failed to unlink principal.", variant: "destructive" });
|
||||
} finally {
|
||||
setUnlinkingKey(null);
|
||||
}
|
||||
};
|
||||
|
||||
const handleCreateDepartment = async () => {
|
||||
if (!orgId || !formData.name.trim()) return;
|
||||
|
||||
try {
|
||||
await api.organizations.createDepartment(
|
||||
orgId,
|
||||
@@ -84,16 +122,11 @@ export default function DepartmentsPage() {
|
||||
|
||||
const handleUpdateDepartment = async () => {
|
||||
if (!orgId || !editingDept || !formData.name.trim()) return;
|
||||
|
||||
try {
|
||||
await api.organizations.updateDepartment(
|
||||
orgId,
|
||||
editingDept.id,
|
||||
{
|
||||
name: formData.name,
|
||||
description: formData.description || undefined,
|
||||
}
|
||||
);
|
||||
await api.organizations.updateDepartment(orgId, editingDept.id, {
|
||||
name: formData.name,
|
||||
description: formData.description || undefined,
|
||||
});
|
||||
setFormData({ name: "", description: "" });
|
||||
setEditingDept(null);
|
||||
setIsEditDialogOpen(false);
|
||||
@@ -106,7 +139,6 @@ export default function DepartmentsPage() {
|
||||
|
||||
const handleDeleteDepartment = async (deptId: string) => {
|
||||
if (!orgId || !confirm("Are you sure you want to delete this department?")) return;
|
||||
|
||||
try {
|
||||
await api.organizations.deleteDepartment(orgId, deptId);
|
||||
await fetchDepartments(orgId);
|
||||
@@ -174,49 +206,85 @@ export default function DepartmentsPage() {
|
||||
</div>
|
||||
) : (
|
||||
<div className="divide-y">
|
||||
{filteredDepartments.map((dept) => (
|
||||
<div key={dept.id} className="p-4 flex items-start gap-4">
|
||||
<div className="w-10 h-10 rounded-lg bg-accent/10 text-accent flex items-center justify-center flex-shrink-0">
|
||||
<Users className="w-4 h-4" />
|
||||
</div>
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="flex items-center gap-2">
|
||||
<p className="font-medium text-foreground">
|
||||
{dept.name}
|
||||
</p>
|
||||
{filteredDepartments.map((dept) => {
|
||||
const principals = linkedPrincipals[dept.id] || [];
|
||||
return (
|
||||
<div key={dept.id} className="p-4 flex items-start gap-4">
|
||||
<div className="w-10 h-10 rounded-lg bg-accent/10 text-accent flex items-center justify-center flex-shrink-0">
|
||||
<Users className="w-4 h-4" />
|
||||
</div>
|
||||
{dept.description && (
|
||||
<p className="mt-1 text-sm text-muted-foreground">
|
||||
{dept.description}
|
||||
</p>
|
||||
)}
|
||||
<div className="mt-2 text-xs text-muted-foreground">
|
||||
Created {new Date(dept.created_at).toLocaleDateString()}
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="flex items-center gap-2">
|
||||
<p className="font-medium text-foreground">
|
||||
{dept.name}
|
||||
</p>
|
||||
</div>
|
||||
{dept.description && (
|
||||
<p className="mt-1 text-sm text-muted-foreground">
|
||||
{dept.description}
|
||||
</p>
|
||||
)}
|
||||
{/* Linked principals */}
|
||||
<div className="mt-2 flex flex-wrap gap-1">
|
||||
{principals.length === 0 ? (
|
||||
<span className="text-xs text-muted-foreground italic">
|
||||
Not linked to any principal
|
||||
</span>
|
||||
) : (
|
||||
principals.map((principal) => {
|
||||
const key = `${dept.id}:${principal.id}`;
|
||||
const busy = unlinkingKey === key;
|
||||
return (
|
||||
<span
|
||||
key={principal.id}
|
||||
className="inline-flex items-center gap-1 px-2 py-0.5 rounded-full text-xs font-medium bg-purple-100 text-purple-700 dark:bg-purple-900 dark:text-purple-300"
|
||||
>
|
||||
{principal.name}
|
||||
<button
|
||||
onClick={() => handleUnlink(dept.id, principal.id)}
|
||||
disabled={busy}
|
||||
className="ml-0.5 rounded-full hover:bg-purple-200 dark:hover:bg-purple-800 disabled:opacity-50 p-0.5"
|
||||
aria-label={`Unlink ${principal.name}`}
|
||||
>
|
||||
{busy ? (
|
||||
<Loader2 className="w-3 h-3 animate-spin" />
|
||||
) : (
|
||||
<X className="w-3 h-3" />
|
||||
)}
|
||||
</button>
|
||||
</span>
|
||||
);
|
||||
})
|
||||
)}
|
||||
</div>
|
||||
<div className="mt-2 text-xs text-muted-foreground">
|
||||
Created {new Date(dept.created_at).toLocaleDateString()}
|
||||
</div>
|
||||
</div>
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<Button variant="ghost" size="icon">
|
||||
<MoreHorizontal className="w-4 h-4" />
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent align="end">
|
||||
<DropdownMenuItem onClick={() => openEditDialog(dept)}>
|
||||
<Edit2 className="w-4 h-4 mr-2" />
|
||||
Edit
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem
|
||||
className="text-destructive"
|
||||
onClick={() => handleDeleteDepartment(dept.id)}
|
||||
>
|
||||
<Trash2 className="w-4 h-4 mr-2" />
|
||||
Delete
|
||||
</DropdownMenuItem>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
</div>
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<Button variant="ghost" size="icon">
|
||||
<MoreHorizontal className="w-4 h-4" />
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent align="end">
|
||||
<DropdownMenuItem onClick={() => openEditDialog(dept)}>
|
||||
<Edit2 className="w-4 h-4 mr-2" />
|
||||
Edit
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem
|
||||
className="text-destructive"
|
||||
onClick={() => handleDeleteDepartment(dept.id)}
|
||||
>
|
||||
<Trash2 className="w-4 h-4 mr-2" />
|
||||
Delete
|
||||
</DropdownMenuItem>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
</div>
|
||||
))}
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
</CardContent>
|
||||
|
||||
@@ -12,6 +12,7 @@ import { Button } from "@/components/ui/button";
|
||||
import { api, OrgPolicyResponse, UpdateOrgPolicyDto, create403Handler } from "@/lib/api";
|
||||
import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
|
||||
import { useToast } from "@/hooks/use-toast";
|
||||
import { useOrganizations } from "@/hooks/useOrganizations";
|
||||
|
||||
const MFA_MODE_LABELS: Record<string, { label: string; description: string }> = {
|
||||
disabled: {
|
||||
@@ -51,18 +52,13 @@ export default function PoliciesPage() {
|
||||
const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
|
||||
|
||||
// Fetch organizations to get current org
|
||||
const { data: orgsData, isLoading: orgsLoading } = useQuery({
|
||||
queryKey: ['organizations'],
|
||||
queryFn: () => api.users.organizations({
|
||||
on403: create403Handler(toast),
|
||||
}),
|
||||
});
|
||||
const { data: organizations, isLoading: orgsLoading } = useOrganizations();
|
||||
|
||||
useEffect(() => {
|
||||
if (orgsData?.organizations && orgsData.organizations.length > 0) {
|
||||
setCurrentOrgId(orgsData.organizations[0].id);
|
||||
if (organizations && organizations.length > 0) {
|
||||
setCurrentOrgId(organizations[0].id);
|
||||
}
|
||||
}, [orgsData]);
|
||||
}, [organizations]);
|
||||
|
||||
// Fetch org policy
|
||||
const { data: policy, isLoading: policyLoading } = useQuery({
|
||||
|
||||
+189
-153
@@ -1,5 +1,5 @@
|
||||
import { useState, useEffect } from "react";
|
||||
import { Search, Plus, MoreHorizontal, Users, Loader2, Trash2, Edit2, Link as LinkIcon, Unlink } from "lucide-react";
|
||||
import { useState, useEffect, useCallback } from "react";
|
||||
import { Search, Plus, MoreHorizontal, Users, Loader2, Trash2, Edit2, Link as LinkIcon, X } from "lucide-react";
|
||||
import { useParams } from "react-router-dom";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Input } from "@/components/ui/input";
|
||||
@@ -31,38 +31,46 @@ import { Label } from "@/components/ui/label";
|
||||
import { Textarea } from "@/components/ui/textarea";
|
||||
import { api, Principal, Department } from "@/lib/api";
|
||||
import { useCurrentOrganizationId } from "@/hooks/useCurrentOrganization";
|
||||
import { useToast } from "@/hooks/use-toast";
|
||||
|
||||
export default function PrincipalsPage() {
|
||||
const params = useParams<{ orgId?: string }>();
|
||||
const { orgId: fallbackOrgId } = useCurrentOrganizationId();
|
||||
const orgId = params.orgId || fallbackOrgId;
|
||||
const { toast } = useToast();
|
||||
|
||||
const [search, setSearch] = useState("");
|
||||
const [principals, setPrincipals] = useState<Principal[]>([]);
|
||||
const [departments, setDepartments] = useState<Department[]>([]);
|
||||
const [linkedDepts, setLinkedDepts] = useState<Record<string, Department[]>>({});
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false);
|
||||
const [isEditDialogOpen, setIsEditDialogOpen] = useState(false);
|
||||
const [isLinkDialogOpen, setIsLinkDialogOpen] = useState(false);
|
||||
const [editingPrincipal, setEditingPrincipal] = useState<Principal | null>(null);
|
||||
const [selectedPrincipalForLink, setSelectedPrincipalForLink] = useState<Principal | null>(null);
|
||||
const [selectedDepartmentId, setSelectedDepartmentId] = useState("");
|
||||
const [isLinking, setIsLinking] = useState(false);
|
||||
const [unlinkingKey, setUnlinkingKey] = useState<string | null>(null);
|
||||
const [formData, setFormData] = useState({ name: "", description: "" });
|
||||
|
||||
useEffect(() => {
|
||||
setError(null);
|
||||
setPrincipals([]);
|
||||
setDepartments([]);
|
||||
if (!orgId) {
|
||||
setIsLoading(false);
|
||||
return;
|
||||
}
|
||||
fetchData(orgId);
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [orgId]);
|
||||
const fetchLinkedDepts = useCallback(async (currentOrgId: string, principalList: Principal[]) => {
|
||||
const entries = await Promise.all(
|
||||
principalList.map(async (p) => {
|
||||
try {
|
||||
const res = await api.organizations.getPrincipalDepartments(currentOrgId, p.id);
|
||||
return [p.id, res.departments] as [string, Department[]];
|
||||
} catch {
|
||||
return [p.id, []] as [string, Department[]];
|
||||
}
|
||||
})
|
||||
);
|
||||
setLinkedDepts(Object.fromEntries(entries));
|
||||
}, []);
|
||||
|
||||
const fetchData = async (currentOrgId: string) => {
|
||||
const fetchData = useCallback(async (currentOrgId: string) => {
|
||||
try {
|
||||
setIsLoading(true);
|
||||
setError(null);
|
||||
@@ -70,84 +78,97 @@ export default function PrincipalsPage() {
|
||||
api.organizations.getPrincipals(currentOrgId),
|
||||
api.organizations.getDepartments(currentOrgId),
|
||||
]);
|
||||
setPrincipals(principalsRes.principals || []);
|
||||
const pList = principalsRes.principals || [];
|
||||
setPrincipals(pList);
|
||||
setDepartments(deptRes.departments || []);
|
||||
await fetchLinkedDepts(currentOrgId, pList);
|
||||
} catch (err) {
|
||||
console.error("Failed to fetch data:", err);
|
||||
setError("Failed to load data. Please try again.");
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
}, [fetchLinkedDepts]);
|
||||
|
||||
useEffect(() => {
|
||||
setError(null);
|
||||
setPrincipals([]);
|
||||
setDepartments([]);
|
||||
setLinkedDepts({});
|
||||
if (!orgId) { setIsLoading(false); return; }
|
||||
fetchData(orgId);
|
||||
}, [orgId, fetchData]);
|
||||
|
||||
const handleCreatePrincipal = async () => {
|
||||
if (!orgId || !formData.name.trim()) return;
|
||||
|
||||
try {
|
||||
await api.organizations.createPrincipal(
|
||||
orgId,
|
||||
formData.name,
|
||||
formData.description || undefined
|
||||
);
|
||||
await api.organizations.createPrincipal(orgId, formData.name, formData.description || undefined);
|
||||
setFormData({ name: "", description: "" });
|
||||
setIsCreateDialogOpen(false);
|
||||
await fetchData(orgId);
|
||||
} catch (err) {
|
||||
console.error("Failed to create principal:");
|
||||
setError("Failed to create principal.");
|
||||
} catch {
|
||||
toast({ variant: "destructive", title: "Failed to create principal" });
|
||||
}
|
||||
};
|
||||
|
||||
const handleUpdatePrincipal = async () => {
|
||||
if (!orgId || !editingPrincipal || !formData.name.trim()) return;
|
||||
|
||||
try {
|
||||
await api.organizations.updatePrincipal(
|
||||
orgId,
|
||||
editingPrincipal.id,
|
||||
{
|
||||
name: formData.name,
|
||||
description: formData.description || undefined,
|
||||
}
|
||||
);
|
||||
await api.organizations.updatePrincipal(orgId, editingPrincipal.id, {
|
||||
name: formData.name,
|
||||
description: formData.description || undefined,
|
||||
});
|
||||
setFormData({ name: "", description: "" });
|
||||
setEditingPrincipal(null);
|
||||
setIsEditDialogOpen(false);
|
||||
await fetchData(orgId);
|
||||
} catch (err) {
|
||||
console.error("Failed to update principal:");
|
||||
setError("Failed to update principal.");
|
||||
} catch {
|
||||
toast({ variant: "destructive", title: "Failed to update principal" });
|
||||
}
|
||||
};
|
||||
|
||||
const handleDeletePrincipal = async (principalId: string) => {
|
||||
if (!orgId || !confirm("Are you sure you want to delete this principal?")) return;
|
||||
|
||||
try {
|
||||
await api.organizations.deletePrincipal(orgId, principalId);
|
||||
await fetchData(orgId);
|
||||
} catch (err) {
|
||||
console.error("Failed to delete principal:");
|
||||
setError("Failed to delete principal.");
|
||||
} catch {
|
||||
toast({ variant: "destructive", title: "Failed to delete principal" });
|
||||
}
|
||||
};
|
||||
|
||||
const handleLinkPrincipal = async () => {
|
||||
if (!orgId || !selectedPrincipalForLink || !selectedDepartmentId) return;
|
||||
|
||||
setIsLinking(true);
|
||||
try {
|
||||
await api.organizations.linkPrincipalToDepartment(
|
||||
orgId,
|
||||
selectedPrincipalForLink.id,
|
||||
selectedDepartmentId
|
||||
);
|
||||
await api.organizations.linkPrincipalToDepartment(orgId, selectedPrincipalForLink.id, selectedDepartmentId);
|
||||
toast({ title: "Principal linked to department" });
|
||||
setSelectedPrincipalForLink(null);
|
||||
setSelectedDepartmentId("");
|
||||
setIsLinkDialogOpen(false);
|
||||
await fetchData(orgId);
|
||||
} catch (err) {
|
||||
console.error("Failed to link principal:");
|
||||
setError("Failed to link principal to department.");
|
||||
} catch {
|
||||
toast({ variant: "destructive", title: "Failed to link principal to department" });
|
||||
} finally {
|
||||
setIsLinking(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleUnlink = async (principalId: string, deptId: string) => {
|
||||
if (!orgId) return;
|
||||
const key = `${principalId}:${deptId}`;
|
||||
setUnlinkingKey(key);
|
||||
try {
|
||||
await api.organizations.unlinkPrincipalFromDepartment(orgId, principalId, deptId);
|
||||
toast({ title: "Unlinked from department" });
|
||||
setLinkedDepts((prev) => ({
|
||||
...prev,
|
||||
[principalId]: (prev[principalId] || []).filter((d) => d.id !== deptId),
|
||||
}));
|
||||
} catch {
|
||||
toast({ variant: "destructive", title: "Failed to unlink" });
|
||||
} finally {
|
||||
setUnlinkingKey(null);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -163,22 +184,22 @@ export default function PrincipalsPage() {
|
||||
setIsLinkDialogOpen(true);
|
||||
};
|
||||
|
||||
const filteredPrincipals = principals.filter((principal) => {
|
||||
const searchLower = search.toLowerCase();
|
||||
return (
|
||||
principal.name.toLowerCase().includes(searchLower) ||
|
||||
(principal.description?.toLowerCase().includes(searchLower) ?? false)
|
||||
);
|
||||
const filteredPrincipals = principals.filter((p) => {
|
||||
const s = search.toLowerCase();
|
||||
return p.name.toLowerCase().includes(s) || (p.description?.toLowerCase().includes(s) ?? false);
|
||||
});
|
||||
|
||||
// Only show departments not already linked
|
||||
const availableToLink = selectedPrincipalForLink
|
||||
? departments.filter((d) => !(linkedDepts[selectedPrincipalForLink.id] || []).some((ld) => ld.id === d.id))
|
||||
: departments;
|
||||
|
||||
return (
|
||||
<div className="page-container">
|
||||
<div className="page-header flex flex-col sm:flex-row sm:items-center sm:justify-between gap-4">
|
||||
<div>
|
||||
<h1 className="page-title">Principals</h1>
|
||||
<p className="page-description">
|
||||
Manage principals and link them to departments
|
||||
</p>
|
||||
<p className="page-description">Manage principals and link them to departments</p>
|
||||
</div>
|
||||
<Button onClick={() => { setFormData({ name: "", description: "" }); setIsCreateDialogOpen(true); }}>
|
||||
<Plus className="w-4 h-4 mr-2" />
|
||||
@@ -198,6 +219,8 @@ export default function PrincipalsPage() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{error && <div className="mb-4 p-3 rounded-md bg-destructive/10 text-destructive text-sm">{error}</div>}
|
||||
|
||||
<Card>
|
||||
<CardContent className="p-0">
|
||||
{isLoading ? (
|
||||
@@ -205,63 +228,82 @@ export default function PrincipalsPage() {
|
||||
<Loader2 className="w-6 h-6 animate-spin text-muted-foreground" />
|
||||
<span className="ml-2 text-muted-foreground">Loading principals...</span>
|
||||
</div>
|
||||
) : error ? (
|
||||
<div className="p-8 text-center text-destructive">
|
||||
{error}
|
||||
</div>
|
||||
) : filteredPrincipals.length === 0 ? (
|
||||
<div className="p-8 text-center text-muted-foreground">
|
||||
No principals found
|
||||
</div>
|
||||
<div className="p-8 text-center text-muted-foreground">No principals found</div>
|
||||
) : (
|
||||
<div className="divide-y">
|
||||
{filteredPrincipals.map((principal) => (
|
||||
<div key={principal.id} className="p-4 flex items-start gap-4">
|
||||
<div className="w-10 h-10 rounded-lg bg-purple-100 dark:bg-purple-900 text-purple-600 dark:text-purple-300 flex items-center justify-center flex-shrink-0">
|
||||
<Users className="w-4 h-4" />
|
||||
</div>
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="flex items-center gap-2">
|
||||
<p className="font-medium text-foreground">
|
||||
{principal.name}
|
||||
</p>
|
||||
{filteredPrincipals.map((principal) => {
|
||||
const linked = linkedDepts[principal.id] || [];
|
||||
return (
|
||||
<div key={principal.id} className="p-4 flex items-start gap-4">
|
||||
<div className="w-10 h-10 rounded-lg bg-purple-100 dark:bg-purple-900 text-purple-600 dark:text-purple-300 flex items-center justify-center flex-shrink-0 mt-0.5">
|
||||
<Users className="w-4 h-4" />
|
||||
</div>
|
||||
{principal.description && (
|
||||
<p className="mt-1 text-sm text-muted-foreground">
|
||||
{principal.description}
|
||||
</p>
|
||||
)}
|
||||
<div className="mt-2 text-xs text-muted-foreground">
|
||||
Created {new Date(principal.created_at).toLocaleDateString()}
|
||||
<div className="flex-1 min-w-0">
|
||||
<p className="font-medium text-foreground">{principal.name}</p>
|
||||
{principal.description && (
|
||||
<p className="mt-0.5 text-sm text-muted-foreground">{principal.description}</p>
|
||||
)}
|
||||
|
||||
{/* Linked department tags */}
|
||||
<div className="mt-2 flex flex-wrap gap-1.5">
|
||||
{linked.length === 0 ? (
|
||||
<span className="text-xs text-muted-foreground italic">Not linked to any department</span>
|
||||
) : linked.map((dept) => {
|
||||
const key = `${principal.id}:${dept.id}`;
|
||||
const busy = unlinkingKey === key;
|
||||
return (
|
||||
<span
|
||||
key={dept.id}
|
||||
className="inline-flex items-center gap-1 text-xs bg-blue-50 dark:bg-blue-950/40 text-blue-700 dark:text-blue-300 border border-blue-200 dark:border-blue-800 rounded-full pl-2.5 pr-1 py-0.5"
|
||||
>
|
||||
{dept.name}
|
||||
<button
|
||||
onClick={() => handleUnlink(principal.id, dept.id)}
|
||||
disabled={busy}
|
||||
className="rounded-full p-0.5 hover:bg-blue-200 dark:hover:bg-blue-800 disabled:opacity-50 transition-colors"
|
||||
title="Unlink from department"
|
||||
>
|
||||
{busy ? <Loader2 className="w-3 h-3 animate-spin" /> : <X className="w-3 h-3" />}
|
||||
</button>
|
||||
</span>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
<div className="mt-2 text-xs text-muted-foreground">
|
||||
Created {new Date(principal.created_at).toLocaleDateString()}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<Button variant="ghost" size="icon">
|
||||
<MoreHorizontal className="w-4 h-4" />
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent align="end">
|
||||
<DropdownMenuItem onClick={() => openEditDialog(principal)}>
|
||||
<Edit2 className="w-4 h-4 mr-2" />
|
||||
Edit
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem onClick={() => openLinkDialog(principal)}>
|
||||
<LinkIcon className="w-4 h-4 mr-2" />
|
||||
Link to Department
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem
|
||||
className="text-destructive"
|
||||
onClick={() => handleDeletePrincipal(principal.id)}
|
||||
>
|
||||
<Trash2 className="w-4 h-4 mr-2" />
|
||||
Delete
|
||||
</DropdownMenuItem>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
</div>
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<Button variant="ghost" size="icon">
|
||||
<MoreHorizontal className="w-4 h-4" />
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent align="end">
|
||||
<DropdownMenuItem onClick={() => openEditDialog(principal)}>
|
||||
<Edit2 className="w-4 h-4 mr-2" />
|
||||
Edit
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem onClick={() => openLinkDialog(principal)}>
|
||||
<LinkIcon className="w-4 h-4 mr-2" />
|
||||
Link to Department
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem
|
||||
className="text-destructive"
|
||||
onClick={() => handleDeletePrincipal(principal.id)}
|
||||
>
|
||||
<Trash2 className="w-4 h-4 mr-2" />
|
||||
Delete
|
||||
</DropdownMenuItem>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
</div>
|
||||
))}
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
</CardContent>
|
||||
@@ -272,16 +314,14 @@ export default function PrincipalsPage() {
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
<DialogTitle>Create Principal</DialogTitle>
|
||||
<DialogDescription>
|
||||
Create a new principal to manage access and permissions
|
||||
</DialogDescription>
|
||||
<DialogDescription>Create a new principal to manage access and permissions</DialogDescription>
|
||||
</DialogHeader>
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<Label htmlFor="principal-name">Principal Name</Label>
|
||||
<Input
|
||||
id="principal-name"
|
||||
placeholder="e.g., Backend Team"
|
||||
placeholder="e.g., eng-prod"
|
||||
value={formData.name}
|
||||
onChange={(e) => setFormData({ ...formData, name: e.target.value })}
|
||||
/>
|
||||
@@ -298,12 +338,8 @@ export default function PrincipalsPage() {
|
||||
</div>
|
||||
</div>
|
||||
<DialogFooter>
|
||||
<Button variant="outline" onClick={() => setIsCreateDialogOpen(false)}>
|
||||
Cancel
|
||||
</Button>
|
||||
<Button onClick={handleCreatePrincipal}>
|
||||
Create Principal
|
||||
</Button>
|
||||
<Button variant="outline" onClick={() => setIsCreateDialogOpen(false)}>Cancel</Button>
|
||||
<Button onClick={handleCreatePrincipal} disabled={!formData.name.trim()}>Create Principal</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
@@ -313,16 +349,13 @@ export default function PrincipalsPage() {
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
<DialogTitle>Edit Principal</DialogTitle>
|
||||
<DialogDescription>
|
||||
Update principal information
|
||||
</DialogDescription>
|
||||
<DialogDescription>Update principal information</DialogDescription>
|
||||
</DialogHeader>
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<Label htmlFor="edit-principal-name">Principal Name</Label>
|
||||
<Input
|
||||
id="edit-principal-name"
|
||||
placeholder="e.g., Backend Team"
|
||||
value={formData.name}
|
||||
onChange={(e) => setFormData({ ...formData, name: e.target.value })}
|
||||
/>
|
||||
@@ -339,52 +372,55 @@ export default function PrincipalsPage() {
|
||||
</div>
|
||||
</div>
|
||||
<DialogFooter>
|
||||
<Button variant="outline" onClick={() => setIsEditDialogOpen(false)}>
|
||||
Cancel
|
||||
</Button>
|
||||
<Button onClick={handleUpdatePrincipal}>
|
||||
Save Changes
|
||||
</Button>
|
||||
<Button variant="outline" onClick={() => setIsEditDialogOpen(false)}>Cancel</Button>
|
||||
<Button onClick={handleUpdatePrincipal} disabled={!formData.name.trim()}>Save Changes</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
|
||||
{/* Link Principal to Department Dialog */}
|
||||
<Dialog open={isLinkDialogOpen} onOpenChange={setIsLinkDialogOpen}>
|
||||
{/* Link to Department Dialog */}
|
||||
<Dialog
|
||||
open={isLinkDialogOpen}
|
||||
onOpenChange={(open) => {
|
||||
if (!open) { setSelectedPrincipalForLink(null); setSelectedDepartmentId(""); }
|
||||
setIsLinkDialogOpen(open);
|
||||
}}
|
||||
>
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
<DialogTitle>Link Principal to Department</DialogTitle>
|
||||
<DialogTitle>Link to Department</DialogTitle>
|
||||
<DialogDescription>
|
||||
Associate this principal with a department
|
||||
Link <strong>{selectedPrincipalForLink?.name}</strong> to a department
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<Label htmlFor="dept-select">Select Department</Label>
|
||||
<Select value={selectedDepartmentId} onValueChange={setSelectedDepartmentId}>
|
||||
<SelectTrigger id="dept-select">
|
||||
<SelectValue placeholder="Choose a department..." />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{departments.map((dept) => (
|
||||
<SelectItem key={dept.id} value={dept.id}>
|
||||
{dept.name}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<Label htmlFor="dept-select">Department</Label>
|
||||
{availableToLink.length === 0 ? (
|
||||
<p className="mt-2 text-sm text-muted-foreground">Already linked to all available departments.</p>
|
||||
) : (
|
||||
<Select value={selectedDepartmentId} onValueChange={setSelectedDepartmentId}>
|
||||
<SelectTrigger id="dept-select" className="mt-1">
|
||||
<SelectValue placeholder="Choose a department..." />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{availableToLink.map((dept) => (
|
||||
<SelectItem key={dept.id} value={dept.id}>{dept.name}</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<DialogFooter>
|
||||
<Button variant="outline" onClick={() => setIsLinkDialogOpen(false)}>
|
||||
Cancel
|
||||
</Button>
|
||||
<Button onClick={handleLinkPrincipal} disabled={!selectedDepartmentId}>
|
||||
Link Principal
|
||||
<Button variant="outline" onClick={() => setIsLinkDialogOpen(false)}>Cancel</Button>
|
||||
<Button onClick={handleLinkPrincipal} disabled={!selectedDepartmentId || isLinking || availableToLink.length === 0}>
|
||||
{isLinking && <Loader2 className="w-4 h-4 mr-2 animate-spin" />}
|
||||
Link
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user