cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not merge zoom/lat/lon options with oauth_return_url

Browse source
This commit is contained in:
Milan Cvetkovic 2023-11-21 13:01:52 +00:00
parent 1fbd1d11c4
commit aeb4271a27
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/users_controller.rb
View file

@ -311,20 +311,17 @@ class UsersController < ApplicationController
def welcome_options def welcome_options
uri = URI(session[:referer]) if session[:referer].present? uri = URI(session[:referer]) if session[:referer].present?
welcome_options = {}
welcome_options["oauth_return_url"] = uri&.to_s if uri&.path == oauth_authorization_path return { "oauth_return_url" => uri&.to_s } if uri&.path == oauth_authorization_path
begin begin
%r{map=(.*)/(.*)/(.*)}.match(uri.fragment) do |m| %r{map=(.*)/(.*)/(.*)}.match(uri.fragment) do |m|
editor = Rack::Utils.parse_query(uri.query).slice("editor") editor = Rack::Utils.parse_query(uri.query).slice("editor")
welcome_options = { "zoom" => m[1], return { "zoom" => m[1], "lat" => m[2], "lon" => m[3] }.merge(editor)
"lat" => m[2],
"lon" => m[3] }.merge(editor).merge(welcome_options)
end end
rescue StandardError rescue StandardError
# Use default # Use default
end end
welcome_options
end end
## ##