From 1bb2756161fa8244bf59addb156cf08a21ef14ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gast=C3=B3n=20Fournier?= Date: Wed, 19 Feb 2025 09:08:21 +0100 Subject: [PATCH] chore: remove references to admin token kill switch (#9324) This feature has been removed --- .../admin/apiToken/ApiTokenForm/useApiTokenForm.ts | 12 ------------ frontend/src/interfaces/uiConfig.ts | 1 - 2 files changed, 13 deletions(-) diff --git a/frontend/src/component/admin/apiToken/ApiTokenForm/useApiTokenForm.ts b/frontend/src/component/admin/apiToken/ApiTokenForm/useApiTokenForm.ts index eff3010e36..7ec110ed07 100644 --- a/frontend/src/component/admin/apiToken/ApiTokenForm/useApiTokenForm.ts +++ b/frontend/src/component/admin/apiToken/ApiTokenForm/useApiTokenForm.ts @@ -4,20 +4,17 @@ import { useEnvironments } from 'hooks/api/getters/useEnvironments/useEnvironmen import type { IApiTokenCreate } from 'hooks/api/actions/useApiTokensApi/useApiTokensApi'; import { TokenType } from 'interfaces/token'; import { - ADMIN, CREATE_FRONTEND_API_TOKEN, CREATE_CLIENT_API_TOKEN, CREATE_PROJECT_API_TOKEN, } from '@server/types/permissions'; import { useHasRootAccess } from 'hooks/useHasAccess'; import type { SelectOption } from './TokenTypeSelector/TokenTypeSelector'; -import { useUiFlag } from '../../../../hooks/useUiFlag'; export type ApiTokenFormErrorType = 'username' | 'projects'; export const useApiTokenForm = (project?: string) => { const { environments } = useEnvironments(); const { uiConfig } = useUiConfig(); - const adminTokenKillSwitch = useUiFlag('adminTokenKillSwitch'); const initialEnvironment = environments?.find((e) => e.enabled)?.name; const hasCreateTokenPermission = useHasRootAccess(CREATE_CLIENT_API_TOKEN); @@ -36,20 +33,11 @@ export const useApiTokenForm = (project?: string) => { }, ]; - const hasAdminAccess = useHasRootAccess(ADMIN); const hasCreateFrontendAccess = useHasRootAccess(CREATE_FRONTEND_API_TOKEN); const hasCreateFrontendTokenAccess = useHasRootAccess( CREATE_PROJECT_API_TOKEN, project, ); - if (!project && !adminTokenKillSwitch) { - apiTokenTypes.push({ - key: TokenType.ADMIN, - label: TokenType.ADMIN, - title: 'Full access for managing Unleash', - enabled: hasAdminAccess, - }); - } if (uiConfig.flags.embedProxyFrontend) { apiTokenTypes.splice(1, 0, { diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index 7b20c095db..9a881e4569 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -71,7 +71,6 @@ export type UiFlags = { automatedActions?: boolean; celebrateUnleash?: boolean; enableLicense?: boolean; - adminTokenKillSwitch?: boolean; feedbackComments?: Variant; showInactiveUsers?: boolean; feedbackPosting?: boolean;