diff --git a/packages/console/src/containers/ConsoleContent/Sidebar/hook.tsx b/packages/console/src/containers/ConsoleContent/Sidebar/hook.tsx index d0185701e..5977a1ba2 100644 --- a/packages/console/src/containers/ConsoleContent/Sidebar/hook.tsx +++ b/packages/console/src/containers/ConsoleContent/Sidebar/hook.tsx @@ -102,7 +102,6 @@ export const useSidebarMenuItems = (): { { Icon: Organization, title: 'organizations', - isHidden: !isDevFeaturesEnabled, }, { Icon: UserProfile, diff --git a/packages/console/src/containers/ConsoleContent/index.tsx b/packages/console/src/containers/ConsoleContent/index.tsx index 4c57c80d1..dc407ae11 100644 --- a/packages/console/src/containers/ConsoleContent/index.tsx +++ b/packages/console/src/containers/ConsoleContent/index.tsx @@ -174,17 +174,13 @@ function ConsoleContent() { } /> - {isDevFeaturesEnabled && ( - <> - - } /> - } /> - } /> - } /> - - } /> - - )} + + } /> + } /> + } /> + } /> + + } /> } /> } /> diff --git a/packages/core/src/oidc/init.ts b/packages/core/src/oidc/init.ts index 2d1629218..19f94c27c 100644 --- a/packages/core/src/oidc/init.ts +++ b/packages/core/src/oidc/init.ts @@ -18,7 +18,7 @@ import koaBody from 'koa-body'; import Provider, { errors } from 'oidc-provider'; import snakecaseKeys from 'snakecase-keys'; -import { EnvSet } from '#src/env-set/index.js'; +import { type EnvSet } from '#src/env-set/index.js'; import RequestError from '#src/errors/RequestError/index.js'; import { addOidcEventListeners } from '#src/event-listeners/index.js'; import koaAuditLog from '#src/middleware/koa-audit-log.js'; @@ -281,11 +281,7 @@ export default function initOidc(envSet: EnvSet, queries: Queries, libraries: Li }); addOidcEventListeners(oidc, queries); - - // DEV: Customized `refresh_token` grant - if (EnvSet.values.isDevFeaturesEnabled) { - registerGrants(oidc, envSet, queries); - } + registerGrants(oidc, envSet, queries); // Provide audit log context for event listeners oidc.use(koaAuditLog(queries)); diff --git a/packages/core/src/routes/organization/index.ts b/packages/core/src/routes/organization/index.ts index 9bae1c80d..8a52cf39c 100644 --- a/packages/core/src/routes/organization/index.ts +++ b/packages/core/src/routes/organization/index.ts @@ -8,7 +8,6 @@ import { import { yes } from '@silverhand/essentials'; import { 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'; @@ -23,11 +22,6 @@ import organizationScopeRoutes from './scopes.js'; import { errorHandler } from './utils.js'; export default function organizationRoutes(...args: RouterInitArgs) { - // Remove after the feature is ready - if (!EnvSet.values.isDevFeaturesEnabled) { - return; - } - const [ originalRouter, {