From 52056f99f1f5318a357a4ea72909301d2440abfd Mon Sep 17 00:00:00 2001 From: wangsijie Date: Fri, 23 Aug 2024 14:38:14 +0800 Subject: [PATCH] chore: remove dev feature guard of PAT (#6499) --- .../console/src/pages/UserDetails/UserSettings/index.tsx | 3 +-- packages/core/src/routes/admin-user/index.ts | 5 +---- .../routes/admin-user/personal-access-token.openapi.json | 5 ----- .../oidc/token-exchange/personal-access-token.test.ts | 9 +-------- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/packages/console/src/pages/UserDetails/UserSettings/index.tsx b/packages/console/src/pages/UserDetails/UserSettings/index.tsx index 86314fffa..6bbd97e1d 100644 --- a/packages/console/src/pages/UserDetails/UserSettings/index.tsx +++ b/packages/console/src/pages/UserDetails/UserSettings/index.tsx @@ -12,7 +12,6 @@ import DetailsForm from '@/components/DetailsForm'; import FormCard from '@/components/FormCard'; import UnsavedChangesAlertModal from '@/components/UnsavedChangesAlertModal'; import { profilePropertyReferenceLink } from '@/consts'; -import { isDevFeaturesEnabled } from '@/consts/env'; import CodeEditor from '@/ds-components/CodeEditor'; import FormField from '@/ds-components/FormField'; import TextInput from '@/ds-components/TextInput'; @@ -166,7 +165,7 @@ function UserSettings() { - {isDevFeaturesEnabled && } + diff --git a/packages/core/src/routes/admin-user/index.ts b/packages/core/src/routes/admin-user/index.ts index f3adcf56e..cc5f9c2c4 100644 --- a/packages/core/src/routes/admin-user/index.ts +++ b/packages/core/src/routes/admin-user/index.ts @@ -1,4 +1,3 @@ -import { EnvSet } from '../../env-set/index.js'; import type { ManagementApiRouter, RouterInitArgs } from '../types.js'; import adminUserBasicsRoutes from './basics.js'; @@ -16,7 +15,5 @@ export default function adminUserRoutes(...args: adminUserSocialRoutes(...args); adminUserOrganizationRoutes(...args); adminUserMfaVerificationsRoutes(...args); - if (EnvSet.values.isDevFeaturesEnabled) { - adminUserPersonalAccessTokenRoutes(...args); - } + adminUserPersonalAccessTokenRoutes(...args); } diff --git a/packages/core/src/routes/admin-user/personal-access-token.openapi.json b/packages/core/src/routes/admin-user/personal-access-token.openapi.json index c229ce9fc..d625d4c84 100644 --- a/packages/core/src/routes/admin-user/personal-access-token.openapi.json +++ b/packages/core/src/routes/admin-user/personal-access-token.openapi.json @@ -1,9 +1,4 @@ { - "tags": [ - { - "name": "Dev feature" - } - ], "paths": { "/api/users/{userId}/personal-access-tokens": { "get": { diff --git a/packages/integration-tests/src/tests/api/oidc/token-exchange/personal-access-token.test.ts b/packages/integration-tests/src/tests/api/oidc/token-exchange/personal-access-token.test.ts index 1b38348e3..784d50022 100644 --- a/packages/integration-tests/src/tests/api/oidc/token-exchange/personal-access-token.test.ts +++ b/packages/integration-tests/src/tests/api/oidc/token-exchange/personal-access-token.test.ts @@ -10,17 +10,10 @@ import { } from '#src/api/application.js'; import { createResource, deleteResource } from '#src/api/resource.js'; import { createUserByAdmin } from '#src/helpers/index.js'; -import { - devFeatureTest, - generatePassword, - generateUsername, - getAccessTokenPayload, -} from '#src/utils.js'; +import { generatePassword, generateUsername, getAccessTokenPayload } from '#src/utils.js'; const tokenType = 'urn:logto:token-type:personal_access_token'; -const { describe, it } = devFeatureTest; - describe('Token Exchange (Personal Access Token)', () => { const username = generateUsername(); const password = generatePassword();