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

Fixed issue with LDAP role not being respected (#1728)

This commit is contained in:
Ahmad Farhat 2020-06-02 16:50:52 -04:00 committed by GitHub
parent 737d39dce9
commit 13fb9faa4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/sessions_controller.rb
View File

@ -228,7 +228,7 @@ class SessionsController < ApplicationController
send_invite_user_signup_email(user) if invite_registration && !@user_exists
user.set_role :user unless @user_exists
user.set_role :user if !@user_exists && user.role.nil?
login(user)

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

@ -63,7 +63,7 @@ module AuthValues
role_provider = auth['provider'] == "bn_launcher" ? auth['info']['customer'] : "greenlight"
roles.each do |role_name|
role = Role.find_by(provider: role_provider, name: role_name)
user.role = role if !role.nil? && !user.has_role?(role_name)
user.set_role(role_name) if !role.nil? && !user.has_role?(role_name)
end
end
end