diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs index 928b262a6..0cb192acf 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -115,35 +115,15 @@ {{#each @model as |authMethod|}} - {{! - Show link to auth method route if non-OIDC and when - oidc-crud feature is enabled, otherwise show just the name - (when the method is OIDC and oidc-crud is disabled) - }} - {{#if authMethod.isOIDC}} - {{#if (feature-flag 'oidc-crud')}} - {{#if (can 'read model' authMethod)}} - - {{authMethod.displayName}} - - {{else}} - {{authMethod.displayName}} - {{/if}} - {{/if}} - {{else}} - {{#if (can 'read model' authMethod)}} - - {{authMethod.displayName}} - - {{else}} + {{#if (can 'read model' authMethod)}} + {{authMethod.displayName}} - {{/if}} + + {{else}} + {{authMethod.displayName}} {{/if}}

{{authMethod.description}}

diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js index 04b91699b..997536004 100644 --- a/ui/admin/config/environment.js +++ b/ui/admin/config/environment.js @@ -7,7 +7,6 @@ const EDITION = process.env.EDITION || 'oss'; // Default edition is OSS // Object that defines edition features. const featureEditions = { oss: { - 'oidc-crud': true, 'oidc-account-crud': true, search: false, filter: true,