refactor

Author: lucasgoral

src/components/ControlPlane/GitRepositories.tsx

@@ -24,7 +24,7 @@ import { useHandleResourcePatch } from '../../lib/api/types/crossplane/useHandle
 import { ErrorDialog, ErrorDialogHandle } from '../Shared/ErrorMessageBox.tsx';
 import type { GitReposResponse } from '../../lib/api/types/flux/listGitRepo';
 import { ActionsMenu, type ActionItem } from './ActionsMenu';
-import { useAuthMcp } from '../../spaces/mcp/auth/AuthContextMcp.tsx';
+import { useHasMcpAdminRights } from '../../spaces/mcp/auth/useHasMcpAdminRights.ts';
 
 export type GitRepoItem = GitReposResponse['items'][0] & {
   apiVersion?: string;
@@ -47,7 +47,6 @@ export function GitRepositories() {
     readyMessage: string;
     revision?: string;
   };
-  const { hasMCPAdminRights } = useAuthMcp();
   const openEditPanel = useCallback(
     (item: GitRepoItem) => {
       const identityKey = `${item.kind}:${item.metadata.namespace ?? ''}:${item.metadata.name}`;
@@ -64,6 +63,7 @@ export function GitRepositories() {
     },
     [openInAside, handlePatch],
   );
+  const hasMCPAdminRights = useHasMcpAdminRights();
 
   const columns = useMemo<AnalyticalTableColumnDefinition[]>(
     () =>

src/components/ControlPlane/Kustomizations.tsx

@@ -24,7 +24,7 @@ import { useHandleResourcePatch } from '../../lib/api/types/crossplane/useHandle
 import { ErrorDialog, ErrorDialogHandle } from '../Shared/ErrorMessageBox.tsx';
 import type { KustomizationsResponse } from '../../lib/api/types/flux/listKustomization';
 import { ActionsMenu, type ActionItem } from './ActionsMenu';
-import { useAuthMcp } from '../../spaces/mcp/auth/AuthContextMcp.tsx';
+import { useHasMcpAdminRights } from '../../spaces/mcp/auth/useHasMcpAdminRights.ts';
 
 export type KustomizationItem = KustomizationsResponse['items'][0] & {
   apiVersion?: string;
@@ -63,7 +63,7 @@ export function Kustomizations() {
     },
     [openInAside, handlePatch],
   );
-  const { hasMCPAdminRights } = useAuthMcp();
+  const hasMCPAdminRights = useHasMcpAdminRights();
   const columns = useMemo<AnalyticalTableColumnDefinition[]>(
     () =>
       [

src/components/ControlPlane/ManagedResources.tsx

@@ -36,7 +36,7 @@ import { YamlSidePanel } from '../Yaml/YamlSidePanel.tsx';
 import { ErrorDialog, ErrorDialogHandle } from '../Shared/ErrorMessageBox.tsx';
 import { APIError } from '../../lib/api/error.ts';
 import { useHandleResourcePatch } from '../../lib/api/types/crossplane/useHandleResourcePatch.ts';
-import { useAuthMcp } from '../../spaces/mcp/auth/AuthContextMcp.tsx';
+import { useHasMcpAdminRights } from '../../spaces/mcp/auth/useHasMcpAdminRights.ts';
 
 interface StatusFilterColumn {
   filterValue?: string;
@@ -120,7 +120,7 @@ export function ManagedResources() {
     },
     [openInAside, handlePatch],
   );
-  const { hasMCPAdminRights } = useAuthMcp();
+  const hasMCPAdminRights = useHasMcpAdminRights();
   const columns = useMemo<AnalyticalTableColumnDefinition[]>(
     () =>
       [

src/components/ControlPlane/ProvidersConfig.tsx

@@ -24,7 +24,7 @@ import { useSplitter } from '../Splitter/SplitterContext.tsx';
 import { YamlSidePanel } from '../Yaml/YamlSidePanel.tsx';
 import { useHandleResourcePatch } from '../../lib/api/types/crossplane/useHandleResourcePatch.ts';
 import { ErrorDialog, ErrorDialogHandle } from '../Shared/ErrorMessageBox.tsx';
-import { useAuthMcp } from '../../spaces/mcp/auth/AuthContextMcp.tsx';
+import { useHasMcpAdminRights } from '../../spaces/mcp/auth/useHasMcpAdminRights.ts';
 
 type Rows = {
   parent: string;
@@ -76,7 +76,7 @@ export function ProvidersConfig() {
     },
     [openInAside, handlePatch],
   );
-  const { hasMCPAdminRights } = useAuthMcp();
+  const hasMCPAdminRights = useHasMcpAdminRights();
   const columns = useMemo<AnalyticalTableColumnDefinition[]>(
     () =>
       [

src/lib/shared/McpContext.tsx

@@ -1,5 +1,5 @@
 import { createContext, ReactNode, useContext } from 'react';
-import { ControlPlane as ManagedControlPlaneResource } from '../api/types/crate/controlPlanes.ts';
+import { ControlPlane as ManagedControlPlaneResource, RoleBinding } from '../api/types/crate/controlPlanes.ts';
 import { ApiConfigProvider } from '../../components/Shared/k8s';
 import { useApiResource } from '../api/useApiResource.ts';
 import { GetKubeconfig } from '../api/types/crate/getKubeconfig.ts';
@@ -15,6 +15,7 @@ interface Mcp {
   secretName?: string;
   secretKey?: string;
   kubeconfig?: string;
+  roleBindings?: RoleBinding[];
 }
 
 interface Props {
@@ -44,6 +45,7 @@ export const McpContextProvider = ({ children, context }: Props) => {
     return <></>;
   }
   context.kubeconfig = kubeconfig.data;
+  context.roleBindings = mcp.data?.spec?.authorization?.roleBindings;
   return <McpContext.Provider value={context}>{children}</McpContext.Provider>;
 };
 

src/spaces/mcp/auth/AuthContextMcp.tsx

@@ -2,31 +2,17 @@ import { createContext, useState, useEffect, ReactNode, use } from 'react';
 import { MeResponseSchema } from './auth.schemas';
 import { AUTH_FLOW_SESSION_KEY } from '../../../common/auth/AuthCallbackHandler.tsx';
 import { getRedirectSuffix } from '../../../common/auth/getRedirectSuffix.ts';
-import { RoleBinding } from '../../../lib/api/types/crate/controlPlanes.ts';
-import { useAuthOnboarding } from '../../onboarding/auth/AuthContextOnboarding.tsx';
 
 interface AuthContextMcpType {
   isLoading: boolean;
   isAuthenticated: boolean;
   error: Error | null;
   login: () => void;
-  hasMCPAdminRights: boolean;
 }
 
 const AuthContextMcp = createContext<AuthContextMcpType | null>(null);
 
-export function AuthProviderMcp({ children, mcpUsers = [] }: { children: ReactNode; mcpUsers?: RoleBinding[] }) {
-  const auth = useAuthOnboarding();
-
-  const userEmail = auth.user?.email;
-
-  const matchingRoleBinding = mcpUsers.find(
-    (roleBinding) =>
-      Array.isArray(roleBinding.subjects) &&
-      roleBinding.subjects.some((subject) => subject?.name?.includes(userEmail ?? '')),
-  );
-  const hasMCPAdminRights = matchingRoleBinding?.role === 'admin';
-
+export function AuthProviderMcp({ children }: { children: ReactNode }) {
   const [isAuthenticated, setIsAuthenticated] = useState(false);
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState<Error | null>(null);
@@ -73,9 +59,7 @@ export function AuthProviderMcp({ children, mcpUsers = [] }: { children: ReactNo
     window.location.replace(`/api/auth/mcp/login?redirectTo=${encodeURIComponent(getRedirectSuffix())}`);
   };
 
-  return (
-    <AuthContextMcp value={{ isLoading, isAuthenticated, error, login, hasMCPAdminRights }}>{children}</AuthContextMcp>
-  );
+  return <AuthContextMcp value={{ isLoading, isAuthenticated, error, login }}>{children}</AuthContextMcp>;
 }
 
 export const useAuthMcp = () => {

src/spaces/mcp/auth/useHasMcpAdminRights.ts

@@ -0,0 +1,20 @@
+import { useAuthOnboarding } from '../../onboarding/auth/AuthContextOnboarding.tsx';
+import { useMcp } from '../../../lib/shared/McpContext.tsx';
+
+export function useHasMcpAdminRights(): boolean {
+  const auth = useAuthOnboarding();
+  const mcp = useMcp();
+  const userEmail = auth.user?.email;
+  const mcpUsers = mcp.roleBindings ?? [];
+
+  if (!userEmail) {
+    return false;
+  }
+
+  const matchingRoleBinding = mcpUsers.find(
+    (roleBinding) =>
+      Array.isArray(roleBinding.subjects) && roleBinding.subjects.some((subject) => subject?.name?.includes(userEmail)),
+  );
+
+  return matchingRoleBinding?.role === 'admin';
+}

src/spaces/mcp/pages/McpPage.tsx

@@ -28,6 +28,7 @@ import { useApiResource } from '../../../lib/api/useApiResource.ts';
 import { YamlViewButton } from '../../../components/Yaml/YamlViewButton.tsx';
 import { Landscapers } from '../../../components/ControlPlane/Landscapers.tsx';
 import { AuthProviderMcp } from '../auth/AuthContextMcp.tsx';
+import { useHasMcpAdminRights } from '../auth/useHasMcpAdminRights.ts';
 import { isNotFoundError } from '../../../lib/api/error.ts';
 import { NotFoundBanner } from '../../../components/Ui/NotFoundBanner/NotFoundBanner.tsx';
 import Graph from '../../../components/Graphs/Graph.tsx';
@@ -93,7 +94,7 @@ export default function McpPage() {
         name: controlPlaneName,
       }}
     >
-      <AuthProviderMcp mcpUsers={mcp?.spec?.authorization?.roleBindings}>
+      <AuthProviderMcp>
         <WithinManagedControlPlane>
           <ObjectPage
             mode="IconTabBar"