Added default_profile setting to allow admins to select the default p…

…rofile for users (#3200)
OSC · Nov 21, 2023 · c1ca8e4 · c1ca8e4
1 parent 8ef722b
commit c1ca8e4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/apps/dashboard/app/models/user_configuration.rb b/apps/dashboard/app/models/user_configuration.rb
@@ -148,6 +148,8 @@ def profile
       request_hostname
     elsif user_settings[:profile]
       user_settings[:profile].to_sym
+    elsif Configuration.default_profile
+      Configuration.default_profile.to_sym
     end
   end
 

diff --git a/apps/dashboard/config/configuration_singleton.rb b/apps/dashboard/config/configuration_singleton.rb
@@ -66,7 +66,8 @@ def string_configs
       :bc_clean_old_dirs_days   => '30',
       :google_analytics_tag_id  => nil,
       :project_template_dir     => "#{config_root}/projects",
-      :rclone_extra_config      => nil
+      :rclone_extra_config      => nil,
+      :default_profile          => nil
     }.freeze
   end
 

diff --git a/apps/dashboard/test/fixtures/config/ondemand.d/string.yml b/apps/dashboard/test/fixtures/config/ondemand.d/string.yml
@@ -5,4 +5,5 @@ auto_groups_filter: 'string from file'
 bc_clean_old_dirs_days: 'string from file'
 google_analytics_tag_id: 'string from file'
 project_template_dir: 'string from file'
-rclone_extra_config: 'string from file'
+rclone_extra_config: 'string from file'
+default_profile: 'string from file'
diff --git a/apps/dashboard/test/models/user_configuration_test.rb b/apps/dashboard/test/models/user_configuration_test.rb
@@ -214,7 +214,16 @@ def teardown
     assert_equal :user_settings_profile_value, target.profile
   end
 
-  test "profile should return nil when when Configuration.host_based_profiles is false and user profile is nil" do
+  test "profile should return default_profile when when Configuration.host_based_profiles is false and user profile is nil" do
+    Configuration.stubs(:host_based_profiles).returns(false)
+    Configuration.stubs(:default_profile).returns('myprofile')
+    target = UserConfiguration.new
+    target.update_user_settings({profile: nil})
+
+    assert_equal :myprofile, target.profile
+  end
+
+  test "profile should return nil when when Configuration.host_based_profiles is false, user profile is nil, and default_profile not set" do
     Configuration.stubs(:host_based_profiles).returns(false)
     target = UserConfiguration.new
     target.update_user_settings({profile: nil})