diff --git a/packages/console/src/components/Guide/hooks.ts b/packages/console/src/components/Guide/hooks.ts index 6c59e326d38..44bb2d2ea0d 100644 --- a/packages/console/src/components/Guide/hooks.ts +++ b/packages/console/src/components/Guide/hooks.ts @@ -47,16 +47,13 @@ export const useAppGuideMetadata = (): { /** * Show SAML guides when it is: * 1. Cloud env - * 2. `isDevFeatureEnabled` is true - * 3. `quota.samlApplicationsLimit` is not 0. + * 2. `quota.samlApplicationsLimit` is not 0. */ ) .filter( ({ metadata: { target } }) => target !== ApplicationType.SAML || - (isCloudEnv && - isDevFeaturesEnabled && - currentSubscriptionQuota.samlApplicationsLimit !== 0) + (isCloudEnv && currentSubscriptionQuota.samlApplicationsLimit !== 0) ), [] ); diff --git a/packages/core/src/routes/applications/application.ts b/packages/core/src/routes/applications/application.ts index 3cc40fb7fc8..19918a8308c 100644 --- a/packages/core/src/routes/applications/application.ts +++ b/packages/core/src/routes/applications/application.ts @@ -13,7 +13,6 @@ import { generateStandardId, generateStandardSecret } from '@logto/shared'; import { conditional } from '@silverhand/essentials'; import { boolean, object, string, z } from 'zod'; -import { EnvSet } from '#src/env-set/index.js'; import RequestError from '#src/errors/RequestError/index.js'; import koaGuard from '#src/middleware/koa-guard.js'; import koaPagination from '#src/middleware/koa-pagination.js'; @@ -42,10 +41,9 @@ const hideOidcClientMetadataForSamlApp = (application: Application) => { return { ...application, ...conditional( - application.type === ApplicationType.SAML && - EnvSet.values.isDevFeaturesEnabled && { - oidcClientMetadata: buildOidcClientMetadata(), - } + application.type === ApplicationType.SAML && { + oidcClientMetadata: buildOidcClientMetadata(), + } ), }; }; diff --git a/packages/core/src/routes/init.ts b/packages/core/src/routes/init.ts index 10eea2797ae..72d089a8243 100644 --- a/packages/core/src/routes/init.ts +++ b/packages/core/src/routes/init.ts @@ -101,11 +101,7 @@ const createRouters = (tenant: TenantContext) => { systemRoutes(managementRouter, tenant); subjectTokenRoutes(managementRouter, tenant); accountCentersRoutes(managementRouter, tenant); - // TODO: @darcy per our design, we will move related routes to Cloud repo and the routes will be loaded from remote. - if ( - (EnvSet.values.isDevFeaturesEnabled && EnvSet.values.isCloud) || - EnvSet.values.isIntegrationTest - ) { + if (EnvSet.values.isCloud || EnvSet.values.isIntegrationTest) { samlApplicationRoutes(managementRouter, tenant); } @@ -121,11 +117,7 @@ const createRouters = (tenant: TenantContext) => { wellKnownRoutes(anonymousRouter, tenant); statusRoutes(anonymousRouter, tenant); authnRoutes(anonymousRouter, tenant); - // TODO: @darcy per our design, we will move related routes to Cloud repo and the routes will be loaded from remote. - if ( - (EnvSet.values.isDevFeaturesEnabled && EnvSet.values.isCloud) || - EnvSet.values.isIntegrationTest - ) { + if (EnvSet.values.isCloud || EnvSet.values.isIntegrationTest) { samlApplicationAnonymousRoutes(anonymousRouter, tenant); }