feat: rewrite frontend auth — roles from org store, Logto org role names

Replace ID-token claim reads with org store lookups in useAuth and
usePermissions; add currentOrgRoles to useOrgStore; update role names
to Logto org role conventions (admin/member); remove username from
Layout (no longer derived from token claims).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
hsiegeln
2026-04-05 12:42:26 +02:00
parent 5f43394b00
commit ec1ec2e65f
4 changed files with 19 additions and 38 deletions

View File

@@ -1,35 +1,11 @@
import { useLogto } from '@logto/react'; import { useLogto } from '@logto/react';
import { useState, useEffect, useCallback } from 'react'; import { useCallback } from 'react';
import { useOrgStore } from './useOrganization'; import { useOrgStore } from './useOrganization';
interface IdTokenClaims {
sub?: string;
email?: string;
name?: string;
username?: string;
roles?: string[];
organization_id?: string;
[key: string]: unknown;
}
export function useAuth() { export function useAuth() {
const { isAuthenticated, isLoading, getIdTokenClaims, signOut, signIn } = useLogto(); const { isAuthenticated, isLoading, signOut, signIn } = useLogto();
const [claims, setClaims] = useState<IdTokenClaims | null>(null);
const { currentTenantId, isPlatformAdmin } = useOrgStore(); const { currentTenantId, isPlatformAdmin } = useOrgStore();
useEffect(() => {
if (isAuthenticated) {
getIdTokenClaims().then((c) => setClaims(c as IdTokenClaims));
} else {
setClaims(null);
}
}, [isAuthenticated, getIdTokenClaims]);
const username = claims?.username ?? claims?.name ?? claims?.email ?? claims?.sub ?? null;
const roles = (claims?.roles as string[]) ?? [];
// tenantId is the DB UUID from the org store (set by OrgResolver after /api/me)
const tenantId = currentTenantId;
const logout = useCallback(() => { const logout = useCallback(() => {
signOut(window.location.origin + '/login'); signOut(window.location.origin + '/login');
}, [signOut]); }, [signOut]);
@@ -37,9 +13,7 @@ export function useAuth() {
return { return {
isAuthenticated, isAuthenticated,
isLoading, isLoading,
username, tenantId: currentTenantId,
roles,
tenantId,
isPlatformAdmin, isPlatformAdmin,
logout, logout,
signIn, signIn,

View File

@@ -10,16 +10,19 @@ export interface OrgInfo {
interface OrgState { interface OrgState {
currentOrgId: string | null; // Logto org ID — used for getAccessToken(resource, orgId) currentOrgId: string | null; // Logto org ID — used for getAccessToken(resource, orgId)
currentTenantId: string | null; // DB UUID — used for API calls like /api/tenants/{id} currentTenantId: string | null; // DB UUID — used for API calls like /api/tenants/{id}
currentOrgRoles: string[] | null; // Logto org roles for the current org (e.g. 'admin', 'member')
organizations: OrgInfo[]; organizations: OrgInfo[];
isPlatformAdmin: boolean; isPlatformAdmin: boolean;
setCurrentOrg: (orgId: string | null) => void; setCurrentOrg: (orgId: string | null) => void;
setOrganizations: (orgs: OrgInfo[]) => void; setOrganizations: (orgs: OrgInfo[]) => void;
setIsPlatformAdmin: (value: boolean) => void; setIsPlatformAdmin: (value: boolean) => void;
setCurrentOrgRoles: (roles: string[] | null) => void;
} }
export const useOrgStore = create<OrgState>((set, get) => ({ export const useOrgStore = create<OrgState>((set, get) => ({
currentOrgId: null, currentOrgId: null,
currentTenantId: null, currentTenantId: null,
currentOrgRoles: null,
organizations: [], organizations: [],
isPlatformAdmin: false, isPlatformAdmin: false,
setCurrentOrg: (orgId) => { setCurrentOrg: (orgId) => {
@@ -36,4 +39,5 @@ export const useOrgStore = create<OrgState>((set, get) => ({
}); });
}, },
setIsPlatformAdmin: (value) => set({ isPlatformAdmin: value }), setIsPlatformAdmin: (value) => set({ isPlatformAdmin: value }),
setCurrentOrgRoles: (roles) => set({ currentOrgRoles: roles }),
})); }));

View File

@@ -100,7 +100,7 @@ function PlatformIcon() {
export function Layout() { export function Layout() {
const navigate = useNavigate(); const navigate = useNavigate();
const { username, logout, isPlatformAdmin } = useAuth(); const { logout, isPlatformAdmin } = useAuth();
const [envSectionOpen, setEnvSectionOpen] = useState(true); const [envSectionOpen, setEnvSectionOpen] = useState(true);
const [collapsed, setCollapsed] = useState(false); const [collapsed, setCollapsed] = useState(false);
@@ -166,7 +166,7 @@ export function Layout() {
{/* User info + logout */} {/* User info + logout */}
<Sidebar.FooterLink <Sidebar.FooterLink
icon={<UserIcon />} icon={<UserIcon />}
label={username ?? 'Account'} label="Account"
onClick={logout} onClick={logout}
/> />
</Sidebar.Footer> </Sidebar.Footer>
@@ -177,7 +177,7 @@ export function Layout() {
<AppShell sidebar={sidebar}> <AppShell sidebar={sidebar}>
<TopBar <TopBar
breadcrumb={[]} breadcrumb={[]}
user={username ? { name: username } : undefined} user={undefined}
onLogout={logout} onLogout={logout}
/> />
<Outlet /> <Outlet />

View File

@@ -1,14 +1,17 @@
import { useAuth } from '../auth/useAuth'; import { useOrgStore } from '../auth/useOrganization';
const ROLE_PERMISSIONS: Record<string, string[]> = { const ROLE_PERMISSIONS: Record<string, string[]> = {
OWNER: ['tenant:manage', 'billing:manage', 'team:manage', 'apps:manage', 'apps:deploy', 'secrets:manage', 'observe:read', 'observe:debug', 'settings:manage'], 'admin': [
ADMIN: ['team:manage', 'apps:manage', 'apps:deploy', 'secrets:manage', 'observe:read', 'observe:debug', 'settings:manage'], 'tenant:manage', 'billing:manage', 'team:manage', 'apps:manage',
DEVELOPER: ['apps:deploy', 'secrets:manage', 'observe:read', 'observe:debug'], 'apps:deploy', 'secrets:manage', 'observe:read', 'observe:debug',
VIEWER: ['observe:read'], 'settings:manage',
],
'member': ['apps:deploy', 'observe:read', 'observe:debug'],
}; };
export function usePermissions() { export function usePermissions() {
const { roles } = useAuth(); const { currentOrgRoles } = useOrgStore();
const roles = currentOrgRoles ?? [];
const permissions = new Set<string>(); const permissions = new Set<string>();
for (const role of roles) { for (const role of roles) {