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

Replace base_uri with base_path (#10879)

Browse Source 
DEV: Replace instances of Discourse.base_uri with Discourse.base_path

This is clearer because the base_uri is actually just a path prefix. This continues the work started in 555f467.
This commit is contained in:
Daniel Waterworth
2020-10-09 12:51:24 +01:00
committed by GitHub
parent 5e3130ac26
commit 721ee36425
34 changed files with 74 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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_path}/associate/#{token}"
else
@auth_result = authenticator.after_authenticate(auth)
DiscourseEvent.trigger(:after_auth, authenticator, @auth_result)
@ -55,14 +55,14 @@ 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_path}/auth/") # Not /auth URL
@origin = +"#{parsed.path}"
@origin << "?#{parsed.query}" if parsed.query
end
end
if @origin.blank?
@origin = Discourse.base_uri("/")
@origin = Discourse.base_path("/")
end
@auth_result.destination_url = @origin
@ -76,7 +76,7 @@ class Users::OmniauthCallbacksController < ApplicationController
cookies['_bypass_cache'] = true
cookies[:authentication_data] = {
value: @auth_result.to_client_hash.to_json,
path: Discourse.base_uri("/")
path: Discourse.base_path("/")
}
redirect_to @origin
end