From bf2a6aeb6a3723bb8415f09d15b41abb1934f359 Mon Sep 17 00:00:00 2001
From: lisbet-alvarez <107949262+lisbet-alvarez@users.noreply.github.com>
Date: Thu, 11 Aug 2022 16:01:47 -0700
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20remove=20oidc-crud=20fe?=
 =?UTF-8?q?ature=20flag=20(#1248)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: 🤖 remove oidc-crud feature flag

✅ Closes: ICU-5597

* Update environment.js to resolve confilicts
---
 .../scopes/scope/auth-methods/index.hbs       | 36 +++++--------------
 ui/admin/config/environment.js                |  1 -
 2 files changed, 8 insertions(+), 29 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 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|}}
             <body.row as |row|>
               <row.headerCell>
-                {{!
-                  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)}}
-                      <LinkTo
-                        @route='scopes.scope.auth-methods.auth-method'
-                        @model={{authMethod.id}}
-                      >
-                        {{authMethod.displayName}}
-                      </LinkTo>
-                    {{else}}
-                      {{authMethod.displayName}}
-                    {{/if}}
-                  {{/if}}
-                {{else}}
-                  {{#if (can 'read model' authMethod)}}
-                    <LinkTo
-                      @route='scopes.scope.auth-methods.auth-method'
-                      @model={{authMethod.id}}
-                    >
-                      {{authMethod.displayName}}
-                    </LinkTo>
-                  {{else}}
+                {{#if (can 'read model' authMethod)}}
+                  <LinkTo
+                    @route='scopes.scope.auth-methods.auth-method'
+                    @model={{authMethod.id}}
+                  >
                     {{authMethod.displayName}}
-                  {{/if}}
+                  </LinkTo>
+                {{else}}
+                  {{authMethod.displayName}}
                 {{/if}}
                 <p>{{authMethod.description}}</p>
               </row.headerCell>
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,