lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed issue with duplicate roles from LDAP sigin (#1090) 

Co-authored-by: Jesus Federico <jesus@123it.ca>
This commit is contained in:
Ahmad Farhat 2020-04-01 10:43:27 -04:00 committed by GitHub
parent f9d193bb5e
commit fab3b479c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/concerns/auth_values.rb
View File

@ -57,13 +57,14 @@ module AuthValues
end end
def auth_roles(user, auth) def auth_roles(user, auth)
auth['info']['roles'] = "Viewer"
unless auth['info']['roles'].nil? unless auth['info']['roles'].nil?
roles = auth['info']['roles'].split(',') roles = auth['info']['roles'].split(',')
role_provider = auth['provider'] == "bn_launcher" ? auth['info']['customer'] : "greenlight" role_provider = auth['provider'] == "bn_launcher" ? auth['info']['customer'] : "greenlight"
roles.each do |role_name| roles.each do |role_name|
role = Role.where(provider: role_provider, name: role_name).first role = Role.find_by(provider: role_provider, name: role_name)
user.roles << role unless role.nil? user.roles << role if !role.nil? && !user.has_role?(role_name)
end end
end end
end end