rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-18 07:52:23 +01:00
Code Issues Releases Activity

Merge pull request #377 from Guichaguri/fix/ignore-empty-from-sso

Browse Source 
(bug) Fix SSO data being overridden when it is empty and the user can change it
This commit is contained in:
Sylvain 2022-07-27 10:08:00 +02:00 committed by GitHub
commit 7fa9414527
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/concerns/single_sign_on_concern.rb
View File

@ -40,8 +40,10 @@ module SingleSignOnConcern
## @param sso_mapping {String} must be of form 'user._field_' or 'profile._field_'. Eg. 'user.email'
## @param data {*} the data to put in the given key. Eg. 'user@example.com'
def set_data_from_sso_mapping(sso_mapping, data)
return if data.nil? || data.blank?
if sso_mapping.to_s.start_with? 'user.'
self[sso_mapping[5..-1].to_sym] = data unless data.nil? || data.blank?
self[sso_mapping[5..-1].to_sym] = data
elsif sso_mapping.to_s.start_with? 'profile.'
case sso_mapping.to_s
when 'profile.avatar'
@ -67,10 +69,11 @@ module SingleSignOnConcern
self.statistic_profile ||= StatisticProfile.new
self.statistic_profile.birthday = data
else
profile[sso_mapping[8..-1].to_sym] = data unless data.nil?
profile[sso_mapping[8..-1].to_sym] = data
end
end
return if data.nil? || data.blank? || mapped_from_sso&.include?(sso_mapping)
return if mapped_from_sso&.include?(sso_mapping)
self.mapped_from_sso = [mapped_from_sso, sso_mapping].compact.join(',')
end