From 746426fc8261ffd1bf467aed886baeb2106a108f Mon Sep 17 00:00:00 2001
From: Dharini Jeeva <dharini@hashicorp.com>
Date: Thu, 11 Aug 2022 15:37:44 -0700
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20cleanup=20feature=20fla?=
 =?UTF-8?q?gs=20-=20OIDC=20(#1245)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: 🤖 cleanup OIDC feature flag
---
 .../auth-method/actions/index.hbs             | 30 +++---
 .../auth-methods/auth-method/header/index.hbs | 14 ++-
 .../scopes/scope/auth-methods/index.hbs       | 97 +++++++++----------
 .../templates/scopes/scope/authenticate.hbs   | 48 +++------
 .../scope/authenticate/method/index.hbs       | 22 +----
 ui/admin/config/environment.js                |  2 -
 .../acceptance/auth-methods/create-test.js    |  6 --
 .../templates/scopes/scope/authenticate.hbs   | 43 +++-----
 .../scope/authenticate/method/index.hbs       | 22 +----
 ui/desktop/config/environment.js              |  1 -
 .../tests/acceptance/cluster-url-test.js      |  4 +-
 .../tests/integration/components/card-test.js |  5 +-
 12 files changed, 106 insertions(+), 188 deletions(-)

diff --git a/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs b/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs
index ec4111027..0f1d67be5 100644
--- a/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs
+++ b/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs
@@ -40,22 +40,20 @@
   @dropdownRight={{true}}
   as |dropdown|
 >
-  {{#if (feature-flag 'primary-auth-method')}}
-    {{#if @model.isPrimary}}
-      <dropdown.button
-        @disabled={{@model.canSave}}
-        {{on 'click' (route-action 'removeAsPrimary' @model)}}
-      >
-        {{t 'resources.auth-method.actions.remove-as-primary'}}
-      </dropdown.button>
-    {{else}}
-      <dropdown.button
-        @disabled={{@model.canSave}}
-        {{on 'click' (route-action 'makePrimary' @model)}}
-      >
-        {{t 'resources.auth-method.actions.make-primary'}}
-      </dropdown.button>
-    {{/if}}
+  {{#if @model.isPrimary}}
+    <dropdown.button
+      @disabled={{@model.canSave}}
+      {{on 'click' (route-action 'removeAsPrimary' @model)}}
+    >
+      {{t 'resources.auth-method.actions.remove-as-primary'}}
+    </dropdown.button>
+  {{else}}
+    <dropdown.button
+      @disabled={{@model.canSave}}
+      {{on 'click' (route-action 'makePrimary' @model)}}
+    >
+      {{t 'resources.auth-method.actions.make-primary'}}
+    </dropdown.button>
   {{/if}}
   {{#if (can 'create model' @model collection='accounts')}}
 
diff --git a/ui/admin/app/components/auth-methods/auth-method/header/index.hbs b/ui/admin/app/components/auth-methods/auth-method/header/index.hbs
index 5f93944c3..d108ee0de 100644
--- a/ui/admin/app/components/auth-methods/auth-method/header/index.hbs
+++ b/ui/admin/app/components/auth-methods/auth-method/header/index.hbs
@@ -1,13 +1,11 @@
 <h2>
   {{t 'resources.auth-method.title'}}
-  {{#if (feature-flag 'primary-auth-method')}}
-    {{#if @model.isPrimary}}
-      &nbsp;
-      <Rose::Badge @style='success-outline'>
-        {{t 'states.primary'}}
-      </Rose::Badge>
-      &nbsp;
-    {{/if}}
+  {{#if @model.isPrimary}}
+    &nbsp;
+    <Rose::Badge @style='success-outline'>
+      {{t 'states.primary'}}
+    </Rose::Badge>
+    &nbsp;
   {{/if}}
   <DocLink @doc='auth-method' @iconSize='large' />
 </h2>
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 183d7ed5a..928b262a6 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
@@ -87,20 +87,18 @@
     {{/if}}
 
     {{#if @model}}
-      {{#if (feature-flag 'primary-auth-method')}}
-        {{#unless this.hasPrimaryAuthMethod}}
-          <Rose::Notification
-            @style='warning'
-            @heading={{t
-              'resources.auth-method.messages.no-primary-auth-method.title'
-            }}
-          >
-            {{t
-              'resources.auth-method.messages.no-primary-auth-method.description'
-            }}
-          </Rose::Notification>
-        {{/unless}}
-      {{/if}}
+      {{#unless this.hasPrimaryAuthMethod}}
+        <Rose::Notification
+          @style='warning'
+          @heading={{t
+            'resources.auth-method.messages.no-primary-auth-method.title'
+          }}
+        >
+          {{t
+            'resources.auth-method.messages.no-primary-auth-method.description'
+          }}
+        </Rose::Notification>
+      {{/unless}}
 
       <Rose::Table as |table|>
         <table.header as |header|>
@@ -108,10 +106,8 @@
             <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
             <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
             <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-            {{#if (feature-flag 'primary-auth-method')}}
-              <row.cell />
-              <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
-            {{/if}}
+            <row.cell />
+            <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
           </header.row>
         </table.header>
 
@@ -165,43 +161,38 @@
                   <code>{{authMethod.id}}</code>
                 </Copyable>
               </row.cell>
-              {{#if (feature-flag 'primary-auth-method')}}
-                <row.cell>
+              <row.cell>
+                {{#if authMethod.isPrimary}}
+                  <Rose::Badge @style='success-outline'>
+                    {{t 'states.primary'}}
+                  </Rose::Badge>
+                {{/if}}
+              </row.cell>
+              <row.cell>
+                <Rose::Dropdown
+                  @text={{t 'actions.manage'}}
+                  @dropdownRight={{true}}
+                  @iconOnly={{true}}
+                  @showCaret={{false}}
+                  @icon='flight-icons/svg/more-horizontal-16'
+                  as |dropdown|
+                >
+                  {{#unless authMethod.isPrimary}}
+                    <dropdown.button
+                      {{on 'click' (route-action 'makePrimary' authMethod)}}
+                    >
+                      {{t 'resources.auth-method.actions.make-primary'}}
+                    </dropdown.button>
+                  {{/unless}}
                   {{#if authMethod.isPrimary}}
-                    <Rose::Badge @style='success-outline'>
-                      {{t 'states.primary'}}
-                    </Rose::Badge>
+                    <dropdown.button
+                      {{on 'click' (route-action 'removeAsPrimary' authMethod)}}
+                    >
+                      {{t 'resources.auth-method.actions.remove-as-primary'}}
+                    </dropdown.button>
                   {{/if}}
-                </row.cell>
-                <row.cell>
-                  <Rose::Dropdown
-                    @text={{t 'actions.manage'}}
-                    @dropdownRight={{true}}
-                    @iconOnly={{true}}
-                    @showCaret={{false}}
-                    @icon='flight-icons/svg/more-horizontal-16'
-                    as |dropdown|
-                  >
-                    {{#unless authMethod.isPrimary}}
-                      <dropdown.button
-                        {{on 'click' (route-action 'makePrimary' authMethod)}}
-                      >
-                        {{t 'resources.auth-method.actions.make-primary'}}
-                      </dropdown.button>
-                    {{/unless}}
-                    {{#if authMethod.isPrimary}}
-                      <dropdown.button
-                        {{on
-                          'click'
-                          (route-action 'removeAsPrimary' authMethod)
-                        }}
-                      >
-                        {{t 'resources.auth-method.actions.remove-as-primary'}}
-                      </dropdown.button>
-                    {{/if}}
-                  </Rose::Dropdown>
-                </row.cell>
-              {{/if}}
+                </Rose::Dropdown>
+              </row.cell>
             </body.row>
           {{/each}}
         </table.body>
diff --git a/ui/admin/app/templates/scopes/scope/authenticate.hbs b/ui/admin/app/templates/scopes/scope/authenticate.hbs
index 0a73f858e..16c7ed960 100644
--- a/ui/admin/app/templates/scopes/scope/authenticate.hbs
+++ b/ui/admin/app/templates/scopes/scope/authenticate.hbs
@@ -38,41 +38,19 @@
           <Rose::Separator />
 
           <Rose::Nav::Tabs as |nav|>
-            {{#if (feature-flag 'oidc')}}
-              {{! OIDC enable:  list all auth methods }}
-              {{#each @model.authMethods as |authMethod|}}
-                <nav.link
-                  @route='scopes.scope.authenticate.method'
-                  @model={{authMethod.id}}
-                >
-                  {{#if authMethod.name}}
-                    {{authMethod.name}}
-                  {{else}}
-                    {{t
-                      (concat 'resources.auth-method.types.' authMethod.type)
-                    }}
-                  {{/if}}
-                </nav.link>
-              {{/each}}
-            {{else}}
-              {{! OIDC disabled:  filter out OIDC auth methods}}
-              {{#each @model.authMethods as |authMethod|}}
-                {{#unless authMethod.isOIDC}}
-                  <nav.link
-                    @route='scopes.scope.authenticate.method'
-                    @model={{authMethod.id}}
-                  >
-                    {{#if authMethod.name}}
-                      {{authMethod.name}}
-                    {{else}}
-                      {{t
-                        (concat 'resources.auth-method.types.' authMethod.type)
-                      }}
-                    {{/if}}
-                  </nav.link>
-                {{/unless}}
-              {{/each}}
-            {{/if}}
+            {{#each @model.authMethods as |authMethod|}}
+              <nav.link
+                @route='scopes.scope.authenticate.method'
+                @model={{authMethod.id}}
+              >
+                {{#if authMethod.name}}
+                  {{authMethod.name}}
+                {{else}}
+                  {{t (concat 'resources.auth-method.types.' authMethod.type)}}
+                {{/if}}
+              </nav.link>
+            {{/each}}
+
           </Rose::Nav::Tabs>
 
           {{#if @model.authMethods}}
diff --git a/ui/admin/app/templates/scopes/scope/authenticate/method/index.hbs b/ui/admin/app/templates/scopes/scope/authenticate/method/index.hbs
index 2217bff0a..81b6de8f6 100644
--- a/ui/admin/app/templates/scopes/scope/authenticate/method/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/authenticate/method/index.hbs
@@ -1,17 +1,5 @@
-{{#if (feature-flag 'oidc')}}
-  {{! OIDC enabled:  show form for any auth method}}
-  <Form::Authenticate
-    @model={{@model}}
-    @submit={{route-action 'authenticate'}}
-    @disabled={{(is-loading)}}
-  />
-{{else}}
-  {{! OIDC disabled:  hide OIDC auth form}}
-  {{#unless @model.isOIDC}}
-    <Form::Authenticate
-      @model={{@model}}
-      @submit={{route-action 'authenticate'}}
-      @disabled={{(is-loading)}}
-    />
-  {{/unless}}
-{{/if}}
\ No newline at end of file
+<Form::Authenticate
+  @model={{@model}}
+  @submit={{route-action 'authenticate'}}
+  @disabled={{(is-loading)}}
+/>
\ No newline at end of file
diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js
index d3d13aa15..04b91699b 100644
--- a/ui/admin/config/environment.js
+++ b/ui/admin/config/environment.js
@@ -7,8 +7,6 @@ const EDITION = process.env.EDITION || 'oss'; // Default edition is OSS
 // Object that defines edition features.
 const featureEditions = {
   oss: {
-    'primary-auth-method': true,
-    oidc: true,
     'oidc-crud': true,
     'oidc-account-crud': true,
     search: false,
diff --git a/ui/admin/tests/acceptance/auth-methods/create-test.js b/ui/admin/tests/acceptance/auth-methods/create-test.js
index 9e6eec879..ac09d8f5d 100644
--- a/ui/admin/tests/acceptance/auth-methods/create-test.js
+++ b/ui/admin/tests/acceptance/auth-methods/create-test.js
@@ -9,7 +9,6 @@ import {
   //   //currentSession,
   //   //invalidateSession,
 } from 'ember-simple-auth/test-support';
-import { enableFeature } from 'ember-feature-flags/test-support';
 
 module('Acceptance | auth-methods | create ', function (hooks) {
   setupApplicationTest(hooks);
@@ -113,7 +112,6 @@ module('Acceptance | auth-methods | create ', function (hooks) {
       instances.orgScope.primaryAuthMethodId,
       'Primary auth method is not yet set.'
     );
-    enableFeature('primary-auth-method');
     await visit(urls.authMethod);
     await click(
       '.rose-layout-page-actions .rose-dropdown-content [type="button"]:first-child'
@@ -143,7 +141,6 @@ module('Acceptance | auth-methods | create ', function (hooks) {
       instances.orgScope.primaryAuthMethodId,
       'Primary auth method is not yet set.'
     );
-    enableFeature('primary-auth-method');
     await visit(urls.authMethod);
     await click(
       '.rose-layout-page-actions .rose-dropdown-content [type="button"]:first-child'
@@ -160,7 +157,6 @@ module('Acceptance | auth-methods | create ', function (hooks) {
       instances.orgScope.primaryAuthMethodId,
       'Primary auth method is set.'
     );
-    enableFeature('primary-auth-method');
     await visit(urls.authMethod);
     await click(
       '.rose-layout-page-actions .rose-dropdown-content [type="button"]:first-child'
@@ -189,7 +185,6 @@ module('Acceptance | auth-methods | create ', function (hooks) {
       instances.orgScope.primaryAuthMethodId,
       'Primary auth method is set.'
     );
-    enableFeature('primary-auth-method');
     await visit(urls.authMethod);
     await click(
       '.rose-layout-page-actions .rose-dropdown-content [type="button"]:first-child'
@@ -203,7 +198,6 @@ module('Acceptance | auth-methods | create ', function (hooks) {
       instances.orgScope.primaryAuthMethodId,
       'Primary auth method is not yet set.'
     );
-    enableFeature('primary-auth-method');
     await visit(urls.authMethods);
     await click(
       '.rose-table-body .rose-table-row:first-child .rose-dropdown-content [type="button"]:first-child'
diff --git a/ui/desktop/app/templates/scopes/scope/authenticate.hbs b/ui/desktop/app/templates/scopes/scope/authenticate.hbs
index 2d193ed44..bc726030a 100644
--- a/ui/desktop/app/templates/scopes/scope/authenticate.hbs
+++ b/ui/desktop/app/templates/scopes/scope/authenticate.hbs
@@ -25,37 +25,18 @@
     </Rose::Dropdown>
 
     <Rose::Nav::Tabs as |nav|>
-      {{#if (feature-flag 'oidc')}}
-        {{! OIDC enable:  list all auth methods }}
-        {{#each @model.authMethods as |authMethod|}}
-          <nav.link
-            @route='scopes.scope.authenticate.method'
-            @model={{authMethod.id}}
-          >
-            {{#if authMethod.name}}
-              {{authMethod.name}}
-            {{else}}
-              {{t (concat 'resources.auth-method.types.' authMethod.type)}}
-            {{/if}}
-          </nav.link>
-        {{/each}}
-      {{else}}
-        {{! OIDC disabled:  filter out OIDC auth methods}}
-        {{#each @model.authMethods as |authMethod|}}
-          {{#unless authMethod.isOIDC}}
-            <nav.link
-              @route='scopes.scope.authenticate.method'
-              @model={{authMethod.id}}
-            >
-              {{#if authMethod.name}}
-                {{authMethod.name}}
-              {{else}}
-                {{t (concat 'resources.auth-method.types.' authMethod.type)}}
-              {{/if}}
-            </nav.link>
-          {{/unless}}
-        {{/each}}
-      {{/if}}
+      {{#each @model.authMethods as |authMethod|}}
+        <nav.link
+          @route='scopes.scope.authenticate.method'
+          @model={{authMethod.id}}
+        >
+          {{#if authMethod.name}}
+            {{authMethod.name}}
+          {{else}}
+            {{t (concat 'resources.auth-method.types.' authMethod.type)}}
+          {{/if}}
+        </nav.link>
+      {{/each}}
     </Rose::Nav::Tabs>
 
     {{#if @model.authMethods}}
diff --git a/ui/desktop/app/templates/scopes/scope/authenticate/method/index.hbs b/ui/desktop/app/templates/scopes/scope/authenticate/method/index.hbs
index 2217bff0a..81b6de8f6 100644
--- a/ui/desktop/app/templates/scopes/scope/authenticate/method/index.hbs
+++ b/ui/desktop/app/templates/scopes/scope/authenticate/method/index.hbs
@@ -1,17 +1,5 @@
-{{#if (feature-flag 'oidc')}}
-  {{! OIDC enabled:  show form for any auth method}}
-  <Form::Authenticate
-    @model={{@model}}
-    @submit={{route-action 'authenticate'}}
-    @disabled={{(is-loading)}}
-  />
-{{else}}
-  {{! OIDC disabled:  hide OIDC auth form}}
-  {{#unless @model.isOIDC}}
-    <Form::Authenticate
-      @model={{@model}}
-      @submit={{route-action 'authenticate'}}
-      @disabled={{(is-loading)}}
-    />
-  {{/unless}}
-{{/if}}
\ No newline at end of file
+<Form::Authenticate
+  @model={{@model}}
+  @submit={{route-action 'authenticate'}}
+  @disabled={{(is-loading)}}
+/>
\ No newline at end of file
diff --git a/ui/desktop/config/environment.js b/ui/desktop/config/environment.js
index cb2841660..906218d47 100644
--- a/ui/desktop/config/environment.js
+++ b/ui/desktop/config/environment.js
@@ -55,7 +55,6 @@ module.exports = function (environment) {
     },
 
     featureFlags: {
-      oidc: true,
       search: false,
       filter: true,
       'ssh-target': false,
diff --git a/ui/desktop/tests/acceptance/cluster-url-test.js b/ui/desktop/tests/acceptance/cluster-url-test.js
index 365243182..f2f49a029 100644
--- a/ui/desktop/tests/acceptance/cluster-url-test.js
+++ b/ui/desktop/tests/acceptance/cluster-url-test.js
@@ -141,7 +141,9 @@ module('Acceptance | clusterUrl', function (hooks) {
   test('captures error on clusterUrl update', async function (assert) {
     assert.expect(2);
     assert.notOk(mockIPC.clusterUrl);
-    sinon.stub(this.owner.lookup('service:clusterUrl'), 'setClusterUrl').throws();
+    sinon
+      .stub(this.owner.lookup('service:clusterUrl'), 'setClusterUrl')
+      .throws();
     await visit(urls.clusterUrl);
     await fillIn('[name="host"]', currentOrigin);
     await click('[type="submit"]');
diff --git a/ui/desktop/tests/integration/components/card-test.js b/ui/desktop/tests/integration/components/card-test.js
index 6027d774c..a1f2e130d 100644
--- a/ui/desktop/tests/integration/components/card-test.js
+++ b/ui/desktop/tests/integration/components/card-test.js
@@ -40,6 +40,9 @@ module('Integration | Component | card', function (hooks) {
     assert.ok(find('.card'));
     assert.ok(find('.card-header'));
     assert.ok(find('.card-header .rose-icon'));
-    assert.strictEqual(this.element.textContent.trim(), 'This is a heading test');
+    assert.strictEqual(
+      this.element.textContent.trim(),
+      'This is a heading test'
+    );
   });
 });