From c2b66b74eb6186f5ab48eaacdc38c7652e238681 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Mon, 12 Apr 2021 15:31:42 -0400 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20add=20oidc-crud=20featur?= =?UTF-8?q?e=20flag=20to=20disable=20admin=20list=20links?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scopes/scope/auth-methods/index.hbs | 20 ++++++++++++++++--- ui/admin/config/environment.js | 2 ++ 2 files changed, 19 insertions(+), 3 deletions(-) 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 039602e23..f8038c37b 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -58,15 +58,29 @@ {{#each @model as |authMethod|}} - {{#if authMethod.isPassword}} + {{! + 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')}} + + {{authMethod.displayName}} + + {{else}} + {{authMethod.displayName}} + {{/if}} + {{else}} {{authMethod.displayName}} - {{else}} - {{authMethod.displayName}} {{/if}}

{{authMethod.description}}

diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js index 1f1d8de4c..cfbcb155b 100644 --- a/ui/admin/config/environment.js +++ b/ui/admin/config/environment.js @@ -87,6 +87,7 @@ module.exports = function (environment) { featureFlags: { oidc: false, + 'oidc-crud': false, 'primary-auth-method': false, }, }; @@ -125,6 +126,7 @@ module.exports = function (environment) { // Enable features in development ENV.featureFlags['primary-auth-method'] = true; ENV.featureFlags['oidc'] = true; + //ENV.featureFlags['oidc-crud'] = true; } if (environment === 'test') {