github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: authComplete query param should carry-forward to login page

Browse Source
This commit is contained in:
Vinoth Kannan
2018-03-27 17:22:07 +05:30
parent 518f7ba91b
commit ff9d7a9bfb
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -641,6 +641,8 @@ class ApplicationController < ActionController::Base
# save original URL in a session so we can redirect after login # save original URL in a session so we can redirect after login
session[:destination_url] = destination_url session[:destination_url] = destination_url
redirect_to path('/session/sso') redirect_to path('/session/sso')
elsif params[:authComplete].present?
redirect_to path("/login?authComplete=true")
else else
# save original URL in a cookie (javascript redirects after login in this case) # save original URL in a cookie (javascript redirects after login in this case)
cookies[:destination_url] = destination_url cookies[:destination_url] = destination_url