Merge pull request seek4science#1935 from seek4science/no-extra-slash

Don't append slash to custom OIDC provider issuer URL
ScilifelabDataCentre · Jul 2, 2024 · 025f614 · 025f614
2 parents 183681d + aafb3cb
commit 025f614
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
@@ -100,7 +100,6 @@ def update_features_enabled
     Seek::Config.omniauth_oidc_image&.destroy! if params[:clear_omniauth_oidc_image] == '1'
     Seek::Config.omniauth_oidc_image = params[:omniauth_oidc_image]
 
-    params[:omniauth_oidc_issuer] = params[:omniauth_oidc_issuer].chomp('/') + '/' if params[:omniauth_oidc_issuer].present?
     Seek::Config.omniauth_oidc_issuer = params[:omniauth_oidc_issuer]
     Seek::Config.omniauth_oidc_client_id = params[:omniauth_oidc_client_id]
     Seek::Config.omniauth_oidc_secret = params[:omniauth_oidc_secret]

diff --git a/config/initializers/seek_testing.rb b/config/initializers/seek_testing.rb
@@ -133,7 +133,7 @@ def load_seek_testing_defaults!
 
       Settings.defaults[:omniauth_oidc_enabled] = true
       Settings.defaults[:omniauth_oidc_name] = 'SEEK Testing OIDC'
-      Settings.defaults[:omniauth_oidc_issuer] = 'https://example.com/oidc/'
+      Settings.defaults[:omniauth_oidc_issuer] = 'https://example.com/oidc'
       Settings.defaults[:omniauth_oidc_client_id] = 'def'
       Settings.defaults[:omniauth_oidc_secret] = '789'