From 87a5a0844bb6dd7124272e3011b57a9b1318e278 Mon Sep 17 00:00:00 2001 From: Milan Cvetkovic Date: Mon, 6 Nov 2023 14:21:44 +0000 Subject: [PATCH 1/1] Welcome screen works with confirmation email too --- app/controllers/users_controller.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6db39d2d0..ad569a3de 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -197,23 +197,23 @@ class UsersController < ApplicationController flash[:matomo_goal] = Settings.matomo["goals"]["signup"] if defined?(Settings.matomo) - referer = welcome_path - uri = URI(session[:referer]) if session[:referer].present? + welcome_options = {} + welcome_options["oauth_return_url"] = uri&.to_s if uri&.path == oauth_authorization_path begin %r{map=(.*)/(.*)/(.*)}.match(uri.fragment) do |m| editor = Rack::Utils.parse_query(uri.query).slice("editor") - referer = welcome_path({ "zoom" => m[1], - "lat" => m[2], - "lon" => m[3] }.merge(editor)) + welcome_options = { "zoom" => m[1], + "lat" => m[2], + "lon" => m[3] }.merge(editor).merge(welcome_options) end rescue StandardError # Use default end + referer = welcome_path(welcome_options) if current_user.status == "active" - referer = welcome_path({"oauth_return_url" => uri.to_s}) if uri&.path == oauth_authorization_path session[:referer] = referer successful_login(current_user) else -- 2.39.5