Welcome screen works with confirmation email too

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6db39d2d0ca3360af3dcc5408ffb02b491f35fdb..ad569a3de126495b44ca12dcfd84ef4910689e58 100644 (file)
--- 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)
 
 
           flash[:matomo_goal] = Settings.matomo["goals"]["signup"] if defined?(Settings.matomo)
 

-          referer = welcome_path
-

           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

 
           begin
             %r{map=(.*)/(.*)/(.*)}.match(uri.fragment) do |m|
               editor = Rack::Utils.parse_query(uri.query).slice("editor")
 
           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
             end
           rescue StandardError
             # Use default
           end

+          referer = welcome_path(welcome_options)

 
           if current_user.status == "active"
 
           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
             session[:referer] = referer
             successful_login(current_user)
           else