Welcome screen displays 'Continue with authorization'

[rails.git] / app / controllers / users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 36c9f4e2288f06185726045826ae82ed9d927bb0..6db39d2d0ca3360af3dcc5408ffb02b491f35fdb 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -199,8 +199,9 @@ class UsersController < ApplicationController
 
           referer = welcome_path
 
+          uri = URI(session[:referer]) if session[:referer].present?
+
           begin
-            uri = URI(session[:referer])
             %r{map=(.*)/(.*)/(.*)}.match(uri.fragment) do |m|
               editor = Rack::Utils.parse_query(uri.query).slice("editor")
               referer = welcome_path({ "zoom" => m[1],
@@ -212,6 +213,7 @@ class UsersController < ApplicationController
           end
 
           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