Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Only validate groups claim presence when syncing groups

Jan Sandbrinkfc344f04cc98
diff --git a/modules/openid_connect/app/contracts/openid_connect/providers/base_contract.rb b/modules/openid_connect/app/contracts/openid_connect/providers/base_contract.rb
index caaa56e3e5c..666f38e0111 100644
--- a/modules/openid_connect/app/contracts/openid_connect/providers/base_contract.rb
+++ b/modules/openid_connect/app/contracts/openid_connect/providers/base_contract.rb
@@ -67,7 +67,7 @@ module OpenIDConnect
end
attribute :groups_claim
- validates :groups_claim, presence: true
+ validates :groups_claim, presence: true, if: -> { model.sync_groups? }
attribute :group_regexes
validate :group_regexes_parseable
diff --git a/modules/openid_connect/spec/contracts/openid_connect/providers/create_contract_spec.rb b/modules/openid_connect/spec/contracts/openid_connect/providers/create_contract_spec.rb
index 6a655cb13bd..5a61463b656 100644
--- a/modules/openid_connect/spec/contracts/openid_connect/providers/create_contract_spec.rb
+++ b/modules/openid_connect/spec/contracts/openid_connect/providers/create_contract_spec.rb
@@ -41,6 +41,18 @@ RSpec.describe OpenIDConnect::Providers::CreateContract do
let(:current_user) { build_stubbed(:admin) }
it_behaves_like "contract is valid"
+
+ context "when the groups_claim is empty" do
+ let(:provider) { build(:oidc_provider, groups_claim: "", sync_groups: true) }
+
+ it_behaves_like "contract is invalid", groups_claim: :blank
+
+ context "and when we don't want to synchronize groups" do
+ let(:provider) { build(:oidc_provider, groups_claim: "", sync_groups: false) }
+
+ it_behaves_like "contract is valid"
+ end
+ end
end
context "when non-admin" do
diff --git a/modules/openid_connect/spec/contracts/openid_connect/providers/update_contract_spec.rb b/modules/openid_connect/spec/contracts/openid_connect/providers/update_contract_spec.rb
index 6769a46db82..46fc0eea5c0 100644
--- a/modules/openid_connect/spec/contracts/openid_connect/providers/update_contract_spec.rb
+++ b/modules/openid_connect/spec/contracts/openid_connect/providers/update_contract_spec.rb
@@ -41,6 +41,18 @@ RSpec.describe OpenIDConnect::Providers::UpdateContract do
let(:current_user) { build_stubbed(:admin) }
it_behaves_like "contract is valid"
+
+ context "when the groups_claim is empty" do
+ let(:provider) { build_stubbed(:oidc_provider, groups_claim: "", sync_groups: true) }
+
+ it_behaves_like "contract is invalid", groups_claim: :blank
+
+ context "and when we don't want to synchronize groups" do
+ let(:provider) { build_stubbed(:oidc_provider, groups_claim: "", sync_groups: false) }
+
+ it_behaves_like "contract is valid"
+ end
+ end
end
context "when non-admin" do