Merge pull request #2020 from samvera/add-config-for-devise-options

♻️ Add option to override devise configuration
samvera · Oct 10, 2023 · 014f7b7 · 014f7b7
2 parents 6a2d624 + 363bc07
commit 014f7b7
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -14,9 +14,7 @@ class User < ApplicationRecord
   include Blacklight::User
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :invitable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable,
-         :omniauthable, omniauth_providers: %i[saml openid_connect cas]
+  devise(*Hyku::Application.user_devise_parameters)
 
   after_create :add_default_group_membership!
 

diff --git a/config/application.rb b/config/application.rb
@@ -41,6 +41,21 @@ class Application < Rails::Application
     #   The title to render for the application's HTML > HEAD > TITLE element.
     #   @return [String]
     class_attribute :html_head_title, default: "Hyku", attr_accessor: false
+
+    # @!attribute user_devise_parameters
+    #   @return [Object]
+    #
+    #   This is a value that you want to set in the before_initialize block.
+    class_attribute :user_devise_parameters, instance_accessor: false, default: [
+                      :database_authenticatable,
+                      :invitable,
+                      :registerable,
+                      :recoverable,
+                      :rememberable,
+                      :trackable,
+                      :validatable,
+                      :omniauthable, { omniauth_providers: %i[saml openid_connect cas] }]
+
     # @!endgroup Class Attributes
 
     # Add this line to load the lib folder first because we need

diff --git a/spec/config/application_spec.rb b/spec/config/application_spec.rb
@@ -4,6 +4,24 @@
 
 RSpec.describe Hyku::Application do
   describe '.html_head_title' do
+    subject { described_class.html_head_title }
+
     it { is_expected.to be_a(String) }
   end
+
+  describe '.user_devise_parameters' do
+    subject { described_class.user_devise_parameters }
+
+    it do
+      is_expected.to eq([:database_authenticatable,
+                         :invitable,
+                         :registerable,
+                         :recoverable,
+                         :rememberable,
+                         :trackable,
+                         :validatable,
+                         :omniauthable,
+                         { omniauth_providers: %i[saml openid_connect cas] }])
+    end
+  end
 end