From 4f73f6fad063d61b8f012bbb08f791308dd2075f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com>
Date: Thu, 20 Oct 2022 16:10:36 +0200
Subject: [PATCH] oops
---
app/models/communication/extranet/with_sso.rb | 22 +++++++++++++++++++
app/models/university/with_sso.rb | 20 -----------------
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/app/models/communication/extranet/with_sso.rb b/app/models/communication/extranet/with_sso.rb
index a95cdf9ae..fc6b1b7ab 100644
--- a/app/models/communication/extranet/with_sso.rb
+++ b/app/models/communication/extranet/with_sso.rb
@@ -18,6 +18,28 @@ module Communication::Extranet::WithSso
super(value)
end
+ def sso_cert
+ sso_inherit_from_university? ? university.sso_cert : @sso_cert
+ end
+
+ def sso_mapping
+ sso_inherit_from_university? ? university.sso_mapping : @sso_mapping
+ end
+
+ def sso_name_identifier_format
+ sso_inherit_from_university? ? university.sso_name_identifier_format : @sso_name_identifier_format
+ end
+
+ def sso_provider
+ sso_inherit_from_university? ? university.sso_provider : @sso_provider
+ end
+
+ def sso_target_url
+ sso_inherit_from_university? ? university.sso_target_url : @sso_target_url
+ end
+
+ private
+
def sso_mapping_should_have_email
errors.add(:sso_mapping, :missing_email) unless (sso_mapping || []).detect { |sso_item| sso_item['internal_key'] == 'email' }
end
diff --git a/app/models/university/with_sso.rb b/app/models/university/with_sso.rb
index 906beb0f2..1bf5febd1 100644
--- a/app/models/university/with_sso.rb
+++ b/app/models/university/with_sso.rb
@@ -18,26 +18,6 @@ module University::WithSso
super(value)
end
- def sso_cert
- sso_inherit_from_university? ? university.sso_cert : @sso_cert
- end
-
- def sso_mapping
- sso_inherit_from_university? ? university.sso_mapping : @sso_mapping
- end
-
- def sso_name_identifier_format
- sso_inherit_from_university? ? university.sso_name_identifier_format : @sso_name_identifier_format
- end
-
- def sso_provider
- sso_inherit_from_university? ? university.sso_provider : @sso_provider
- end
-
- def sso_target_url
- sso_inherit_from_university? ? university.sso_target_url : @sso_target_url
- end
-
private
def sso_mapping_should_have_email
--
GitLab