From 9a3f78d3422ae1e6da4503194e1e51f5b96c093c Mon Sep 17 00:00:00 2001 From: wangsijie Date: Tue, 19 Nov 2024 11:54:32 +0800 Subject: [PATCH] chore: remove feature guard (#6818) --- packages/core/src/routes/account-center/index.openapi.json | 3 --- packages/core/src/routes/account/index.openapi.json | 3 --- packages/core/src/routes/account/index.ts | 5 ----- packages/core/src/routes/init.ts | 4 +--- packages/core/src/routes/swagger/utils/documents.ts | 7 +------ packages/core/src/routes/verification/index.openapi.json | 3 --- packages/core/src/routes/verification/index.ts | 5 ----- .../integration-tests/src/tests/api/account-center.test.ts | 3 --- .../src/tests/api/account/account-center-reject.test.ts | 4 +--- .../src/tests/api/account/email-and-phone.test.ts | 4 +--- .../integration-tests/src/tests/api/account/index.test.ts | 4 +--- .../integration-tests/src/tests/api/account/social.test.ts | 3 --- 12 files changed, 5 insertions(+), 43 deletions(-) diff --git a/packages/core/src/routes/account-center/index.openapi.json b/packages/core/src/routes/account-center/index.openapi.json index 39acda19f..5c6ada22f 100644 --- a/packages/core/src/routes/account-center/index.openapi.json +++ b/packages/core/src/routes/account-center/index.openapi.json @@ -3,9 +3,6 @@ { "name": "Account center", "description": "Customize your account API settings." - }, - { - "name": "Dev feature" } ], "paths": { diff --git a/packages/core/src/routes/account/index.openapi.json b/packages/core/src/routes/account/index.openapi.json index 816e689cf..166f2f7d5 100644 --- a/packages/core/src/routes/account/index.openapi.json +++ b/packages/core/src/routes/account/index.openapi.json @@ -3,9 +3,6 @@ { "name": "Account", "description": "Account routes provide functionality for managing user profile for the end user to interact directly with access tokens." - }, - { - "name": "Dev feature" } ], "paths": { diff --git a/packages/core/src/routes/account/index.ts b/packages/core/src/routes/account/index.ts index 5863e0957..692fc20aa 100644 --- a/packages/core/src/routes/account/index.ts +++ b/packages/core/src/routes/account/index.ts @@ -9,7 +9,6 @@ import { z } from 'zod'; import koaGuard from '#src/middleware/koa-guard.js'; -import { EnvSet } from '../../env-set/index.js'; import RequestError from '../../errors/RequestError/index.js'; import { encryptUserPassword } from '../../libraries/user.utils.js'; import assertThat from '../../utils/assert-that.js'; @@ -35,10 +34,6 @@ export default function accountRoutes(...args: RouterInitA router.use(koaAccountCenter(queries)); - if (!EnvSet.values.isDevFeaturesEnabled) { - return; - } - router.get( `${accountApiPrefix}`, koaGuard({ diff --git a/packages/core/src/routes/init.ts b/packages/core/src/routes/init.ts index 3c62df56b..0a35c96cc 100644 --- a/packages/core/src/routes/init.ts +++ b/packages/core/src/routes/init.ts @@ -98,9 +98,7 @@ const createRouters = (tenant: TenantContext) => { ssoConnectors(managementRouter, tenant); systemRoutes(managementRouter, tenant); subjectTokenRoutes(managementRouter, tenant); - if (EnvSet.values.isDevFeaturesEnabled) { - accountCentersRoutes(managementRouter, tenant); - } + accountCentersRoutes(managementRouter, tenant); const anonymousRouter: AnonymousRouter = new Router(); diff --git a/packages/core/src/routes/swagger/utils/documents.ts b/packages/core/src/routes/swagger/utils/documents.ts index f96a2b034..2fe2ba2a2 100644 --- a/packages/core/src/routes/swagger/utils/documents.ts +++ b/packages/core/src/routes/swagger/utils/documents.ts @@ -51,12 +51,7 @@ const managementApiIdentifiableEntityNames = Object.freeze([ /** Additional tags that cannot be inferred from the path. */ const additionalTags = Object.freeze( - condArray( - 'Organization applications', - 'Custom UI assets', - 'Organization users', - EnvSet.values.isDevFeaturesEnabled && 'Account center' - ) + condArray('Organization applications', 'Custom UI assets', 'Organization users') ); export const buildManagementApiBaseDocument = ( diff --git a/packages/core/src/routes/verification/index.openapi.json b/packages/core/src/routes/verification/index.openapi.json index 73eeb8e7b..d1bb28acf 100644 --- a/packages/core/src/routes/verification/index.openapi.json +++ b/packages/core/src/routes/verification/index.openapi.json @@ -3,9 +3,6 @@ { "name": "Verifications", "description": "Endpoints for creating and validating verification records, which can be used in Profile routes." - }, - { - "name": "Dev feature" } ], "paths": { diff --git a/packages/core/src/routes/verification/index.ts b/packages/core/src/routes/verification/index.ts index 0b31e4b5f..088ef6e0f 100644 --- a/packages/core/src/routes/verification/index.ts +++ b/packages/core/src/routes/verification/index.ts @@ -12,7 +12,6 @@ import { z } from 'zod'; import koaGuard from '#src/middleware/koa-guard.js'; -import { EnvSet } from '../../env-set/index.js'; import { buildVerificationRecordByIdAndType, insertVerificationRecord, @@ -31,10 +30,6 @@ export default function verificationRoutes( ) { const { queries, libraries, sentinel } = tenantContext; - if (!EnvSet.values.isDevFeaturesEnabled) { - return; - } - router.post( `${verificationApiPrefix}/password`, koaGuard({ diff --git a/packages/integration-tests/src/tests/api/account-center.test.ts b/packages/integration-tests/src/tests/api/account-center.test.ts index 23b9ac8a7..694541752 100644 --- a/packages/integration-tests/src/tests/api/account-center.test.ts +++ b/packages/integration-tests/src/tests/api/account-center.test.ts @@ -5,9 +5,6 @@ import { getAccountCenter, updateAccountCenter, } from '#src/api/account-center.js'; -import { devFeatureTest } from '#src/utils.js'; - -const { describe, it } = devFeatureTest; describe('account center', () => { beforeAll(async () => { diff --git a/packages/integration-tests/src/tests/api/account/account-center-reject.test.ts b/packages/integration-tests/src/tests/api/account/account-center-reject.test.ts index e4c7ea6ea..360c0d537 100644 --- a/packages/integration-tests/src/tests/api/account/account-center-reject.test.ts +++ b/packages/integration-tests/src/tests/api/account/account-center-reject.test.ts @@ -21,9 +21,7 @@ import { signInAndGetUserApi, } from '#src/helpers/profile.js'; import { enableAllPasswordSignInMethods } from '#src/helpers/sign-in-experience.js'; -import { devFeatureTest, generateEmail, generatePhone } from '#src/utils.js'; - -const { describe, it } = devFeatureTest; +import { generateEmail, generatePhone } from '#src/utils.js'; const expectedError = { code: 'account_center.filed_not_editable', diff --git a/packages/integration-tests/src/tests/api/account/email-and-phone.test.ts b/packages/integration-tests/src/tests/api/account/email-and-phone.test.ts index c776e978c..5703f4a23 100644 --- a/packages/integration-tests/src/tests/api/account/email-and-phone.test.ts +++ b/packages/integration-tests/src/tests/api/account/email-and-phone.test.ts @@ -23,9 +23,7 @@ import { signInAndGetUserApi, } from '#src/helpers/profile.js'; import { enableAllPasswordSignInMethods } from '#src/helpers/sign-in-experience.js'; -import { devFeatureTest, generateEmail, generatePhone } from '#src/utils.js'; - -const { describe, it } = devFeatureTest; +import { generateEmail, generatePhone } from '#src/utils.js'; describe('account (email and phone)', () => { beforeAll(async () => { diff --git a/packages/integration-tests/src/tests/api/account/index.test.ts b/packages/integration-tests/src/tests/api/account/index.test.ts index 857dfe3e4..47382f653 100644 --- a/packages/integration-tests/src/tests/api/account/index.test.ts +++ b/packages/integration-tests/src/tests/api/account/index.test.ts @@ -14,13 +14,11 @@ import { signInAndGetUserApi, } from '#src/helpers/profile.js'; import { enableAllPasswordSignInMethods } from '#src/helpers/sign-in-experience.js'; -import { devFeatureTest, generatePassword, generateUsername } from '#src/utils.js'; +import { generatePassword, generateUsername } from '#src/utils.js'; import WebhookMockServer from '../hook/WebhookMockServer.js'; import { assertHookLogResult } from '../hook/utils.js'; -const { describe, it } = devFeatureTest; - describe('account', () => { const webHookMockServer = new WebhookMockServer(9999); const webHookApi = new WebHookApiTest(); diff --git a/packages/integration-tests/src/tests/api/account/social.test.ts b/packages/integration-tests/src/tests/api/account/social.test.ts index f7c9d14a5..8c97f1a3e 100644 --- a/packages/integration-tests/src/tests/api/account/social.test.ts +++ b/packages/integration-tests/src/tests/api/account/social.test.ts @@ -25,9 +25,6 @@ import { signInAndGetUserApi, } from '#src/helpers/profile.js'; import { enableAllPasswordSignInMethods } from '#src/helpers/sign-in-experience.js'; -import { devFeatureTest } from '#src/utils.js'; - -const { describe, it } = devFeatureTest; describe('account (social)', () => { const state = 'fake_state';