updated call to direct_login? for new core

pull/6827/head
Markus Kahl 9 years ago
parent 6c1d46400d
commit 1bc8302ca6
  1. 3
      lib/open_project/openid_connect/sso_logout.rb

@ -2,6 +2,7 @@ module OpenProject
module OpenIDConnect
module SSOLogout
include LobbyBoy::SessionHelper
include ::OmniauthHelper
def session_expired?
super || (current_user.logged? && id_token_expired?)
@ -29,7 +30,7 @@ module OpenProject
end
# If the user may view the site without being logged in we redirect back to it.
site_open = !(Setting.login_required? && ::Concerns::OmniauthLogin.direct_login?)
site_open = !(Setting.login_required? && omniauth_direct_login?)
return_url = site_open && "#{Setting.protocol}://#{Setting.host_name}"
if logout_at_op! return_url

Loading…
Cancel
Save