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

FIX: Correctly redirect after external login on subfolder sites (#10529)

Browse Source
This commit is contained in:
David Taylor
2020-08-26 15:52:21 +01:00
committed by GitHub
parent 996d5f3b17
commit 4351fa435e
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ class Users::OmniauthCallbacksController < ApplicationController
# Save to redis, with a secret token, then redirect to confirmation screen
token = SecureRandom.hex
Discourse.redis.setex "#{Users::AssociateAccountsController::REDIS_PREFIX}_#{current_user.id}_#{token}", 10.minutes, auth.to_json
return redirect_to Discourse.base_uri("/associate/#{token}")
return redirect_to "#{Discourse.base_uri}/associate/#{token}"
else
@auth_result = authenticator.after_authenticate(auth)
DiscourseEvent.trigger(:after_auth, authenticator, @auth_result)
@ -55,7 +55,7 @@ class Users::OmniauthCallbacksController < ApplicationController
if parsed && # Valid
(parsed.host == nil || parsed.host == Discourse.current_hostname) && # Local
!parsed.path.starts_with?(Discourse.base_uri("/auth/")) # Not /auth URL
!parsed.path.starts_with?("#{Discourse.base_uri}/auth/") # Not /auth URL
@origin = +"#{parsed.path}"
@origin << "?#{parsed.query}" if parsed.query
end