ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove site admin delegated cookie check 

refs CNVS-37387

handle it in the multi-tenancy plugin instead

Change-Id: Icf9257c423142506f19781c10cb75f6b4f8a8455
Reviewed-on: https://gerrit.instructure.com/114628
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2017-06-07 14:49:13 -06:00
parent 2796582175
commit 86a5e7364f
5 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/login/cas_controller.rb
View File

@ -24,7 +24,7 @@ class Login::CasController < ApplicationController
protect_from_forgery except: :destroy, with: :exception
before_action :forbid_on_files_domain
before_action :run_login_hooks, :check_sa_delegated_cookie, :fix_ms_office_redirects, only: :new
before_action :run_login_hooks, :fix_ms_office_redirects, only: :new
delegate :client, to: :aac

2
app/controllers/login/oauth_base_controller.rb
View File

@ -20,7 +20,7 @@ class Login::OauthBaseController < ApplicationController
include Login::Shared
before_action :forbid_on_files_domain
before_action :run_login_hooks, :check_sa_delegated_cookie, :fix_ms_office_redirects, only: :new
before_action :run_login_hooks, :fix_ms_office_redirects, only: :new
def new
# a subclass might explicitly set the AAC, so that we don't need to infer

2
app/controllers/login/saml_controller.rb
View File

@ -22,7 +22,7 @@ class Login::SamlController < ApplicationController
protect_from_forgery except: [:create, :destroy], with: :exception
before_action :forbid_on_files_domain
before_action :run_login_hooks, :check_sa_delegated_cookie, only: [:new, :create]
before_action :run_login_hooks, only: [:new, :create]
before_action :fix_ms_office_redirects, only: :new
def new

7
app/controllers/login/shared.rb
View File

@ -105,13 +105,6 @@ module Login::Shared
true
end
def check_sa_delegated_cookie
if cookies['canvas_sa_delegated']
@real_domain_root_account = @domain_root_account
@domain_root_account = Account.site_admin
end
end
include PseudonymSessionsController
def remember_me_cookie_domain
otp_remember_me_cookie_domain

1
app/controllers/login_controller.rb
View File

@ -23,7 +23,6 @@ class LoginController < ApplicationController
before_action :forbid_on_files_domain, except: :clear_file_session
before_action :run_login_hooks, only: :new
before_action :check_sa_delegated_cookie, only: :new
before_action :fix_ms_office_redirects, only: :new
skip_before_action :require_reacceptance_of_terms