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

FIX: redirect to original URL after social login

Browse Source
This commit is contained in:
Régis Hanol
2018-01-26 18:52:27 +01:00
parent 3d595a52ca
commit e2d82b882e
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/users/omniauth_callbacks_controller.rb
View File

@ -41,6 +41,7 @@ class Users::OmniauthCallbacksController < ApplicationController
@auth_result = authenticator.after_authenticate(auth)
origin = request.env['omniauth.origin']
if cookies[:destination_url].present?
origin = cookies[:destination_url]
cookies.delete(:destination_url)
@ -53,8 +54,10 @@ class Users::OmniauthCallbacksController < ApplicationController
end
end
unless @origin.present?
if @origin.blank?
@origin = Discourse.base_uri("/")
else
@auth_result.destination_url = origin
end
if @auth_result.failed?