Skip to content

Make admin attribute update optional #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tacerus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make admin attribute update optional #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/models/oic_session.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ def authorized?
end

def admin?
if client_config['admin_group'].empty?
return nil
end
if client_config['admin_group'].present?
if user["member_of"].present?
return true if user["member_of"].include?(client_config['admin_group'])
Expand Down
8 changes: 6 additions & 2 deletions lib/redmine_openid_connect/account_controller_patch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ def oic_local_login
user.assign_attributes attributes

if user.save
user.update_attribute(:admin, oic_session.admin?)
unless oic_session.admin?.nil?
user.update_attribute(:admin, oic_session.admin?)
end
oic_session.user_id = user.id
oic_session.save!
# after user creation just show "My Page" don't redirect to remember
Expand All @@ -140,7 +142,9 @@ def oic_local_login
return invalid_credentials
end
else
user.update_attribute(:admin, oic_session.admin?)
unless oic_session.admin?.nil?
user.update_attribute(:admin, oic_session.admin?)
end
oic_session.user_id = user.id
oic_session.save!
# redirect back to initial URL
Expand Down