delete auth provider code, put identity provider behind feature flipp…

…er (#667)
scientist-softserv · Aug 10, 2023 · 94cb4cd · 94cb4cd
1 parent 45d7a9e
commit 94cb4cd
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 268 deletions.
diff --git a/app/controllers/auth_providers_controller.rb b/app/controllers/auth_providers_controller.rb
diff --git a/app/models/account.rb b/app/models/account.rb
@@ -7,7 +7,6 @@ class Account < ApplicationRecord
   include AccountCname
   attr_readonly :tenant
 
-  has_one :auth_provider, dependent: :destroy
   has_many :sites, dependent: :destroy
   has_many :domain_names, dependent: :destroy
   has_many :full_account_cross_searches,

diff --git a/app/models/auth_provider.rb b/app/models/auth_provider.rb
diff --git a/app/views/auth_providers/_form.html.erb b/app/views/auth_providers/_form.html.erb
diff --git a/app/views/auth_providers/_oidc.html.erb b/app/views/auth_providers/_oidc.html.erb
diff --git a/app/views/auth_providers/_saml.html.erb b/app/views/auth_providers/_saml.html.erb
diff --git a/app/views/auth_providers/edit.html.erb b/app/views/auth_providers/edit.html.erb
diff --git a/app/views/auth_providers/new.html.erb b/app/views/auth_providers/new.html.erb
diff --git a/app/views/hyrax/dashboard/sidebar/_configuration.html.erb b/app/views/hyrax/dashboard/sidebar/_configuration.html.erb
@@ -11,22 +11,12 @@
           <span class="fa fa-gear"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.account') %></span>
         <% end %>
         
-        <% if Flipflop.show_auth_provider_in_admin_dashboard? %>
-          <% if AuthProvider.count > 0 %>
-            <%= menu.nav_link(main_app.edit_auth_provider_path(AuthProvider.where(account_id: @current_account.id).first)) do %>
-              <span class="fa fa-key"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.auth_provider') %></span>
-            <% end %>
-          <% else %>
-          <%= menu.nav_link(main_app.new_auth_provider_path) do %>
-              <span class="fa fa-key"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.auth_provider') %></span>
-            <% end %>
+        <% if Flipflop.show_identity_provider_in_admin_dashboard? %>
+          <%= menu.nav_link(main_app.identity_providers_path) do %>
+            <span class="fa fa-key"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.identity_providers') %></span>
           <% end %>
         <% end %>
 
-        <%= menu.nav_link(main_app.identity_providers_path) do %>
-          <span class="fa fa-key"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.identity_providers') %></span>
-        <% end %>
-
         <%= menu.nav_link(main_app.edit_site_labels_path) do %>
           <span class="fa fa-institution"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.labels') %></span>
         <% end %>

diff --git a/config/features.rb b/config/features.rb
@@ -21,7 +21,7 @@
           default: true,
           description: "Shows the Recently Uploaded tab on the homepage."
 
-  feature :show_auth_provider_in_admin_dashboard,
+  feature :show_identity_provider_in_admin_dashboard,
           default: false,
-          description: "Shows the Auth Provider tab on the admin dashboard."
+          description: "Shows the Identity Provider tab on the admin dashboard."
 end
diff --git a/db/migrate/20230810193550_drop_auth_providers.rb b/db/migrate/20230810193550_drop_auth_providers.rb
@@ -0,0 +1,16 @@
+class DropAuthProviders < ActiveRecord::Migration[5.2]
+  def change
+    drop_table :auth_providers do |t|
+      t.string "provider"
+      t.integer "account_id"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.string "oidc_client_id"
+      t.string "saml_client_id"
+      t.string "oidc_client_secret"
+      t.string "saml_client_secret"
+      t.string "oidc_idp_sso_service_url"
+      t.string "saml_idp_sso_service_url"
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_08_04_202804) do
+ActiveRecord::Schema.define(version: 2023_08_10_193550) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -46,19 +46,6 @@
     t.index ["solr_endpoint_id"], name: "index_accounts_on_solr_endpoint_id", unique: true
   end
 
-  create_table "auth_providers", force: :cascade do |t|
-    t.string "provider"
-    t.integer "account_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.string "oidc_client_id"
-    t.string "saml_client_id"
-    t.string "oidc_client_secret"
-    t.string "saml_client_secret"
-    t.string "oidc_idp_sso_service_url"
-    t.string "saml_idp_sso_service_url"
-  end
-
   create_table "bookmarks", id: :serial, force: :cascade do |t|
     t.integer "user_id", null: false
     t.string "user_type"

diff --git a/spec/factories/auth_providers.rb b/spec/factories/auth_providers.rb
diff --git a/spec/models/auth_provider_spec.rb b/spec/models/auth_provider_spec.rb