rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Code Issues Releases Activity

(bug) Fix SSO data being overridden when it is empty and the user can change it

Browse Source
This commit is contained in:
Guilherme Chaguri 2022-07-14 17:55:36 -03:00
parent 157774f525
commit 27d71dcffd
1 changed files with 5 additions and 4 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 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' ## @param data {*} the data to put in the given key. Eg. 'user@example.com'
def set_data_from_sso_mapping(sso_mapping, data) def set_data_from_sso_mapping(sso_mapping, data)
return if data.nil? || data.blank? || mapped_from_sso&.include?(sso_mapping)
if sso_mapping.to_s.start_with? 'user.' 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.' elsif sso_mapping.to_s.start_with? 'profile.'
case sso_mapping.to_s case sso_mapping.to_s
when 'profile.avatar' when 'profile.avatar'
@ -67,10 +69,9 @@ module SingleSignOnConcern
self.statistic_profile ||= StatisticProfile.new self.statistic_profile ||= StatisticProfile.new
self.statistic_profile.birthday = data self.statistic_profile.birthday = data
else else
profile[sso_mapping[8..-1].to_sym] = data unless data.nil? profile[sso_mapping[8..-1].to_sym] = data
end end
end end
return if data.nil? || data.blank? || mapped_from_sso&.include?(sso_mapping)
self.mapped_from_sso = [mapped_from_sso, sso_mapping].compact.join(',') self.mapped_from_sso = [mapped_from_sso, sso_mapping].compact.join(',')
end end
@ -121,7 +122,7 @@ module SingleSignOnConcern
logger.debug "mapping sso field #{field} with value=#{value}" logger.debug "mapping sso field #{field} with value=#{value}"
# we do not merge the email field if its end with the special value '-duplicate' as this means # we do not merge the email field if its end with the special value '-duplicate' as this means
# that the user is currently merging with the account that have the same email than the sso # that the user is currently merging with the account that have the same email than the sso
set_data_from_sso_mapping(field, value) unless field == 'user.email' && value.end_with?('-duplicate') set_data_from_sso_mapping(field, value) unless (field == 'user.email' && value.end_with?('-duplicate')) || (field == 'user.group_id' && user.admin?)
end end
# run the account transfer in an SQL transaction to ensure data integrity # run the account transfer in an SQL transaction to ensure data integrity